1.修改pom版本升级到2.1.0

YeeAmosFireAutoSysCommon/pom.xml

@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>com.yeejoin.amos</groupId>
 		<artifactId>YeeAmosFireAutoSysRoot</artifactId>
-		<version>1.0.0</version>
+		<version>2.1.0</version>
 	</parent>
 
 	<!-- <dependencies>

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

@@ -20,8 +20,6 @@ public class Equipment extends BasicEntity  {
 
 	private String building;
 
-	
-	
 	/**
 	 * 所属风险区域id
 	 */
@@ -113,6 +111,18 @@ public class Equipment extends BasicEntity  {
 
 	private String remark;
 
+	/**
+	 * ue4位置
+	 */
+	@Column(name = "ue4_location")
+	private String ue4Location;
+
+	/**
+	 * ue4旋转
+	 */
+	@Column(name = "ue4_rotation")
+	private String ue4Rotation;
+
 	public Equipment() {
 	}
 
@@ -219,4 +229,19 @@ public class Equipment extends BasicEntity  {
 		this.reservePlan = reservePlan;
 	}
 
+	public String getUe4Location() {
+		return ue4Location;
+	}
+
+	public void setUe4Location(String ue4Location) {
+		this.ue4Location = ue4Location;
+	}
+
+	public String getUe4Rotation() {
+		return ue4Rotation;
+	}
+
+	public void setUe4Rotation(String ue4Rotation) {
+		this.ue4Rotation = ue4Rotation;
+	}
 }
\ No newline at end of file

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

@@ -76,6 +76,18 @@ public class FireCar extends BasicEntity  {
 	@Column(name="photo_path")
 	private String photoPath;
 
+	/**
+	 * ue4位置
+	 */
+	@Column(name = "ue4_location")
+	private String ue4Location;
+
+	/**
+	 * ue4旋转
+	 */
+	@Column(name = "ue4_rotation")
+	private String ue4Rotation;
+
 	public FireCar() {
 	}
 
@@ -216,5 +228,19 @@ public class FireCar extends BasicEntity  {
 	public void setRiskSourceId(Long riskSourceId) {
 		this.riskSourceId = riskSourceId;
 	}
+	public String getUe4Location() {
+		return ue4Location;
+	}
+
+	public void setUe4Location(String ue4Location) {
+		this.ue4Location = ue4Location;
+	}
 
+	public String getUe4Rotation() {
+		return ue4Rotation;
+	}
+
+	public void setUe4Rotation(String ue4Rotation) {
+		this.ue4Rotation = ue4Rotation;
+	}
 }
\ No newline at end of file

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

@@ -121,6 +121,18 @@ public class FireEquipment extends BasicEntity  {
 	@Column(name="risk_source_id")
 	private Long riskSourceId;
 
+	/**
+	 * ue4位置
+	 */
+	@Column(name = "ue4_location")
+	private String ue4Location;
+
+	/**
+	 * ue4旋转
+	 */
+	@Column(name = "ue4_rotation")
+	private String ue4Rotation;
+
 	public Long getRiskSourceId() {
 		return riskSourceId;
 	}
@@ -344,4 +356,19 @@ public class FireEquipment extends BasicEntity  {
 	}
 
 
+	public String getUe4Location() {
+		return ue4Location;
+	}
+
+	public void setUe4Location(String ue4Location) {
+		this.ue4Location = ue4Location;
+	}
+
+	public String getUe4Rotation() {
+		return ue4Rotation;
+	}
+
+	public void setUe4Rotation(String ue4Rotation) {
+		this.ue4Rotation = ue4Rotation;
+	}
 }
\ No newline at end of file

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

@@ -84,6 +84,17 @@ public class FireStation extends BasicEntity{
 
 	private List<Map> fireEquipmentInfo;
 
+	/**
+	 * ue4位置
+	 */
+	@Column(name = "ue4_location")
+	private String ue4Location;
+
+	/**
+	 * ue4旋转
+	 */
+	@Column(name = "ue4_rotation")
+	private String ue4Rotation;
 
 	@Transient
 	public List<Map> getFireEquipmentInfo() {
@@ -181,4 +192,20 @@ public class FireStation extends BasicEntity{
 	public void setRiskSourceId(Long riskSourceId) {
 		this.riskSourceId = riskSourceId;
 	}
+
+	public String getUe4Location() {
+		return ue4Location;
+	}
+
+	public void setUe4Location(String ue4Location) {
+		this.ue4Location = ue4Location;
+	}
+
+	public String getUe4Rotation() {
+		return ue4Rotation;
+	}
+
+	public void setUe4Rotation(String ue4Rotation) {
+		this.ue4Rotation = ue4Rotation;
+	}
 }

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

@@ -15,7 +15,6 @@ public class RiskSource extends BasicEntity {
 	private static final long serialVersionUID = 1L;
 
 	private String code;
-
 	/**
 	 * 3维坐标
 	 */
@@ -55,6 +54,24 @@ public class RiskSource extends BasicEntity {
 
 	private BigDecimal increment;
 
+	/**
+	 * ue4位置
+	 */
+	@Column(name = "ue4_location")
+	private String ue4Location;
+
+	/**
+	 * ue4旋转
+	 */
+	@Column(name = "ue4_rotation")
+	private String ue4Rotation;
+
+	/**
+	 * ue4缩放
+	 */
+	@Column(name = "ue4_extent")
+	private String ue4Extent;
+
 	private List<Fmea> fmeaList;
 
 	private List<RpnChangeLog> rpnChangeLogList;
@@ -202,6 +219,28 @@ public class RiskSource extends BasicEntity {
 	public void setIsIndoor(Boolean isIndoor) {
 		this.isIndoor = isIndoor;
 	}
+	public String getUe4Location() {
+		return ue4Location;
+	}
+
+	public void setUe4Location(String ue4Location) {
+		this.ue4Location = ue4Location;
+	}
+
+	public String getUe4Rotation() {
+		return ue4Rotation;
+	}
 
+	public void setUe4Rotation(String ue4Rotation) {
+		this.ue4Rotation = ue4Rotation;
+	}
+
+	public String getUe4Extent() {
+		return ue4Extent;
+	}
+
+	public void setUe4Extent(String ue4Extent) {
+		this.ue4Extent = ue4Extent;
+	}
 
 }
\ No newline at end of file

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

@@ -85,6 +85,18 @@ public class WaterResource extends BasicEntity{
 	@Column(name="create_by")
 	private int createBy;
 
+	/**
+	 * ue4位置
+	 */
+	@Column(name = "ue4_location")
+	private String ue4Location;
+
+	/**
+	 * ue4旋转
+	 */
+	@Column(name = "ue4_rotation")
+	private String ue4Rotation;
+
 	public String getName() {
 		return name;
 	}
@@ -181,5 +193,19 @@ public class WaterResource extends BasicEntity{
 	public void setCreateBy(int createBy) {
 		this.createBy = createBy;
 	}
+	public String getUe4Location() {
+		return ue4Location;
+	}
+
+	public void setUe4Location(String ue4Location) {
+		this.ue4Location = ue4Location;
+	}
 
+	public String getUe4Rotation() {
+		return ue4Rotation;
+	}
+
+	public void setUe4Rotation(String ue4Rotation) {
+		this.ue4Rotation = ue4Rotation;
+	}
 }

YeeAmosFireAutoSysService/pom.xml

@@ -14,14 +14,14 @@
 	<parent>
 		<groupId>com.yeejoin.amos</groupId>
 		<artifactId>YeeAmosFireAutoSysRoot</artifactId>
-		<version>1.0.0</version>
+		<version>2.1.0</version>
 	</parent>
 
 	<dependencies>
 	    <dependency>
             <groupId>com.yeejoin.amos</groupId>
             <artifactId>YeeAmosFireAutoSysCommon</artifactId>
-            <version>1.0.0</version>
+            <version>2.1.0</version>
         </dependency>
         
       <dependency>

YeeAmosFireAutoSysStart/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.yeejoin.amos</groupId>
         <artifactId>YeeAmosFireAutoSysRoot</artifactId>
-        <version>1.0.0</version>
+        <version>2.1.0</version>
     </parent>
 
     <dependencies>
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>com.yeejoin.amos</groupId>
             <artifactId>YeeAmosFireAutoSysService</artifactId>
-            <version>1.0.0</version>
+            <version>2.1.0</version>
         </dependency>
     </dependencies>