init

.gitignore

+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+.idea
+*.iml
+*.settings
+*.classpath
+*.project
+*.springBeans
+*.factorypath
+target

YeeAmosFireAutoSysCommon/pom.xml

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>YeeAmosFireAutoSysCommon</artifactId>
+	<name>YeeAmosFireAutoSysCommon</name>
+	<packaging>jar</packaging>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<parent>
+		<groupId>com.yeejoin.amos</groupId>
+		<artifactId>YeeAmosFireAutoSysRoot</artifactId>
+		<version>1.0.0</version>
+	</parent>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.yeejoin.amos</groupId>
+			<artifactId>AmosOPService</artifactId>
+			<version>${YeeOp.version}</version>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/common/enums/ResourceTypeDefEnum.java

+package com.yeejoin.amos.fas.common.enums;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+public enum ResourceTypeDefEnum {
+	riskSource("风险点","riskSource"),
+	patrol("巡检点","patrol"),
+	impEquipment("重点设备","impEquipment"),
+	monitorEquipment("探测器","monitorEquipment"),
+	hydrant("消火栓","hydrant"),
+	pool("消防水池","pool"),
+	fireCar("消防车","fireCar"),
+	fireEquipment("灭火器材","fireEquipment"),
+	fireChamber("消防小室","fireChamber"),
+	fireFoamRoom("消防泡沫间","fireFoamRoom"),
+	video("视频设备","video");
+	
+	/**
+	 * 名称，描述
+	 */
+	private String name;
+	/**
+	 * 编码
+	 */
+	private String code;
+	
+	private ResourceTypeDefEnum(String name,String code){
+		this.name = name;
+		this.code = code;
+	}
+	
+	public static ResourceTypeDefEnum getEnum(String code) {
+		ResourceTypeDefEnum resourceTypeDefEnum = null;
+		for(ResourceTypeDefEnum type: ResourceTypeDefEnum.values()) {
+			if (type.getCode().equals(code)) {
+				resourceTypeDefEnum = type;
+				break;
+			}
+		}
+		
+		return resourceTypeDefEnum;
+	}
+	
+	public static List<Map<String,String>> getEnumList() {
+		List<Map<String,String>> list = new ArrayList<>();
+		for(ResourceTypeDefEnum e : ResourceTypeDefEnum.values()) {
+			Map<String,String> msgType = new HashMap<>();
+			msgType.put(e.getCode(),e.getName());
+			list.add(msgType);
+		}
+		return list;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+}
+

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/core/common/request/CommonPageable.java

+package com.yeejoin.amos.fas.core.common.request;
+
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+
+/**
+ * 
+ * <pre>
+ * 分页实体
+ * </pre>
+ *
+ * @author as-chenjiajun
+ * @version $Id: CommonPageable.java, v 0.1 2016-12-14 上午10:42:44 as-chenjiajun
+ *          Exp $
+ */
+public class CommonPageable implements Pageable {
+
+	/**
+	 * 页号（大于等于0）
+	 */
+	protected int pageNumber = 0;
+
+	/**
+	 * 每页大小（大于等于0）
+	 */
+	protected int pageSize = 10;
+
+	/**
+	 * 起始索引
+	 */
+	protected int offset = 0;
+
+	/**
+	 * 排序
+	 */
+	protected Sort sort = null;
+
+	public CommonPageable() {
+		this.pageNumber = 0;
+		this.pageSize = 10;
+		this.offset = pageSize * pageNumber;
+	}
+
+	public CommonPageable(int pageNumber, int pageSize) {
+		this.pageNumber = pageNumber;
+		this.pageSize = pageSize;
+		this.offset = pageSize * pageNumber;
+	}
+
+	public CommonPageable(int pageNumber, int pageSize, Sort sort) {
+		this.pageNumber = pageNumber;
+		this.pageSize = pageSize;
+		this.sort = sort;
+		this.offset = pageSize * pageNumber;
+	}
+
+	public int getPageNumber() {
+		return this.pageNumber;
+	}
+
+	public int getPageSize() {
+		return pageSize;
+	}
+
+	public int getOffset() {
+		offset = pageSize * pageNumber;
+		return offset;
+	}
+
+	public Sort getSort() {
+		return sort;
+	}
+
+	public Pageable next() {
+		return null;
+	}
+
+	public Pageable previousOrFirst() {
+		return null;
+	}
+
+	public Pageable first() {
+		return null;
+	}
+
+	public boolean hasPrevious() {
+		return false;
+	}
+
+	public void setPageNumber(int pageNumber) {
+		this.pageNumber = pageNumber;
+	}
+
+	public void setPageSize(int pageSize) {
+		this.pageSize = pageSize;
+	}
+
+	public void setSort(Sort sort) {
+		this.sort = sort;
+	}
+
+	public void setOffset(int offset) {
+		this.offset = offset;
+	}
+
+}

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/core/common/request/CommonRequest.java

+package com.yeejoin.amos.fas.core.common.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 
+ * <pre>
+ * 公共请求对象
+ * </pre>
+ *
+ * @author as-shibaobao
+ * @version $Id: CommonRequest.java, v 0.1 2018年1月26日 上午10:59:19 as-shibaobao Exp $
+ */
+@ApiModel
+public class CommonRequest {
+
+	/**
+	 * 字段名称
+	 */
+	@ApiModelProperty(value="字段名称",required=true)
+	private String name;
+	
+	/**
+	 * 字段值
+	 */
+	@ApiModelProperty(value="字段值",required=true)
+	private Object value;
+	
+	/**
+	 * 查询类型
+	 */
+	@ApiModelProperty(value="查询类型",notes="空值时，默认为等于；其它类型按QueryOperatorEnum",required=false)
+	private String type;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Object getValue() {
+		return value;
+	}
+
+	public void setValue(Object value) {
+		this.value = value;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+}

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/core/common/response/CommonPage.java

+/**
+ * NewHeight.com Inc.
+ * Copyright (c) 2008-2010 All Rights Reserved.
+ */
+package com.yeejoin.amos.fas.core.common.response;
+
+import java.util.List;
+
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+
+/**
+ * <pre>
+ * 分页数据
+ * </pre>
+ *
+ * @author as-youjun
+ * @version $Id: CompanyPage.java, v 0.1 2017年4月13日 上午11:35:25 as-youjun Exp $
+ */
+public final class CommonPage<T> extends PageImpl<T> {
+
+	/**
+	 * <pre>
+	 * uid
+	 * </pre>
+	 */
+	private static final long serialVersionUID = -5533124806408380886L;
+
+	/**
+	 * 
+	 */
+	private String message;
+	
+	/**
+	 * 返回结果状态
+	 */
+	private String result;
+
+	public CommonPage(List<T> content, Pageable pageable, long total) {
+		super(content, pageable, total);
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+	public String getResult()
+	{
+		return result;
+	}
+
+	public void setResult(String result)
+	{
+		this.result = result;
+	}
+}

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/core/common/response/DepartmentResponse.java

+package com.yeejoin.amos.fas.core.common.response;
+
+public class DepartmentResponse {
+	/**
+	 * 部门id
+	 */
+	private Long depId;
+	/**
+	 * 部门名称
+	 */
+	private String depName;
+	
+	public Long getDepId() {
+		return depId;
+	}
+	public void setDepId(Long depId) {
+		this.depId = depId;
+	}
+	public String getDepName() {
+		return depName;
+	}
+	public void setDepName(String depName) {
+		this.depName = depName;
+	}
+	
+	
+}

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/core/common/response/EquipDetailsResponse.java

+package com.yeejoin.amos.fas.core.common.response;
+
+public class EquipDetailsResponse {
+	
+	private String name;
+	
+	private String code;
+	
+	private String address;
+	/**
+	 * 消防小室名称
+	 */
+	private String stationName;
+	
+	private String depName;
+	
+	private String username;
+	
+	private String tel;
+	
+	private String remarks;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getDepName() {
+		return depName;
+	}
+
+	public void setDepName(String depName) {
+		this.depName = depName;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getTel() {
+		return tel;
+	}
+
+	public void setTel(String tel) {
+		this.tel = tel;
+	}
+
+	public String getRemarks() {
+		return remarks;
+	}
+
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public String getStationName() {
+		return stationName;
+	}
+
+	public void setStationName(String stationName) {
+		this.stationName = stationName;
+	}
+}

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/core/common/response/RiskSourceTreeResponse.java

+package com.yeejoin.amos.fas.core.common.response;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public class RiskSourceTreeResponse {
+	
+	private Long id;
+	
+	
+	private Long parentId;
+	
+	private Long riskLevelId;
+	
+	private String code;
+	
+	private String name;
+	
+	private String level;
+	
+	private BigDecimal rpn;
+	
+	private BigDecimal rpni;
+	
+	private String isRegion;
+	
+	private Integer isIndoor;
+	
+	private String position3d;
+	
+	private String floor3d;
+	
+	private String status;
+	
+	private Integer count;
+	
+	private Integer qualified;
+	private Integer unqualified;
+	private Integer omission;
+	private Integer unplan;
+
+	private List<RiskSourceTreeResponse> children;
+	
+	public String getPosition3d() {
+		return position3d;
+	}
+
+	public void setPosition3d(String position3d) {
+		this.position3d = position3d;
+	}
+
+	public String getFloor3d() {
+		return floor3d;
+	}
+
+	public void setFloor3d(String floor3d) {
+		this.floor3d = floor3d;
+	}
+
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getParentId() {
+		return parentId;
+	}
+
+	public void setParentId(Long parentId) {
+		this.parentId = parentId;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public List<RiskSourceTreeResponse> getChildren() {
+		return children;
+	}
+
+	public void setChildren(List<RiskSourceTreeResponse> children) {
+		this.children = children;
+	}
+
+	public String getLevel() {
+		return level;
+	}
+
+	public void setLevel(String level) {
+		this.level = level;
+	}
+
+	public BigDecimal getRpn() {
+		return rpn;
+	}
+
+	public void setRpn(BigDecimal rpn) {
+		this.rpn = rpn;
+	}
+
+	public Long getRiskLevelId() {
+		return riskLevelId;
+	}
+
+	public void setRiskLevelId(Long riskLevelId) {
+		this.riskLevelId = riskLevelId;
+	}
+
+	public String getIsRegion() {
+		return isRegion;
+	}
+
+	public void setIsRegion(String isRegion) {
+		this.isRegion = isRegion;
+	}
+
+	public Integer getIsIndoor() {
+		return isIndoor;
+	}
+
+	public void setIsIndoor(Integer isIndoor) {
+		this.isIndoor = isIndoor;
+	}
+
+	public BigDecimal getRpni() {
+		return rpni;
+	}
+
+	public void setRpni(BigDecimal rpni) {
+		this.rpni = rpni;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public Integer getCount() {
+		return count;
+	}
+
+	public void setCount(Integer count) {
+		this.count = count;
+	}
+
+	public Integer getQualified() {
+		return qualified;
+	}
+
+	public void setQualified(Integer qualified) {
+		this.qualified = qualified;
+	}
+
+	public Integer getUnqualified() {
+		return unqualified;
+	}
+
+	public void setUnqualified(Integer unqualified) {
+		this.unqualified = unqualified;
+	}
+
+	public Integer getOmission() {
+		return omission;
+	}
+
+	public void setOmission(Integer omission) {
+		this.omission = omission;
+	}
+
+	public Integer getUnplan() {
+		return unplan;
+	}
+
+	public void setUnplan(Integer unplan) {
+		this.unplan = unplan;
+	}
+}

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/AccidentType.java

+package com.yeejoin.amos.fas.dao.entity;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+
+/**
+ * The persistent class for the accident_type database table.
+ * 
+ */
+@Entity
+@Table(name="f_accident_type")
+@NamedQuery(name="AccidentType.findAll", query="SELECT a FROM AccidentType a")
+public class AccidentType extends BasicEntity  {
+	private static final long serialVersionUID = 1L;
+
+
+	@Column(name="create_by")
+	private Long createBy;
+
+	@Column(name="dept_id")
+	private Long deptId;
+
+
+	private String name;
+	
+	
+	@Column(name="evaluation_sid")
+	private String evaluationSid;
+
+	@Column(name="org_code")
+	private String orgCode;
+
+	private String remark;
+
+	private String severity;
+	
+
+	private String influence;
+
+	public AccidentType() {
+	}
+
+
+	public Long getCreateBy() {
+		return this.createBy;
+	}
+
+	public void setCreateBy(Long createBy) {
+		this.createBy = createBy;
+	}
+
+	public Long getDeptId() {
+		return this.deptId;
+	}
+
+	public void setDeptId(Long deptId) {
+		this.deptId = deptId;
+	}
+
+	@Transient
+	public String getInfluence() {
+		return this.influence;
+	}
+
+	public void setInfluence(String influence) {
+		this.influence = influence;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getEvaluationSid() {
+		return evaluationSid;
+	}
+
+
+	public void setEvaluationSid(String evaluationSid) {
+		this.evaluationSid = evaluationSid;
+	}
+
+	public String getOrgCode() {
+		return this.orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+
+	public String getRemark() {
+		return this.remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+	
+	@Transient
+	public String getSeverity() {
+		return this.severity;
+	}
+
+	public void setSeverity(String severity) {
+		this.severity = severity;
+	}
+
+}
\ No newline at end of file

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/Alarm.java

+package com.yeejoin.amos.fas.dao.entity;
+
+import java.math.BigInteger;
+import java.util.Date;
+
+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;
+
+
+/**
+ * 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;
+
+	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="alarm_time")
+	private Date alarmTime;
+	
+	/**
+	 * 指标或者报警信息
+	 */
+	@Lob
+	private String metric;
+	
+
+	private String code;
+  
+	/**
+	 * 报警类别
+	 */
+	@Column(name="alarm_type")
+	private String alarmType;
+
+	@Column(name="fire_equipment_id")
+	private BigInteger fireEquipmentId;
+
+	@Column(name="org_code")
+	private String orgCode;
+
+	private String remark;
+
+	public Alarm() {
+	}
+
+	public Date getAlarmTime() {
+		return this.alarmTime;
+	}
+
+	public void setAlarmTime(Date alarmTime) {
+		this.alarmTime = alarmTime;
+	}
+
+	public String getCode() {
+		return this.code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public BigInteger getFireEquipmentId() {
+		return this.fireEquipmentId;
+	}
+
+	public void setFireEquipmentId(BigInteger fireEquipmentId) {
+		this.fireEquipmentId = fireEquipmentId;
+	}
+
+	public String getOrgCode() {
+		return this.orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+
+	public String getRemark() {
+		return this.remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+	public String getMetric() {
+		return metric;
+	}
+
+	public void setMetric(String metric) {
+		this.metric = metric;
+	}
+	
+	public String getAlarmType() {
+		return alarmType;
+	}
+
+	public void setAlarmType(String alarmType) {
+		this.alarmType = alarmType;
+	}
+
+}
\ No newline at end of file

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/BasicEntity.java

+package com.yeejoin.amos.fas.dao.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import com.yeejoin.amos.op.core.entity.Resource;
+
+/**
+ * <pre>
+ * 基本实体类
+ * </pre>
+ *
+ */
+
+@MappedSuperclass
+
+@EntityListeners(AuditingEntityListener.class) 
+public class BasicEntity extends Resource implements Serializable{
+
+	private static final long serialVersionUID = -5464322936854328207L;
+	
+	/**
+	 * id
+	 */
+	private long id;
+
+	@CreatedDate
+	@Column(name="create_date")
+	private Date createDate = new Date();
+
+	@Id
+	@GeneratedValue(strategy=GenerationType.AUTO)
+	@Column(name = "ID",nullable=false,unique=true)
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
+}

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/ContingencyOriginalData.java

+package com.yeejoin.amos.fas.dao.entity;
+
+import com.yeejoin.amos.op.core.entity.BusinessEntity;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.*;
+
+
+@Entity
+@Table(name = "contingency_original_data")
+public class ContingencyOriginalData extends BusinessEntity {
+
+    /**
+     * id
+     */
+    @Id
+    @GeneratedValue(generator = "uuid")
+    @GenericGenerator(name = "uuid", strategy = "uuid2")
+    @Column(name = "id", nullable = false, length = 36)
+    protected String id;
+
+
+    @Column(name = "fire_Equipment_Name")
+    private String fireEquipmentName;//消防设备名称
+
+    @Column(name = "fire_Equipment_Id")
+    private String fireEquipmentId;//消防设备id
+
+    @Column(name = "layer")
+    private Integer  layer;//显示图层
+    //当前探测器
+
+    @Column(name = "fire_Equipment_Layer")
+    private Integer fireEquipmentLayer;//当前探测器图层
+
+    @Column(name = "fire_Equipment_Position")
+    private String  fireEquipmentPosition;//消防设备位置
+
+    //重点设备信息
+    //负责人名称，手机号
+    @Column(name = "equipment_Id")
+    private  String  equipmentId;//重点设备id
+
+    @Column(name = "equipment_Name")
+    private String   equipmentName;
+
+    @Column(name = "equipment_position3d")
+    private String equipmentPosition3d;
+
+    @Column(name = "mobile")
+    private String mobile; //负责人手机号
+
+    @Column(name = "admin_Name")
+    private String adminName;//负责人名称
+
+    //摄像头
+    @Column(name = "camera_Codes")
+    private String cameraCodes;//摄像头编号
+
+    @Column(name = "camera_Ids")
+    private String cameraIds;//摄像头id
+
+    @Column(name = "fire_Count")
+    private Integer fireCount = 1; //火情数量
+
+    @Column(name = "confirm")
+    private String confirm ;//是否确认火情，确认 CONFIRM,取消CANCEL,未操作 NONE
+
+    @Column(name = "batch_No")
+    private String batchNo;
+
+
+
+    @Column(name = "picture1")
+    private String picture1;
+
+    @Column(name = "picture2")
+    private String picture2;
+
+    @Column(name = "picture3")
+    private String picture3;
+
+    @Column(name = "picture4")
+    private String picture4;
+
+    @Column(name = "fire_Truck_Route")
+    private String fireTruckRoute;
+
+    @Column(name = "runstep")
+    private boolean runstep; //是否已经执行流程
+
+    @Column(name = "step")
+    private String step;//当前步骤
+
+    @Column(name = "step_state")
+    private String stepState;//步骤的操作状态，由所有按钮的步骤状态拼接而成
+
+
+    public String getEquipmentPosition3d() {
+        return equipmentPosition3d;
+    }
+
+    public void setEquipmentPosition3d(String equipmentPosition3d) {
+        this.equipmentPosition3d = equipmentPosition3d;
+    }
+
+    public String getStepState() {
+        return stepState;
+    }
+
+    public void setStepState(String stepState) {
+        this.stepState = stepState;
+    }
+
+    public String getStep() {
+        return step;
+    }
+
+    public void setStep(String step) {
+        this.step = step;
+    }
+
+
+    public boolean getRunstep() {
+        return runstep;
+    }
+
+    public void setRunstep(boolean runstep) {
+        this.runstep = runstep;
+    }
+
+    public String getFireTruckRoute() {
+        return fireTruckRoute;
+    }
+
+    public void setFireTruckRoute(String fireTruckRoute) {
+        this.fireTruckRoute = fireTruckRoute;
+    }
+
+    public String getPicture1() {
+        return picture1;
+    }
+
+    public void setPicture1(String picture1) {
+        this.picture1 = picture1;
+    }
+
+    public String getPicture2() {
+        return picture2;
+    }
+
+    public void setPicture2(String picture2) {
+        this.picture2 = picture2;
+    }
+
+    public String getPicture3() {
+        return picture3;
+    }
+
+    public void setPicture3(String picture3) {
+        this.picture3 = picture3;
+    }
+
+    public String getPicture4() {
+        return picture4;
+    }
+
+    public void setPicture4(String picture4) {
+        this.picture4 = picture4;
+    }
+
+    public String getBatchNo() {
+        return batchNo;
+    }
+
+    public void setBatchNo(String batchNo) {
+        this.batchNo = batchNo;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getFireEquipmentName() {
+        return fireEquipmentName;
+    }
+
+    public void setFireEquipmentName(String fireEquipmentName) {
+        this.fireEquipmentName = fireEquipmentName;
+    }
+
+    public String getFireEquipmentId() {
+        return fireEquipmentId;
+    }
+
+    public void setFireEquipmentId(String fireEquipmentId) {
+        this.fireEquipmentId = fireEquipmentId;
+    }
+
+    public Integer getLayer() {
+        return layer;
+    }
+
+    public void setLayer(Integer layer) {
+        this.layer = layer;
+    }
+
+    public Integer getFireEquipmentLayer() {
+        return fireEquipmentLayer;
+    }
+
+    public void setFireEquipmentLayer(Integer fireEquipmentLayer) {
+        this.fireEquipmentLayer = fireEquipmentLayer;
+    }
+
+    public String getFireEquipmentPosition() {
+        return fireEquipmentPosition;
+    }
+
+    public void setFireEquipmentPosition(String fireEquipmentPosition) {
+        this.fireEquipmentPosition = fireEquipmentPosition;
+    }
+
+    public String getEquipmentId() {
+        return equipmentId;
+    }
+
+    public void setEquipmentId(String equipmentId) {
+        this.equipmentId = equipmentId;
+    }
+
+    public String getEquipmentName() {
+        return equipmentName;
+    }
+
+    public void setEquipmentName(String equipmentName) {
+        this.equipmentName = equipmentName;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getAdminName() {
+        return adminName;
+    }
+
+    public void setAdminName(String adminName) {
+        this.adminName = adminName;
+    }
+
+    public String getCameraCodes() {
+        return cameraCodes;
+    }
+
+    public void setCameraCodes(String cameraCodes) {
+        this.cameraCodes = cameraCodes;
+    }
+
+    public String getCameraIds() {
+        return cameraIds;
+    }
+
+    public void setCameraIds(String cameraIds) {
+        this.cameraIds = cameraIds;
+    }
+
+    public Integer getFireCount() {
+        return fireCount;
+    }
+
+    public void setFireCount(Integer fireCount) {
+        this.fireCount = fireCount;
+    }
+
+    public String getConfirm() {
+        return confirm;
+    }
+
+    public void setConfirm(String confirm) {
+        this.confirm = confirm;
+    }
+}

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/ContingencyPlanInstance.java

+package com.yeejoin.amos.fas.dao.entity;
+
+
+import com.yeejoin.amos.op.core.entity.BusinessEntity;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "contingency_plan_instance")
+public class ContingencyPlanInstance extends BusinessEntity {
+
+
+    private static final long serialVersionUID = 292334653532432432L;
+
+
+    /**
+     * id
+     */
+    @Id
+    @GeneratedValue(generator = "uuid")
+    @GenericGenerator(name = "uuid", strategy = "uuid2")
+    @Column(name = "id", nullable = false, length = 36)
+    protected String id;
+
+    @Column(name = "record_type")
+    private String recordType;//	记录类型：消息MESSAGE，操作OPERATE
+
+    @Column(name = "content")
+    private String content	    ;//	记录内容：文本信息或者json数据
+
+
+    @Column(name = "category")
+    private String category;//一级分类
+
+
+    @Column(name = "icon")
+    private String icon	    ;	//图标,url，或者文件名
+    @Column(name = "sort")
+    private Integer sort	    ;//	所有节点一起的排序号
+
+    @Column(name = "sequence_num")
+    private String sequenceNum	;//	用于显示的序号
+
+    @Column(name = "batch_no")
+    private String batchNo	;//	预案实例编号,暂时无法区分多个火灾，暂时存储报警设备id
+
+    @Column(name = "tips")
+    private String tips;
+
+    @Column(name = "runstate")
+    private Boolean runstate;
+
+
+    public Boolean getRunstate() {
+        return runstate;
+    }
+
+    public void setRunstate(Boolean runstate) {
+        this.runstate = runstate;
+    }
+
+    public String getTips() {
+        return tips;
+    }
+
+    public void setTips(String tips) {
+        this.tips = tips;
+    }
+
+    public String getRecordType() {
+        return recordType;
+    }
+
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public void setRecordType(String recordType) {
+        this.recordType = recordType;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public String getSequenceNum() {
+        return sequenceNum;
+    }
+
+    public void setSequenceNum(String sequenceNum) {
+        this.sequenceNum = sequenceNum;
+    }
+
+
+    public String getBatchNo() {
+        return batchNo;
+    }
+
+    public void setBatchNo(String batchNo) {
+        this.batchNo = batchNo;
+    }
+}

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/Dict.java

+package com.yeejoin.amos.fas.dao.entity;
+
+import org.hibernate.annotations.Proxy;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+
+/**
+ * 数据字典
+ * @author gaodongdong
+ *
+ */
+@Entity
+@Table(name="f_dict")
+@NamedQuery(name="Dict.findAll", query="SELECT d FROM Dict d")
+@Proxy(lazy = false)
+public class Dict {
+	
+	@Id
+	@GeneratedValue(strategy=GenerationType.AUTO)
+	@Column(name = "ID",nullable=false,unique=true)
+	private long id;
+	@Column(name="dict_name")
+	private String dictName;
+	@Column(name="dict_code")
+	private String dictCode;
+	@Column(name="dict_value")
+	private String dictValue;
+	@Column(name="parent_id")
+	private String parentId;
+	@Column(name="is_delete")
+	private byte isDelete;
+	@Column(name="remark")
+	private String remark;
+	@Column(name="dict_order")
+	private long dictOrder;
+	
+	public long getId() {
+		return id;
+	}
+	public void setId(long id) {
+		this.id = id;
+	}
+	public String getDictName() {
+		return dictName;
+	}
+	public void setDictName(String dictName) {
+		this.dictName = dictName;
+	}
+	public String getDictCode() {
+		return dictCode;
+	}
+	public void setDictCode(String dictCode) {
+		this.dictCode = dictCode;
+	}
+	public String getDictValue() {
+		return dictValue;
+	}
+	public void setDictValue(String dictValue) {
+		this.dictValue = dictValue;
+	}
+	public String getParentId() {
+		return parentId;
+	}
+	public void setParentId(String parentId) {
+		this.parentId = parentId;
+	}
+	public byte getIsDelete() {
+		return isDelete;
+	}
+	public void setIsDelete(byte isDelete) {
+		this.isDelete = isDelete;
+	}
+	public String getRemark() {
+		return remark;
+	}
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+	public long getDictOrder() {
+		return dictOrder;
+	}
+	public void setDictOrder(long dictOrder) {
+		this.dictOrder = dictOrder;
+	}
+	
+	
+}

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/Equipment.java

+package com.yeejoin.amos.fas.dao.entity;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+
+
+/**
+ * The persistent class for the equipment database table.
+ * 
+ */
+@Entity
+@Table(name="f_equipment")
+@NamedQuery(name="Equipment.findAll", query="SELECT e FROM Equipment e")
+public class Equipment extends BasicEntity  {
+	private static final long serialVersionUID = 1L;
+
+	private String address;
+
+	private String building;
+	
+	/**
+	 * 所属风险区域id
+	 */
+	@Column(name="risk_source_id")
+	private Long riskSourceId;
+	/**
+	 * 3维坐标
+	 */
+	private String position3d;
+	
+	/**
+	 * 3维楼层
+	 */
+	private String floor3d;
+	
+	/**
+	 * 预案配置
+	 */
+	@Column(name="reserve_plan")
+	private String reservePlan;
+
+	/**
+	 * 是否室内 0-否 1-是
+	 */
+	@Column(name="is_indoor")
+	private Boolean isIndoor;
+
+	@Column(name="charge_dept_id")
+	private int chargeDeptId;
+
+	@Column(name="charge_user_id")
+	private int chargeUserId;
+
+	private String code;
+
+	@Column(name="fire_truck_route")
+	private String fireTruckRoute;
+
+
+	public String getFireTruckRoute() {
+		return fireTruckRoute;
+	}
+
+	public void setFireTruckRoute(String fireTruckRoute) {
+		this.fireTruckRoute = fireTruckRoute;
+	}
+
+	public String getPosition3d() {
+		return position3d;
+	}
+
+	public void setPosition3d(String position3d) {
+		this.position3d = position3d;
+	}
+
+	public String getFloor3d() {
+		return floor3d;
+	}
+
+	public void setFloor3d(String floor3d) {
+		this.floor3d = floor3d;
+	}
+
+	public Boolean getIsIndoor() {
+		return isIndoor;
+	}
+
+	public void setIsIndoor(Boolean isIndoor) {
+		this.isIndoor = isIndoor;
+	}
+
+	private String room;
+	
+	/**
+	 * 关联消防小室id
+	 */
+	@Column(name="fire_station_id")
+	private Long fireStationId;
+
+	
+
+	@Column(name="create_by")
+	private int createBy;
+
+	private String name;
+
+	@Column(name="org_code")
+	private String orgCode;
+
+	private String remark;
+
+	public Equipment() {
+	}
+
+	public String getAddress() {
+		return this.address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public String getBuilding() {
+		return this.building;
+	}
+
+	public void setBuilding(String building) {
+		this.building = building;
+	}
+
+	public Long getRiskSourceId() {
+		return riskSourceId;
+	}
+
+	public void setRiskSourceId(Long riskSourceId) {
+		this.riskSourceId = riskSourceId;
+	}
+
+	public int getChargeDeptId() {
+		return this.chargeDeptId;
+	}
+
+	public void setChargeDeptId(int chargeDeptId) {
+		this.chargeDeptId = chargeDeptId;
+	}
+
+	public int getChargeUserId() {
+		return this.chargeUserId;
+	}
+
+	public void setChargeUserId(int chargeUserId) {
+		this.chargeUserId = chargeUserId;
+	}
+
+	public String getCode() {
+		return this.code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public int getCreateBy() {
+		return this.createBy;
+	}
+
+	public void setCreateBy(int createBy) {
+		this.createBy = createBy;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getOrgCode() {
+		return this.orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+	public Long getFireStationId() {
+		return fireStationId;
+	}
+
+	public void setFireStationId(Long fireStationId) {
+		this.fireStationId = fireStationId;
+	}
+	public String getRemark() {
+		return this.remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+
+	public String getRoom() {
+		return room;
+	}
+
+	public void setRoom(String room) {
+		this.room = room;
+	}
+	
+	public String getReservePlan() {
+		return reservePlan;
+	}
+
+	public void setReservePlan(String reservePlan) {
+		this.reservePlan = reservePlan;
+	}
+
+}
\ No newline at end of file

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/EquipmentFireEquipment.java

+package com.yeejoin.amos.fas.dao.entity;
+
+import java.math.BigInteger;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+
+
+/**
+ * The persistent class for the equipment_fire_equipment database table.
+ * 
+ */
+@Entity
+@Table(name="f_equipment_fire_equipment")
+@NamedQuery(name="EquipmentFireEquipment.findAll", query="SELECT e FROM EquipmentFireEquipment e")
+public class EquipmentFireEquipment extends BasicEntity  {
+	private static final long serialVersionUID = 1L;
+
+	@Column(name="equipment_id")
+	private BigInteger equipmentId;
+
+
+	@Column(name="fire_equipment_id")
+	private BigInteger fireEquipmentId;
+
+	public EquipmentFireEquipment() {
+	}
+
+	public BigInteger getEquipmentId() {
+		return this.equipmentId;
+	}
+
+	public void setEquipmentId(BigInteger equipmentId) {
+		this.equipmentId = equipmentId;
+	}
+
+	public BigInteger getFireEquipmentId() {
+		return this.fireEquipmentId;
+	}
+
+	public void setFireEquipmentId(BigInteger fireEquipmentId) {
+		this.fireEquipmentId = fireEquipmentId;
+	}
+
+}
\ No newline at end of file

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/EvaluationModel.java

+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;
+
+
+/**
+ * The persistent class for the evaluation_model database table.
+ * 
+ */
+@Entity
+@Table(name="f_evaluation_model")
+@NamedQuery(name="EvaluationModel.findAll", query="SELECT e FROM EvaluationModel e")
+public class EvaluationModel extends BasicEntity  {
+	private static final long serialVersionUID = 1L;
+
+	@Column(name="create_by")
+	private int createBy;
+
+	private String name;
+	
+	/**
+	 * 系数
+	 */
+	private String coefficient;
+
+	/**
+	 * 影响
+	 */
+	private String influence;
+	
+	/**
+	 * 描述
+	 */
+	private String describe;
+	
+	/**
+	 * S,D,O
+	 */
+	private String type;
+	
+	@Column(name="org_code")
+	private String orgCode;
+
+	
+	private String remark;
+
+	@Lob
+	private String standard;
+
+	public EvaluationModel() {
+	}
+
+	public int getCreateBy() {
+		return this.createBy;
+	}
+
+	public void setCreateBy(int createBy) {
+		this.createBy = createBy;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getOrgCode() {
+		return this.orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+
+	public String getRemark() {
+		return this.remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getStandard() {
+		return this.standard;
+	}
+
+	public void setStandard(String standard) {
+		this.standard = standard;
+	}
+
+	public String getCoefficient() {
+		return coefficient;
+	}
+
+	public void setCoefficient(String coefficient) {
+		this.coefficient = coefficient;
+	}
+
+	public String getInfluence() {
+		return influence;
+	}
+
+	public void setInfluence(String influence) {
+		this.influence = influence;
+	}
+
+	public String getDescribe() {
+		return describe;
+	}
+
+	public void setDescribe(String describe) {
+		this.describe = describe;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+}
\ No newline at end of file

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/FireCar.java

+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;
+
+
+/**
+ * The persistent class for the fire_car database table.
+ * 
+ */
+@Entity
+@Table(name="f_fire_car")
+@NamedQuery(name="FireCar.findAll", query="SELECT f FROM FireCar f")
+public class FireCar extends BasicEntity  {
+	private static final long serialVersionUID = 1L;
+
+	@Column(name="car_num")
+	private String carNum;
+
+	private String country;
+
+	@Column(name="create_by")
+	private int createBy;
+
+	@Column(name="engine_num")
+	private String engineNum;
+
+	private String model;
+
+	private String name;
+
+	@Column(name="org_code")
+	private String orgCode;
+
+	@Column(name="dept_id")
+	private int deptId;
+
+	@Lob
+	@Column(name="performance_index")
+	private String performanceIndex;
+
+	private String remark;
+
+	private String state;
+
+	private String type;
+	
+	/**
+	 * 所属风险区域id
+	 */
+	@Column(name="risk_source_id")
+	private Long riskSourceId;
+	
+	/**
+	 * 3维坐标
+	 */
+	private String position3d;
+	
+	/**
+	 * 3维楼层
+	 */
+	private String floor3d;	
+	
+	/**
+	 * 是否室内
+	 */
+	@Column(name="is_indoor")
+	private Boolean isIndoor=true;
+
+	/**
+	 * 消防车图片路径
+	 */
+	@Column(name="photo_path")
+	private String photoPath;
+	
+	public FireCar() {
+	}
+
+	public String getCarNum() {
+		return this.carNum;
+	}
+
+	public void setCarNum(String carNum) {
+		this.carNum = carNum;
+	}
+
+	public String getCountry() {
+		return this.country;
+	}
+
+	public void setCountry(String country) {
+		this.country = country;
+	}
+
+	public int getCreateBy() {
+		return this.createBy;
+	}
+
+	public void setCreateBy(int createBy) {
+		this.createBy = createBy;
+	}
+
+	public String getEngineNum() {
+		return this.engineNum;
+	}
+
+	public void setEngineNum(String engineNum) {
+		this.engineNum = engineNum;
+	}
+
+	public String getModel() {
+		return this.model;
+	}
+
+	public void setModel(String model) {
+		this.model = model;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getOrgCode() {
+		return this.orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+
+	public String getPerformanceIndex() {
+		return this.performanceIndex;
+	}
+
+	public void setPerformanceIndex(String performanceIndex) {
+		this.performanceIndex = performanceIndex;
+	}
+
+	public String getRemark() {
+		return this.remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getState() {
+		return this.state;
+	}
+
+	public void setState(String state) {
+		this.state = state;
+	}
+
+	public String getType() {
+		return this.type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+	
+	public int getDeptId() {
+		return deptId;
+	}
+
+	public void setDeptId(int deptId) {
+		this.deptId = deptId;
+	}
+	
+
+	public String getPosition3d() {
+		return position3d;
+	}
+
+	public void setPosition3d(String position3d) {
+		this.position3d = position3d;
+	}
+
+	public String getFloor3d() {
+		return floor3d;
+	}
+
+	public void setFloor3d(String floor3d) {
+		this.floor3d = floor3d;
+	}
+
+	public Boolean getIsIndoor() {
+		return isIndoor;
+	}
+
+	public void setIsIndoor(Boolean isIndoor) {
+		this.isIndoor = isIndoor;
+	}
+
+
+	public String getPhotoPath() {
+		return photoPath;
+	}
+
+	public void setPhotoPath(String photoPath) {
+		this.photoPath = photoPath;
+	}
+
+	public Long getRiskSourceId() {
+		return riskSourceId;
+	}
+
+	public void setRiskSourceId(Long riskSourceId) {
+		this.riskSourceId = riskSourceId;
+	}
+
+}
\ No newline at end of file

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/FireEquipment.java

+package com.yeejoin.amos.fas.dao.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.persistence.*;
+
+
+/**
+ * The persistent class for the fire_equipment database table.
+ * 
+ */
+@Entity
+@Table(name="f_fire_equipment")
+@NamedQuery(name="FireEquipment.findAll", query="SELECT f FROM FireEquipment f")
+public class FireEquipment extends BasicEntity  {
+	private static final long serialVersionUID = 1L;
+
+	private String brand;
+
+	private String code;
+	
+	/**
+	 * 3维坐标
+	 */
+	private String position3d;
+	
+	/**
+	 * 3维楼层
+	 */
+	private String floor3d;
+
+	/**
+	 * 是否室内 0-否 1-是
+	 */
+	@Column(name="is_indoor")
+	private Boolean isIndoor;
+
+	@Column(name="create_by")
+	private int createBy;
+
+	@Temporal(TemporalType.DATE)
+	@Column(name="effective_date")
+	private Date effectiveDate;
+
+	@Column(name="maintenance_cycle")
+	private int maintenanceCycle;
+	
+	/**
+	 * 装备分类：0-设备类；1-耗材类
+	 */
+	@Column(name="equip_classify")
+	private int equipClassify;
+
+	private String manufacturer;
+
+	private String model;
+
+	private String name;
+
+	private int number;
+
+	@Column(name="org_code")
+	private String orgCode;
+
+	@Column(name="production_area")
+	private String productionArea;
+
+	@Temporal(TemporalType.DATE)
+	@Column(name="production_date")
+	private Date productionDate;
+
+	private String remark;
+
+	private String room;
+	
+	/**
+	 * 装备编码
+	 */
+	@Column(name="equip_code")
+	private String equipCode;
+	
+	/**
+	 * 装备类型
+	 */
+	@Column(name="equip_type")
+	private String equipType;
+	
+	/**
+	 * 监测设备状态
+	 */
+	@Column(name="equip_status")
+	private Integer equipStatus;
+
+
+	private String unit;
+
+
+	private String protectObjNames;
+	
+	/**
+	 * 重量
+	 */
+	private BigDecimal weight;
+	
+	/**
+	 * 动作状态
+	 */
+	@Column(name="action_state")
+	private String actionState;
+	
+	/**
+	 * 喷发状态
+	 */
+	@Column(name="eruption_state")
+	private String eruptionState;
+	
+	/**
+	 * 所属风险区域id
+	 */
+	@Column(name="risk_source_id")
+	private Long riskSourceId;
+
+	public Long getRiskSourceId() {
+		return riskSourceId;
+	}
+
+	public void setRiskSourceId(Long riskSourceId) {
+		this.riskSourceId = riskSourceId;
+	}
+
+	public String getActionState() {
+		return actionState;
+	}
+
+	public void setActionState(String actionState) {
+		this.actionState = actionState;
+	}
+
+	public String getEruptionState() {
+		return eruptionState;
+	}
+
+	public void setEruptionState(String eruptionState) {
+		this.eruptionState = eruptionState;
+	}
+
+	@Transient
+	public String getProtectObjNames() {
+		return protectObjNames;
+	}
+
+	public void setProtectObjNames(String protectObjNames) {
+		this.protectObjNames = protectObjNames;
+	}
+
+	public Integer getEquipStatus() {
+		return equipStatus;
+	}
+
+	public void setEquipStatus(Integer equipStatus) {
+		this.equipStatus = equipStatus;
+	}
+	
+	public FireEquipment() {
+	}
+
+	public String getBrand() {
+		return this.brand;
+	}
+
+	public void setBrand(String brand) {
+		this.brand = brand;
+	}
+
+	public String getCode() {
+		return this.code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public int getCreateBy() {
+		return this.createBy;
+	}
+
+	public void setCreateBy(int createBy) {
+		this.createBy = createBy;
+	}
+
+	public Date getEffectiveDate() {
+		return this.effectiveDate;
+	}
+
+	public void setEffectiveDate(Date effectiveDate) {
+		this.effectiveDate = effectiveDate;
+	}
+
+
+	public int getMaintenanceCycle() {
+		return this.maintenanceCycle;
+	}
+
+	public void setMaintenanceCycle(int maintenanceCycle) {
+		this.maintenanceCycle = maintenanceCycle;
+	}
+
+	public String getManufacturer() {
+		return this.manufacturer;
+	}
+
+	public void setManufacturer(String manufacturer) {
+		this.manufacturer = manufacturer;
+	}
+
+	public String getModel() {
+		return this.model;
+	}
+
+	public void setModel(String model) {
+		this.model = model;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public int getNumber() {
+		return this.number;
+	}
+
+	public void setNumber(int number) {
+		this.number = number;
+	}
+
+	public String getOrgCode() {
+		return this.orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+
+	public String getProductionArea() {
+		return this.productionArea;
+	}
+
+	public void setProductionArea(String productionArea) {
+		this.productionArea = productionArea;
+	}
+
+	public Date getProductionDate() {
+		return this.productionDate;
+	}
+
+	public void setProductionDate(Date productionDate) {
+		this.productionDate = productionDate;
+	}
+
+	public String getRemark() {
+		return this.remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getRoom() {
+		return this.room;
+	}
+
+	public void setRoom(String room) {
+		this.room = room;
+	}
+
+
+	public String getUnit() {
+		return this.unit;
+	}
+
+	public void setUnit(String unit) {
+		this.unit = unit;
+	}
+
+	public String getEquipCode() {
+		return equipCode;
+	}
+
+	public void setEquipCode(String equipCode) {
+		this.equipCode = equipCode;
+	}
+
+	public String getEquipType() {
+		return equipType;
+	}
+
+	public void setEquipType(String equipType) {
+		this.equipType = equipType;
+	}
+	
+	public int getEquipClassify() {
+		return equipClassify;
+	}
+
+	public void setEquipClassify(int equipClassify) {
+		this.equipClassify = equipClassify;
+	}
+	
+	public String getPosition3d() {
+		return position3d;
+	}
+
+	public void setPosition3d(String position3d) {
+		this.position3d = position3d;
+	}
+
+	public String getFloor3d() {
+		return floor3d;
+	}
+
+	public void setFloor3d(String floor3d) {
+		this.floor3d = floor3d;
+	}
+
+	public Boolean getIsIndoor() {
+		return isIndoor;
+	}
+
+	public void setIsIndoor(Boolean isIndoor) {
+		this.isIndoor = isIndoor;
+	}
+
+	public BigDecimal getWeight() {
+		return weight;
+	}
+
+	public void setWeight(BigDecimal weight) {
+		this.weight = weight;
+	}
+	
+
+}
\ No newline at end of file

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/FireEquipmentData.java

+package com.yeejoin.amos.fas.dao.entity;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+
+
+/**
+ * The persistent class for the fire_equipment database table.
+ * 
+ */
+@Entity
+@Table(name="f_fire_equipment_data")
+@NamedQuery(name="FireEquipmentData.findAll", query="SELECT f FROM FireEquipmentData f")
+public class FireEquipmentData extends BasicEntity  {
+	private static final long serialVersionUID = 1L;
+
+	@Column(name="fire_equipment_id")
+	private Long fireEquipmentId;
+
+	@Column(name="fire_equipment_point_id")
+	private Long fireEquipmentPointId;
+	
+	@Column(name="eq_point_name")
+	private String eqPointName;
+	
+	@Column(name="eq_point_unit")
+	private String eqPointUnit;
+	
+	@Column(name="eq_point_code")
+	private String eqPointCode;
+	
+	private String type="alarm";
+
+	/**
+	 * 信息地址
+	 */
+	@Column(name="information_address")
+	private String informationAddress;
+	/**
+	 * 值
+	 */
+	@Column(name="e_value")
+	private String eValue;
+	
+	private int soe;
+	
+	@Column(name="is_invalid")
+	private int isInvalid; // 是否有效
+
+	public Long getFireEquipmentId() {
+		return fireEquipmentId;
+	}
+
+	public void setFireEquipmentId(Long fireEquipmentId) {
+		this.fireEquipmentId = fireEquipmentId;
+	}
+
+	public Long getFireEquipmentPointId() {
+		return fireEquipmentPointId;
+	}
+
+	public void setFireEquipmentPointId(Long fireEquipmentPointId) {
+		this.fireEquipmentPointId = fireEquipmentPointId;
+	}
+
+	public String getEqPointName() {
+		return eqPointName;
+	}
+
+	public void setEqPointName(String eqPointName) {
+		this.eqPointName = eqPointName;
+	}
+
+	public String getEqPointUnit() {
+		return eqPointUnit;
+	}
+
+	public void setEqPointUnit(String eqPointUnit) {
+		this.eqPointUnit = eqPointUnit;
+	}
+
+	public String getEqPointCode() {
+		return eqPointCode;
+	}
+
+	public void setEqPointCode(String eqPointCode) {
+		this.eqPointCode = eqPointCode;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getInformationAddress() {
+		return informationAddress;
+	}
+
+	public void setInformationAddress(String informationAddress) {
+		this.informationAddress = informationAddress;
+	}
+
+	public String geteValue() {
+		return eValue;
+	}
+
+	public void seteValue(String eValue) {
+		this.eValue = eValue;
+	}
+
+	public int getSoe() {
+		return soe;
+	}
+
+	public void setSoe(int soe) {
+		this.soe = soe;
+	}
+
+	public int getIsInvalid() {
+		return isInvalid;
+	}
+
+	public void setIsInvalid(int isInvalid) {
+		this.isInvalid = isInvalid;
+	}
+
+	
+
+}
\ No newline at end of file

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/FireEquipmentPoint.java

+package com.yeejoin.amos.fas.dao.entity;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+
+import org.springframework.data.annotation.Transient;
+
+
+/**
+ * The persistent class for the f_fire_equipment_point database table.
+ * 
+ */
+@Entity
+@Table(name="f_fire_equipment_point")
+@NamedQuery(name="FireEquipmentPoint.findAll", query="SELECT f FROM FireEquipmentPoint f")
+public class FireEquipmentPoint extends BasicEntity  {
+	private static final long serialVersionUID = 1L;
+	@Column(name="code")
+	private String code;
+
+	@Column(name="create_by")
+	private Long createBy;
+
+	@Column(name="fire_equipment_id")
+	private Long fireEquipmentId;
+
+	@Column(name="name")
+	private String name;
+
+	@Column(name="remark")
+	private String remark;
+
+	@Column(name="type")
+	private String type;
+
+	@Column(name="value")
+	private String value;
+
+	private String unit;
+	@Column(name="alarm_type")
+	private Long alarmType;
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public Long getCreateBy() {
+		return createBy;
+	}
+
+	public void setCreateBy(Long createBy) {
+		this.createBy = createBy;
+	}
+
+	public Long getFireEquipmentId() {
+		return fireEquipmentId;
+	}
+
+	public void setFireEquipmentId(Long fireEquipmentId) {
+		this.fireEquipmentId = fireEquipmentId;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	public String getUnit() {
+		return unit;
+	}
+
+	public void setUnit(String unit) {
+		this.unit = unit;
+	}
+
+	public Long getAlarmType() {
+		return alarmType;
+	}
+
+	public void setAlarmType(Long alarmType) {
+		this.alarmType = alarmType;
+	}
+}
\ No newline at end of file

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/FireStation.java

+package com.yeejoin.amos.fas.dao.entity;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * 消防站点
+ * @author Administrator
+ *
+ */
+@Entity
+@Table(name="f_fire_station")
+@NamedQuery(name="FireStation.findAll", query="SELECT f FROM FireStation f")
+public class FireStation extends BasicEntity{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	
+	/**
+	 * 名称
+	 */
+	private String name;
+	/**
+	 * 编号
+	 */
+	private String code;
+	
+	/**
+	 * 类型 1：消防小室，2：消防泡沫间
+	 */
+	private String type;
+	
+	/**
+	 * 所属风险区域id
+	 */
+	@Column(name="risk_source_id")
+	private Long riskSourceId;
+	
+
+	/**
+	 * 位置
+	 */
+	private String address;
+	
+	/**
+	 * 3纬坐标
+	 */
+	private String position3d;
+	
+	/**
+	 * 3维楼层
+	 */
+	private String floor3d;	
+	
+	/**
+	 * 是否室内
+	 */
+	@Column(name="is_indoor")
+	private Boolean isIndoor=true;
+	
+	/**
+	 * 组织
+	 */
+	@Column(name="org_code")
+	private String orgCode;
+	
+	/**
+	 * 创建人
+	 */
+	@Column(name="create_by")
+	private int createBy;
+	
+	
+	@Column(name="picture")
+	private String picture;
+
+	private List<Map> fireEquipmentInfo;
+
+
+	@Transient
+	public List<Map> getFireEquipmentInfo() {
+		return fireEquipmentInfo;
+	}
+
+	public void setFireEquipmentInfo(List<Map> fireEquipmentInfo) {
+		this.fireEquipmentInfo = fireEquipmentInfo;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public String getPosition3d() {
+		return position3d;
+	}
+
+	public void setPosition3d(String position3d) {
+		this.position3d = position3d;
+	}
+
+	public String getFloor3d() {
+		return floor3d;
+	}
+
+	public void setFloor3d(String floor3d) {
+		this.floor3d = floor3d;
+	}
+
+	public Boolean getIsIndoor() {
+		return isIndoor;
+	}
+
+	public void setIsIndoor(Boolean isIndoor) {
+		this.isIndoor = isIndoor;
+	}
+
+	public String getOrgCode() {
+		return orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+
+	public int getCreateBy() {
+		return createBy;
+	}
+
+	public void setCreateBy(int createBy) {
+		this.createBy = createBy;
+	}
+
+	public String getPicture() {
+		return picture;
+	}
+
+	public void setPicture(String picture) {
+		this.picture = picture;
+	}
+
+	public Long getRiskSourceId() {
+		return riskSourceId;
+	}
+
+	public void setRiskSourceId(Long riskSourceId) {
+		this.riskSourceId = riskSourceId;
+	}
+}

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/FireStationFireEquipment.java

+package com.yeejoin.amos.fas.dao.entity;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+/**
+ * 消防站关联物资
+ * @author Administrator
+ *
+ */
+@Entity
+@Table(name="f_fire_station_equipment")
+@NamedQuery(name="FireStationFireEquipment.findAll", query="SELECT f FROM FireStationFireEquipment f")
+public class FireStationFireEquipment extends BasicEntity{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	
+	/**
+	 * 消防站id
+	 */
+	@Column(name="fire_station_id")
+	private Long fireStationId;
+	
+	/**
+	 * 消防资源
+	 */
+	@Column(name="fire_equipment_id")
+	private Long fireEquipmentId;
+	
+	/**
+	 * 个数
+	 */
+	private Double number;
+	
+	/**
+	 * 单位
+	 */
+	private String unit;
+	
+	/**
+	 * 创建人
+	 */
+	@Column(name="create_by")
+	private int createBy;
+
+	public Long getFireStationId() {
+		return fireStationId;
+	}
+
+	public void setFireStationId(Long fireStationId) {
+		this.fireStationId = fireStationId;
+	}
+
+	public Long getFireEquipmentId() {
+		return fireEquipmentId;
+	}
+
+	public void setFireEquipmentId(Long fireEquipmentId) {
+		this.fireEquipmentId = fireEquipmentId;
+	}
+
+	public Double getNumber() {
+		return number;
+	}
+
+	public void setNumber(Double number) {
+		this.number = number;
+	}
+
+	public String getUnit() {
+		return unit;
+	}
+
+	public void setUnit(String unit) {
+		this.unit = unit;
+	}
+
+	public int getCreateBy() {
+		return createBy;
+	}
+
+	public void setCreateBy(int createBy) {
+		this.createBy = createBy;
+	}
+
+}

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/FireStrength.java

+package com.yeejoin.amos.fas.dao.entity;
+
+import java.sql.Time;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+/**
+ * 消防力量
+ * @author Administrator
+ *
+ */
+@Entity
+@Table(name="f_fire_strength")
+@NamedQuery(name="FireStrength.findAll", query="SELECT f FROM FireStrength f")
+public class FireStrength extends BasicEntity{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	
+	/**
+	 * 编号
+	 */
+	private String code;
+	
+	/**
+	 * 姓名
+	 */
+	private String username;
+	
+	/**
+	 * 职位
+	 */
+	private String position;
+	
+	/**
+	 * 固话
+	 */
+	private String tel;
+	
+	/**
+     * 开始时间
+     */
+	@Column(name="day_begin")
+	private Time dayBegin;
+	/**
+     * 结束时间
+     */
+	@Column(name="day_end")
+	private Time dayEnd;
+	/**
+	 * 手机
+	 */
+	@Column(name="phone_num")
+	private String phoneNum; 
+	
+	/**
+	 * 工作描述
+	 */
+	@Column(name="job_des")
+	private String jobDes;
+	
+	/**
+	 * 备注
+	 */
+	private String remark;
+	
+	/**
+	 * 组织
+	 */
+	@Column(name="org_code")
+	private String orgCode;
+	
+	/**
+	 * 创建人
+	 */
+	@Column(name="create_by")
+	private int createBy;
+	
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getPosition() {
+		return position;
+	}
+
+	public void setPosition(String position) {
+		this.position = position;
+	}
+
+	public String getTel() {
+		return tel;
+	}
+
+	public void setTel(String tel) {
+		this.tel = tel;
+	}
+
+	public String getPhoneNum() {
+		return phoneNum;
+	}
+
+	public void setPhoneNum(String phoneNum) {
+		this.phoneNum = phoneNum;
+	}
+
+	public String getJobDes() {
+		return jobDes;
+	}
+
+	public void setJobDes(String jobDes) {
+		this.jobDes = jobDes;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getOrgCode() {
+		return orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+
+	public int getCreateBy() {
+		return createBy;
+	}
+
+	public void setCreateBy(int createBy) {
+		this.createBy = createBy;
+	}
+
+	public Time getDayBegin() {
+		return dayBegin;
+	}
+
+	public void setDayBegin(Time dayBegin) {
+		this.dayBegin = dayBegin;
+	}
+
+	public Time getDayEnd() {
+		return dayEnd;
+	}
+
+	public void setDayEnd(Time dayEnd) {
+		this.dayEnd = dayEnd;
+	}
+
+}

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/Fmea.java

+package com.yeejoin.amos.fas.dao.entity;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+
+import com.fasterxml.jackson.annotation.JsonBackReference;
+
+
+/**
+ * The persistent class for the fmea database table.
+ * 
+ */
+@Entity
+@Table(name="f_fmea")
+@NamedQuery(name="Fmea.findAll", query="SELECT f FROM Fmea f")
+public class Fmea extends BasicEntity  {
+	private static final long serialVersionUID = 1L;
+
+	@Column(name="create_by")
+	private int createBy;
+
+	@Lob
+	private String disposal;
+
+	@Lob
+	private String engineering;
+
+	@Column(name="evaluation_did")
+	private BigInteger evaluationDid;
+
+	@Column(name="evaluation_oid")
+	private BigInteger evaluationOid;
+
+	@Column(name="evaluation_oid")
+	private BigInteger evaluationSid;
+
+	@Lob
+	private String management;
+
+	@Lob
+	private String protection;
+
+	private String remark;
+
+	@Column(name="risk_factors_id")
+	private Long riskFactorsId;
+
+	@Column(name="risk_source_id")
+	private Long riskSourceId;
+
+	private BigDecimal rpni;
+
+	@Lob
+	private String train;
+
+	private RiskSource riskSource;
+	
+	public Fmea() {
+	}
+
+	public int getCreateBy() {
+		return this.createBy;
+	}
+
+	public void setCreateBy(int createBy) {
+		this.createBy = createBy;
+	}
+
+	public String getDisposal() {
+		return this.disposal;
+	}
+
+	public void setDisposal(String disposal) {
+		this.disposal = disposal;
+	}
+
+	public String getEngineering() {
+		return this.engineering;
+	}
+
+	public void setEngineering(String engineering) {
+		this.engineering = engineering;
+	}
+
+	public BigInteger getEvaluationDid() {
+		return this.evaluationDid;
+	}
+
+	public void setEvaluationDid(BigInteger evaluationDid) {
+		this.evaluationDid = evaluationDid;
+	}
+
+	public BigInteger getEvaluationOid() {
+		return this.evaluationOid;
+	}
+
+	public void setEvaluationOid(BigInteger evaluationOid) {
+		this.evaluationOid = evaluationOid;
+	}
+
+	public BigInteger getEvaluationSid() {
+		return this.evaluationSid;
+	}
+
+	public void setEvaluationSid(BigInteger evaluationSid) {
+		this.evaluationSid = evaluationSid;
+	}
+
+	public String getManagement() {
+		return this.management;
+	}
+
+	public void setManagement(String management) {
+		this.management = management;
+	}
+
+	public String getProtection() {
+		return this.protection;
+	}
+
+	public void setProtection(String protection) {
+		this.protection = protection;
+	}
+
+	public String getRemark() {
+		return this.remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public Long getRiskFactorsId() {
+		return this.riskFactorsId;
+	}
+
+	public void setRiskFactorsId(Long riskFactorsId) {
+		this.riskFactorsId = riskFactorsId;
+	}
+
+	public Long getRiskSourceId() {
+		return this.riskSourceId;
+	}
+
+	public void setRiskSourceId(Long riskSourceId) {
+		this.riskSourceId = riskSourceId;
+	}
+
+	public BigDecimal getRpni() {
+		return this.rpni;
+	}
+
+	public void setRpni(BigDecimal rpni) {
+		this.rpni = rpni;
+	}
+
+	public String getTrain() {
+		return this.train;
+	}
+
+	public void setTrain(String train) {
+		this.train = train;
+	}
+
+	@ManyToOne
+	@JoinColumn(name = "riskSourceId", referencedColumnName = "id", updatable = false, insertable = false)	
+	public RiskSource getRiskSource() {
+		return riskSource;
+	}
+
+	@JsonBackReference
+	public void setRiskSource(RiskSource riskSource) {
+		this.riskSource = riskSource;
+	}
+
+}
\ No newline at end of file

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/NodeMessageView.java

+package com.yeejoin.amos.fas.dao.entity;
+
+
+import com.yeejoin.amos.op.core.util.DateUtil;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 
+ * <pre>
+ * 三维节点与规则消息实体视图
+ * </pre>
+ *
+ * @author amos
+ * @version $Id: NodeMessageView.java, v 0.1 2019年1月2日 下午2:39:52 amos Exp $
+ */
+@Entity
+@Table(name = "toip_biz_message")
+public class NodeMessageView implements Serializable
+{
+
+	/**
+	 * <pre>
+	 * 
+	 * </pre>
+	 */
+	private static final long serialVersionUID = 292329658525267887L;
+
+	@Id
+	private String id;
+	/**
+	 * 时间
+	 */
+	private Date time;
+	
+	@Transient
+	private String timeStr;
+	/**
+	 * 标题
+	 */
+	private String title;
+	/**
+	 * 内容
+	 */
+	private String content;
+	/**
+	 * 类型
+	 */
+	private String type;
+	/**
+	 * 发送者
+	 */
+	private String sender;
+	/**
+	 * 接收者
+	 */
+	private String receiver;
+	/**
+	 * 已读者
+	 */
+	private String reader;
+	/**
+	 * 业务id
+	 */
+	private String bizId;
+	/**
+	 * 业务员实体名，例如com.yeejoin.amos.toip.bizrulebridge.entity.Fire
+	 */
+	private String bizclassName;
+	/**
+	 * 组织机构（公司+部门），多个通过“，”进行隔开
+	 */
+	private String orgCode;
+
+	public String getId()
+	{
+		return id;
+	}
+
+	public void setId(String id)
+	{
+		this.id = id;
+	}
+
+	public Date getTime()
+	{
+		return time;
+	}
+
+	public void setTime(Date time)
+	{
+		this.time = time;
+	}
+
+	public String getTitle()
+	{
+		return title;
+	}
+
+	public void setTitle(String title)
+	{
+		this.title = title;
+	}
+
+	public String getContent()
+	{
+		return content;
+	}
+
+	public void setContent(String content)
+	{
+		this.content = content;
+	}
+
+	public String getType()
+	{
+		return type;
+	}
+
+	public void setType(String type)
+	{
+		this.type = type;
+	}
+
+	public String getSender()
+	{
+		return sender;
+	}
+
+	public void setSender(String sender)
+	{
+		this.sender = sender;
+	}
+
+	public String getReceiver()
+	{
+		return receiver;
+	}
+
+	public void setReceiver(String receiver)
+	{
+		this.receiver = receiver;
+	}
+
+	public String getReader()
+	{
+		return reader;
+	}
+
+	public void setReader(String reader)
+	{
+		this.reader = reader;
+	}
+
+	public String getBizId()
+	{
+		return bizId;
+	}
+
+	public void setBizId(String bizId)
+	{
+		this.bizId = bizId;
+	}
+
+	public String getTimeStr()
+	{
+		return DateUtil.getDateTimeFormat(this.time);
+	}
+
+	public String getBizclassName()
+	{
+		return bizclassName;
+	}
+
+	public void setBizclassName(String bizclassName)
+	{
+		this.bizclassName = bizclassName;
+	}
+
+	public String getOrgCode()
+	{
+		return orgCode;
+	}
+
+	public void setOrgCode(String orgCode)
+	{
+		this.orgCode = orgCode;
+	}
+
+}

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/PPoint.java

+package com.yeejoin.amos.fas.dao.entity;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+
+
+/**
+ * The persistent class for the risk_source database table.
+ * 
+ */
+@Entity
+@Table(name="p_point")
+@NamedQuery(name="PPoint.findAll", query="SELECT r FROM PPoint r")
+public class PPoint extends BasicEntity  {
+	private static final long serialVersionUID = 1L;
+
+	@Column(name="route_id")
+	 private String   routeId  ;// '路线id',
+
+	@Column(name="route_name")
+	 private String   routeName  ;// '路线名称',
+
+	@Column(name="name")
+	 private String   name  ;// '点名称',
+
+	@Column(name="point_no")
+	 private String   pointNo  ;// '点编号',
+
+	@Column(name="remark")
+	 private String   remark ;// '备注说明',
+
+	@Column(name="save_gps")
+	 private String   saveGps  ;// '是否保存地理信',
+
+	@Column(name="distance")
+	 private Integer   distance  ;// '有效巡检距离',
+
+	@Column(name="usually_shot")
+	 private String   usuallyShot  ;// '是否允许普通拍照',
+
+	@Column(name="shot_min_number")
+	 private Integer   shotMinNumber  ;// '最小拍照数',
+
+	@Column(name="shot_max_number")
+	 private Integer   shotMaxNumber  ;// '最大拍照数',
+
+	@Column(name="fixed_shot")
+	 private Integer   fixedShot  ;//'定点拍照数',
+
+	@Column(name="latitude")
+	 private String   latitude  ;//T '经度',
+
+	@Column(name="longitude")
+	 private String   longitude  ;// '纬度',
+
+	@Column(name="address")
+	 private String   address ;//'参考地址',
+
+	@Column(name="offline")
+	 private Boolean   offline ;// '是否允许离线巡检:0不支持1支持',
+
+	@Column(name="is_fixed")
+	 private String   isFixed ;// '是否为固定',
+
+	@Column(name="catalog_id")
+	 private Integer   catalogId  ;//'分类编号',
+
+	@Column(name="extend_json")
+	 private String   extendJson  ;// '扩展字段',
+
+	@Column(name="is_score")
+	 private String   isScore  ;// '无计划巡检是否评分',
+
+	@Column(name="level")
+	 private String   level ;// '风险等级',
+
+	@Column(name="last_update_time")
+	 private String   lastUpdateTime ;// '最新更新时间',
+
+	@Column(name="creator_id")
+	 private Long    creatorId  ;//'创建用户id',
+
+	@Column(name="org_code")
+	 private String   orgCode  ;// '权限系统org code',
+
+	@Column(name="coordinates")
+	 private String   coordinates  ;// '3维坐标',
+
+	@Column(name="is_delete")
+	 private Boolean   isDelete  ;// '是否删除：0表示未删除，1表示已删除',
+
+	@Column(name="charge_dept_id")
+	 private Integer   chargeDeptId ;// '责任部门id',
+
+	@Column(name="charge_person_id")
+	 private Long   chargePersonId  ;// '负责人id',
+
+	@Column(name="status")
+	 private String   status  ;// '状态：0 未纳入巡检，1 合格；2 不合格；3 漏检',
+
+	@Column(name="floor")
+	 private Integer   floor ;// '3维模型楼层',
+
+	@Column(name="error")
+	 private String   error  ;// '最新不合格信息',
+
+	@Column(name="check_time")
+	 private String   checkTime  ;//'最新检查时间',
+
+
+	public String getRouteId() {
+		return routeId;
+	}
+
+	public void setRouteId(String routeId) {
+		this.routeId = routeId;
+	}
+
+	public String getRouteName() {
+		return routeName;
+	}
+
+	public void setRouteName(String routeName) {
+		this.routeName = routeName;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getPointNo() {
+		return pointNo;
+	}
+
+	public void setPointNo(String pointNo) {
+		this.pointNo = pointNo;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getSaveGps() {
+		return saveGps;
+	}
+
+	public void setSaveGps(String saveGps) {
+		this.saveGps = saveGps;
+	}
+
+	public Integer getDistance() {
+		return distance;
+	}
+
+	public void setDistance(Integer distance) {
+		this.distance = distance;
+	}
+
+	public String getUsuallyShot() {
+		return usuallyShot;
+	}
+
+	public void setUsuallyShot(String usuallyShot) {
+		this.usuallyShot = usuallyShot;
+	}
+
+	public Integer getShotMinNumber() {
+		return shotMinNumber;
+	}
+
+	public void setShotMinNumber(Integer shotMinNumber) {
+		this.shotMinNumber = shotMinNumber;
+	}
+
+	public Integer getShotMaxNumber() {
+		return shotMaxNumber;
+	}
+
+	public void setShotMaxNumber(Integer shotMaxNumber) {
+		this.shotMaxNumber = shotMaxNumber;
+	}
+
+	public Integer getFixedShot() {
+		return fixedShot;
+	}
+
+	public void setFixedShot(Integer fixedShot) {
+		this.fixedShot = fixedShot;
+	}
+
+	public String getLatitude() {
+		return latitude;
+	}
+
+	public void setLatitude(String latitude) {
+		this.latitude = latitude;
+	}
+
+	public String getLongitude() {
+		return longitude;
+	}
+
+	public void setLongitude(String longitude) {
+		this.longitude = longitude;
+	}
+
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public Boolean getOffline() {
+		return offline;
+	}
+
+	public void setOffline(Boolean offline) {
+		this.offline = offline;
+	}
+
+	public String getIsFixed() {
+		return isFixed;
+	}
+
+	public void setIsFixed(String isFixed) {
+		this.isFixed = isFixed;
+	}
+
+	public Integer getCatalogId() {
+		return catalogId;
+	}
+
+	public void setCatalogId(Integer catalogId) {
+		this.catalogId = catalogId;
+	}
+
+	public String getExtendJson() {
+		return extendJson;
+	}
+
+	public void setExtendJson(String extendJson) {
+		this.extendJson = extendJson;
+	}
+
+	public String getIsScore() {
+		return isScore;
+	}
+
+	public void setIsScore(String isScore) {
+		this.isScore = isScore;
+	}
+
+	public String getLevel() {
+		return level;
+	}
+
+	public void setLevel(String level) {
+		this.level = level;
+	}
+
+	public String getLastUpdateTime() {
+		return lastUpdateTime;
+	}
+
+	public void setLastUpdateTime(String lastUpdateTime) {
+		this.lastUpdateTime = lastUpdateTime;
+	}
+
+	public Long getCreatorId() {
+		return creatorId;
+	}
+
+	public void setCreatorId(Long creatorId) {
+		this.creatorId = creatorId;
+	}
+
+	public String getOrgCode() {
+		return orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+
+	public String getCoordinates() {
+		return coordinates;
+	}
+
+	public void setCoordinates(String coordinates) {
+		this.coordinates = coordinates;
+	}
+
+	public Boolean getIsDelete() {
+		return isDelete;
+	}
+
+	public void setIsDelete(Boolean delete) {
+		isDelete = delete;
+	}
+
+	public Integer getChargeDeptId() {
+		return chargeDeptId;
+	}
+
+	public void setChargeDeptId(Integer chargeDeptId) {
+		this.chargeDeptId = chargeDeptId;
+	}
+
+	public Long getChargePersonId() {
+		return chargePersonId;
+	}
+
+	public void setChargePersonId(Long chargePersonId) {
+		this.chargePersonId = chargePersonId;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public Integer getFloor() {
+		return floor;
+	}
+
+	public void setFloor(Integer floor) {
+		this.floor = floor;
+	}
+
+	public String getError() {
+		return error;
+	}
+
+	public void setError(String error) {
+		this.error = error;
+	}
+
+	public String getCheckTime() {
+		return checkTime;
+	}
+
+	public void setCheckTime(String checkTime) {
+		this.checkTime = checkTime;
+	}
+}
\ No newline at end of file

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/PreplanPicture.java

+package com.yeejoin.amos.fas.dao.entity;
+
+import java.math.BigInteger;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+
+
+/**
+ * The persistent class for the preplan_picture database table.
+ * 
+ */
+@Entity
+@Table(name="f_preplan_picture")
+@NamedQuery(name="PreplanPicture.findAll", query="SELECT p FROM PreplanPicture p")
+public class PreplanPicture extends BasicEntity  {
+	private static final long serialVersionUID = 1L;
+
+	@Column(name="create_by")
+	private int createBy;
+
+	@Column(name="equipment_id")
+	private BigInteger equipmentId;
+
+	private String name;
+
+	@Lob
+	private String picture;
+
+	private String remark;
+
+	private int type;
+
+	public PreplanPicture() {
+	}
+
+	public int getCreateBy() {
+		return this.createBy;
+	}
+
+	public void setCreateBy(int createBy) {
+		this.createBy = createBy;
+	}
+
+	public BigInteger getEquipmentId() {
+		return this.equipmentId;
+	}
+
+	public void setEquipmentId(BigInteger equipmentId) {
+		this.equipmentId = equipmentId;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getPicture() {
+		return this.picture;
+	}
+
+	public void setPicture(String picture) {
+		this.picture = picture;
+	}
+
+	public String getRemark() {
+		return this.remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public int getType() {
+		return this.type;
+	}
+
+	public void setType(int type) {
+		this.type = type;
+	}
+
+}
\ No newline at end of file

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/RiskFactor.java

+package com.yeejoin.amos.fas.dao.entity;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+
+
+/**
+ * The persistent class for the risk_factors database table.
+ * 
+ */
+@Entity
+@Table(name="f_risk_factor")
+@NamedQuery(name="RiskFactor.findAll", query="SELECT r FROM RiskFactor r")
+public class RiskFactor extends BasicEntity  {
+	private static final long serialVersionUID = 1L;
+
+	@Column(name="accident_type_id")
+	private Long accidentTypeId;
+
+	@Column(name="create_by")
+	private int createBy;
+
+	@Column(name="dept_id")
+	private Long deptId;
+
+	private String name;
+
+	@Column(name="org_code")
+	private String orgCode;
+
+	private String remark;
+
+	private String type;
+
+	public RiskFactor() {
+	}
+
+	public Long getAccidentTypeId() {
+		return this.accidentTypeId;
+	}
+
+	public void setAccidentTypeId(Long accidentTypeId) {
+		this.accidentTypeId = accidentTypeId;
+	}
+
+	public int getCreateBy() {
+		return this.createBy;
+	}
+
+	public void setCreateBy(int createBy) {
+		this.createBy = createBy;
+	}
+
+	public Long getDeptId() {
+		return this.deptId;
+	}
+
+	public void setDeptId(Long deptId) {
+		this.deptId = deptId;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getOrgCode() {
+		return this.orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+
+	public String getRemark() {
+		return this.remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+}
\ No newline at end of file

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/RiskLevel.java

+package com.yeejoin.amos.fas.dao.entity;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+
+
+/**
+ * The persistent class for the risk_level database table.
+ * 
+ */
+@Entity
+@Table(name="f_risk_level")
+@NamedQuery(name="RiskLevel.findAll", query="SELECT r FROM RiskLevel r")
+public class RiskLevel extends BasicEntity  {
+	private static final long serialVersionUID = 1L;
+
+	private String color;
+
+	@Column(name="create_by")
+	private Long createBy;
+
+	@Column(name="evaluation_model_id")
+	private Long evaluationModelId;
+	
+	@Column(name = "name") 
+	private String name;
+   
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	@Column(name = "level") 
+	private Integer level;
+
+	@Column(name="org_code")
+	private String orgCode;
+
+	private String remark;
+
+	private String severity;
+
+	public RiskLevel() {
+	}
+
+	public String getColor() {
+		return this.color;
+	}
+
+	public void setColor(String color) {
+		this.color = color;
+	}
+
+	public Long getCreateBy() {
+		return this.createBy;
+	}
+
+	public void setCreateBy(Long createBy) {
+		this.createBy = createBy;
+	}
+
+	public Integer getLevel() {
+		return this.level;
+	}
+
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+
+	public String getOrgCode() {
+		return this.orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+
+	public String getRemark() {
+		return this.remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getSeverity() {
+		return this.severity;
+	}
+
+	public void setSeverity(String severity) {
+		this.severity = severity;
+	}
+	
+	public Long getEvaluationModelId() {
+		return evaluationModelId;
+	}
+
+	public void setEvaluationModelId(Long evaluationModelId) {
+		this.evaluationModelId = evaluationModelId;
+	}
+
+}
\ No newline at end of file

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/RiskSource.java

+package com.yeejoin.amos.fas.dao.entity;
+
+import javax.persistence.*;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * The persistent class for the risk_source database table.
+ * 
+ */
+@Entity
+@Table(name = "f_risk_source")
+@NamedQuery(name = "RiskSource.findAll", query = "SELECT r FROM RiskSource r")
+public class RiskSource extends BasicEntity {
+	private static final long serialVersionUID = 1L;
+
+	private String code;
+
+	/**
+	 * 3维坐标
+	 */
+	private String position3d;
+
+	/**
+	 * 3维楼层
+	 */
+	private String floor3d;
+
+	@Column(name = "is_indoor")
+	private Boolean isIndoor;
+
+	@Column(name = "create_by")
+	private int createBy;
+
+	private String name;
+
+	@Column(name = "org_code")
+	private String orgCode;
+
+	@Column(name = "parent_id")
+	private Long parentId;
+
+	private String remark;
+
+	@Column(name = "risk_level_id")
+	private Long riskLevelId;
+
+	@Column(name = "status")
+	private String status;
+
+	@Column(name = "is_region")
+	private String isRegion;
+
+	private BigDecimal rpn;
+
+	private BigDecimal increment;
+
+	private List<Fmea> fmeaList;
+	private List<RiskSourceEquipment> riskSourceEquipment;
+	private List<RiskSourcePointInputitem> riskSourcePointInputitem;
+
+	private List<RpnChangeLog> rpnChangeLogList;
+
+
+	private BigDecimal rpni = new BigDecimal(0) ;
+
+	public BigDecimal getRpni() {
+		return rpni;
+	}
+
+	public void setRpni(BigDecimal rpni) {
+		this.rpni = rpni;
+	}
+
+	public BigDecimal getIncrement() {
+		return increment;
+	}
+
+	public void setIncrement(BigDecimal increment) {
+		this.increment = increment;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public String getIsRegion() {
+		return isRegion;
+	}
+
+	public void setIsRegion(String isRegion) {
+		this.isRegion = isRegion;
+	}
+
+	public RiskSource() {
+	}
+
+	public String getCode() {
+		return this.code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public int getCreateBy() {
+		return this.createBy;
+	}
+
+	public void setCreateBy(int createBy) {
+		this.createBy = createBy;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getOrgCode() {
+		return this.orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+
+	public Long getParentId() {
+		return this.parentId;
+	}
+
+	public void setParentId(Long parentId) {
+		this.parentId = parentId;
+	}
+
+	public String getRemark() {
+		return this.remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public Long getRiskLevelId() {
+		return this.riskLevelId;
+	}
+
+	public void setRiskLevelId(Long riskLevelId) {
+		this.riskLevelId = riskLevelId;
+	}
+
+	public BigDecimal getRpn() {
+		return this.rpn;
+	}
+
+	public void setRpn(BigDecimal rpn) {
+		this.rpn = rpn;
+	}
+
+	@OneToMany(mappedBy = "riskSource", cascade = { CascadeType.REMOVE })
+	public List<Fmea> getFmeaList() {
+		return fmeaList;
+	}
+
+	public void setFmeaList(List<Fmea> fmeaList) {
+		this.fmeaList = fmeaList;
+	}
+
+	@OneToMany(mappedBy = "riskSource", cascade = { CascadeType.REMOVE })
+	public List<RiskSourceEquipment> getRiskSourceEquipment() {
+		return riskSourceEquipment;
+	}
+
+	public void setRiskSourceEquipment(List<RiskSourceEquipment> riskSourceEquipment) {
+		this.riskSourceEquipment = riskSourceEquipment;
+	}
+
+	@OneToMany(mappedBy = "riskSource", cascade = { CascadeType.REMOVE })
+	public List<RpnChangeLog> getRpnChangeLogList() {
+		return rpnChangeLogList;
+	}
+
+	public void setRpnChangeLogList(List<RpnChangeLog> rpnChangeLogList) {
+		this.rpnChangeLogList = rpnChangeLogList;
+	}
+
+	@OneToMany(mappedBy = "riskSource", cascade = { CascadeType.REMOVE })
+	public List<RiskSourcePointInputitem> getRiskSourcePointInputitem() {
+		return riskSourcePointInputitem;
+	}
+
+	public void setRiskSourcePointInputitem(List<RiskSourcePointInputitem> riskSourcePointInputitem) {
+		this.riskSourcePointInputitem = riskSourcePointInputitem;
+	}
+
+	public String getPosition3d() {
+		return position3d;
+	}
+
+	public void setPosition3d(String position3d) {
+		this.position3d = position3d;
+	}
+
+	public String getFloor3d() {
+		return floor3d;
+	}
+
+	public void setFloor3d(String floor3d) {
+		this.floor3d = floor3d;
+	}
+
+	public Boolean getIsIndoor() {
+		return isIndoor;
+	}
+
+	public void setIsIndoor(Boolean isIndoor) {
+		this.isIndoor = isIndoor;
+	}
+
+
+}
\ No newline at end of file

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/RiskSourceEquipment.java

+package com.yeejoin.amos.fas.dao.entity;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+
+import com.fasterxml.jackson.annotation.JsonBackReference;
+
+
+/**
+ * The persistent class for the risk_source_equipment database table.
+ * 
+ */
+@Entity
+@Table(name="f_risk_source_equipment")
+@NamedQuery(name="RiskSourceEquipment.findAll", query="SELECT r FROM RiskSourceEquipment r")
+public class RiskSourceEquipment extends BasicEntity  {
+	private static final long serialVersionUID = 1L;
+
+	@Column(name="equipment_id")
+	private Long equipmentId;
+
+	@Column(name="risk_source_id")
+	private Long  riskSourceId;
+	
+	/**
+	 * 消防设备id
+	 */
+	@Column(name="fire_equipment_id")
+	private Long fireEquipmentId;
+	
+	private RiskSource riskSource;
+
+	public RiskSourceEquipment() {
+	}
+
+	public Long getEquipmentId() {
+		return this.equipmentId;
+	}
+
+	public void setEquipmentId(Long equipmentId) {
+		this.equipmentId = equipmentId;
+	}
+
+	public Long getRiskSourceId() {
+		return this.riskSourceId;
+	}
+
+	public void setRiskSourceId(Long riskSourceId) {
+		this.riskSourceId = riskSourceId;
+	}
+
+	public Long getFireEquipmentId() {
+		return fireEquipmentId;
+	}
+
+	
+
+	public void setFireEquipmentId(Long fireEquipmentId) {
+		this.fireEquipmentId = fireEquipmentId;
+	}
+	
+	@ManyToOne
+	@JoinColumn(name = "riskSourceId", referencedColumnName = "id", updatable = false, insertable = false)	
+	public RiskSource getRiskSource() {
+		return riskSource;
+	}
+	@JsonBackReference
+	public void setRiskSource(RiskSource riskSource) {
+		this.riskSource = riskSource;
+	}
+	
+
+
+	
+
+
+
+}
\ No newline at end of file

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/RiskSourcePointInputitem.java

+package com.yeejoin.amos.fas.dao.entity;
+
+import javax.persistence.*;
+
+import com.fasterxml.jackson.annotation.JsonBackReference;
+
+
+/**
+ * The persistent class for the risk_source_point_inputitem database table.
+ * 
+ */
+@Entity
+@Table(name="f_risk_source_point_inputitem")
+@NamedQuery(name="RiskSourcePointInputitem.findAll", query="SELECT r FROM RiskSourcePointInputitem r")
+public class RiskSourcePointInputitem extends BasicEntity  {
+	private static final long serialVersionUID = 1L;
+
+	@Column(name="point_id")
+	private Long pointId;
+
+	@Column(name="point_inputitem_id")
+	private Long pointInputitemId;
+
+	@Column(name="risk_source_id")
+	private Long riskSourceId;
+
+	@Column(name="status")
+	private String status;
+
+	/**
+	 * 检查项检查记录id(p_check_input 表id)
+	 */
+	@Column(name="check_inputitem_id")
+	private Long checkInputitemId;
+
+	private String  pointInputitemName;
+	private String originalTaskState;
+	private RiskSource riskSource;
+
+	public RiskSourcePointInputitem() {
+	}
+
+	@Transient
+	public String getPointInputitemName() {
+		return pointInputitemName;
+	}
+
+	public void setPointInputitemName(String pointInputitemName) {
+		this.pointInputitemName = pointInputitemName;
+	}
+
+	@Transient
+	public String getOriginalTaskState() {
+		return originalTaskState;
+	}
+
+	public void setOriginalTaskState(String originalTaskState) {
+		this.originalTaskState = originalTaskState;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public Long getPointId() {
+		return this.pointId;
+	}
+
+	public void setPointId(Long pointId) {
+		this.pointId = pointId;
+	}
+
+	public Long getPointInputitemId() {
+		return this.pointInputitemId;
+	}
+
+	public void setPointInputitemId(Long pointInputitemId) {
+		this.pointInputitemId = pointInputitemId;
+	}
+
+	public Long getRiskSourceId() {
+		return this.riskSourceId;
+	}
+
+	public void setRiskSourceId(Long riskSourceId) {
+		this.riskSourceId = riskSourceId;
+	}
+
+	public Long getCheckInputitemId() {
+		return checkInputitemId;
+	}
+
+	public void setCheckInputitemId(Long checkInputitemId) {
+		this.checkInputitemId = checkInputitemId;
+	}
+
+	@ManyToOne
+	@JoinColumn(name = "riskSourceId", referencedColumnName = "id", updatable = false, insertable = false)	
+	public RiskSource getRiskSource() {
+		return riskSource;
+	}
+	@JsonBackReference
+	public void setRiskSource(RiskSource riskSource) {
+		this.riskSource = riskSource;
+	}
+	
+}
\ No newline at end of file

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/RpnChangeLog.java

+package com.yeejoin.amos.fas.dao.entity;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+
+import com.fasterxml.jackson.annotation.JsonBackReference;
+
+
+/**
+ * The persistent class for the rpn_change_log database table.
+ * 
+ */
+@Entity
+@Table(name="f_rpn_change_log")
+@NamedQuery(name="RpnChangeLog.findAll", query="SELECT r FROM RpnChangeLog r")
+public class RpnChangeLog extends BasicEntity  {
+	private static final long serialVersionUID = 1L;
+
+	private String remark;
+
+	@Column(name="risk_source_id")
+	private BigInteger riskSourceId;
+
+	private BigDecimal rpn;
+
+	private BigDecimal rpni;
+
+	@Column(name="trigger_by")
+	private BigInteger triggerBy;
+
+	private int type;
+	
+	private RiskSource riskSource;
+
+	public RpnChangeLog() {
+	}
+
+	public String getRemark() {
+		return this.remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public BigInteger getRiskSourceId() {
+		return this.riskSourceId;
+	}
+
+	public void setRiskSourceId(BigInteger riskSourceId) {
+		this.riskSourceId = riskSourceId;
+	}
+
+	public BigDecimal getRpn() {
+		return this.rpn;
+	}
+
+	public void setRpn(BigDecimal rpn) {
+		this.rpn = rpn;
+	}
+
+	public BigDecimal getRpni() {
+		return this.rpni;
+	}
+
+	public void setRpni(BigDecimal rpni) {
+		this.rpni = rpni;
+	}
+
+	public BigInteger getTriggerBy() {
+		return this.triggerBy;
+	}
+
+	public void setTriggerBy(BigInteger triggerBy) {
+		this.triggerBy = triggerBy;
+	}
+
+	public int getType() {
+		return this.type;
+	}
+
+	public void setType(int type) {
+		this.type = type;
+	}
+
+	@ManyToOne
+	@JoinColumn(name = "riskSourceId", referencedColumnName = "id", updatable = false, insertable = false)
+	public RiskSource getRiskSource() {
+		return riskSource;
+	}
+
+	@JsonBackReference
+	public void setRiskSource(RiskSource riskSource) {
+		this.riskSource = riskSource;
+	}
+
+}
\ No newline at end of file

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/SCompany.java

+package com.yeejoin.amos.fas.dao.entity;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.Date;
+
+
+/**
+ * The persistent class for the s_company database table.
+ * 
+ */
+@Entity
+@Table(name="s_company")
+@NamedQuery(name="SCompany.findAll", query="SELECT s FROM SCompany s")
+public class SCompany implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	private String id;
+
+	private String address;
+
+	@Column(name="comp_code")
+	private String compCode;
+
+	@Column(name="company_level")
+	private String companyLevel;
+
+	@Column(name="company_name")
+	private String companyName;
+
+	private String contact;
+
+	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="create_date")
+	private Date createDate;
+
+	@Column(name="create_user")
+	private String createUser;
+
+	private String description;
+
+	private String email;
+
+	@Column(name="is_delete")
+	private byte isDelete;
+
+	private Double latitude;
+
+	private BigInteger level;
+
+	private Double longitude;
+
+	@Column(name="parent_id")
+	private BigInteger parentId;
+
+	@Column(name="register_type_id")
+	private BigInteger registerTypeId;
+
+	private String remark;
+
+	@Column(name="site_id")
+	private BigInteger siteId;
+
+	private String telephone;
+
+	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="update_date")
+	private Date updateDate;
+
+	@Column(name="update_user")
+	private String updateUser;
+
+	public SCompany() {
+	}
+
+	public String getId() {
+		return this.id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getAddress() {
+		return this.address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public String getCompCode() {
+		return this.compCode;
+	}
+
+	public void setCompCode(String compCode) {
+		this.compCode = compCode;
+	}
+
+	public String getCompanyLevel() {
+		return this.companyLevel;
+	}
+
+	public void setCompanyLevel(String companyLevel) {
+		this.companyLevel = companyLevel;
+	}
+
+	public String getCompanyName() {
+		return this.companyName;
+	}
+
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+	public String getContact() {
+		return this.contact;
+	}
+
+	public void setContact(String contact) {
+		this.contact = contact;
+	}
+
+	public Date getCreateDate() {
+		return this.createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
+	public String getCreateUser() {
+		return this.createUser;
+	}
+
+	public void setCreateUser(String createUser) {
+		this.createUser = createUser;
+	}
+
+	public String getDescription() {
+		return this.description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public String getEmail() {
+		return this.email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	public byte getIsDelete() {
+		return this.isDelete;
+	}
+
+	public void setIsDelete(byte isDelete) {
+		this.isDelete = isDelete;
+	}
+
+	public Double getLatitude() {
+		return this.latitude;
+	}
+
+	public void setLatitude(Double latitude) {
+		this.latitude = latitude;
+	}
+
+	public BigInteger getLevel() {
+		return this.level;
+	}
+
+	public void setLevel(BigInteger level) {
+		this.level = level;
+	}
+
+	public Double getLongitude() {
+		return this.longitude;
+	}
+
+	public void setLongitude(Double longitude) {
+		this.longitude = longitude;
+	}
+
+	public BigInteger getParentId() {
+		return this.parentId;
+	}
+
+	public void setParentId(BigInteger parentId) {
+		this.parentId = parentId;
+	}
+
+	public BigInteger getRegisterTypeId() {
+		return this.registerTypeId;
+	}
+
+	public void setRegisterTypeId(BigInteger registerTypeId) {
+		this.registerTypeId = registerTypeId;
+	}
+
+	public String getRemark() {
+		return this.remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public BigInteger getSiteId() {
+		return this.siteId;
+	}
+
+	public void setSiteId(BigInteger siteId) {
+		this.siteId = siteId;
+	}
+
+	public String getTelephone() {
+		return this.telephone;
+	}
+
+	public void setTelephone(String telephone) {
+		this.telephone = telephone;
+	}
+
+	public Date getUpdateDate() {
+		return this.updateDate;
+	}
+
+	public void setUpdateDate(Date updateDate) {
+		this.updateDate = updateDate;
+	}
+
+	public String getUpdateUser() {
+		return this.updateUser;
+	}
+
+	public void setUpdateUser(String updateUser) {
+		this.updateUser = updateUser;
+	}
+
+}
\ No newline at end of file