xiao547607 4 سال پیش
والد
کامیت
5b2b4513a5

+ 7 - 0
common/src/main/java/com/jpsoft/bus/modules/base/entity/RegionInfo.java

@@ -40,4 +40,11 @@ public class RegionInfo {
     private Boolean delFlag = false;
     private Boolean delFlag = false;
     @ApiModelProperty(value = "全称")
     @ApiModelProperty(value = "全称")
     private String fullName;
     private String fullName;
+
+    @ApiModelProperty(value = "经度")
+    private Double longitude;
+    @ApiModelProperty(value = "纬度")
+    private Double latitude;
+    @ApiModelProperty(value = "半径(米)")
+    private Integer radius;
 }
 }

+ 2 - 0
common/src/main/java/com/jpsoft/bus/modules/bus/entity/ShiftInfo.java

@@ -66,4 +66,6 @@ public class ShiftInfo implements Serializable {
     private String currentStationName;
     private String currentStationName;
     @ApiModelProperty(value = "终点站")
     @ApiModelProperty(value = "终点站")
     private String endStationName;
     private String endStationName;
+    @ApiModelProperty(value = "间隔时间(分钟)")
+    private Integer interval;
 }
 }

+ 17 - 1
common/src/main/resources/mapper/base/RegionInfo.xml

@@ -14,6 +14,9 @@
         <result property="updateTime" column="update_time" />
         <result property="updateTime" column="update_time" />
         <result property="delFlag" column="del_flag" />
         <result property="delFlag" column="del_flag" />
         <result property="fullName" column="full_name" />
         <result property="fullName" column="full_name" />
+        <result property="longitude" column="longitude_" />
+        <result property="latitude" column="latitude_" />
+        <result property="radius" column="radius_" />
     </resultMap>
     </resultMap>
     <insert id="insert" parameterType="com.jpsoft.bus.modules.base.entity.RegionInfo">
     <insert id="insert" parameterType="com.jpsoft.bus.modules.base.entity.RegionInfo">
         <!--
         <!--
@@ -23,7 +26,8 @@
         -->
         -->
         <![CDATA[
         <![CDATA[
 		insert into base_region_info
 		insert into base_region_info
-	    (id_,name_,parent_id,remark_,create_by,create_time,update_by,update_time,del_flag,full_name)
+	    (id_,name_,parent_id,remark_,create_by,create_time,update_by,update_time,del_flag,full_name,
+	    longitude_,latitude_,radius_)
 		values
 		values
 		(
 		(
 #{id,jdbcType=VARCHAR}
 #{id,jdbcType=VARCHAR}
@@ -36,6 +40,9 @@
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{fullName,jdbcType=VARCHAR}
 ,#{fullName,jdbcType=VARCHAR}
+,#{longitude,jdbcType=DOUBLE}
+,#{latitude,jdbcType=DOUBLE}
+,#{radius,jdbcType= NUMERIC }
 		)
 		)
 	]]>
 	]]>
     </insert>
     </insert>
@@ -72,6 +79,15 @@
             <if test="fullName!=null">
             <if test="fullName!=null">
                 full_name=#{fullName,jdbcType=VARCHAR},
                 full_name=#{fullName,jdbcType=VARCHAR},
             </if>
             </if>
+            <if test="longitude!=null">
+                longitude_=#{longitude,jdbcType=DOUBLE},
+            </if>
+            <if test="latitude!=null">
+                latitude_=#{latitude,jdbcType=DOUBLE},
+            </if>
+            <if test="radius!=null">
+                radius_=#{radius,jdbcType= NUMERIC },
+            </if>
         </set>
         </set>
         where id_=#{id}
         where id_=#{id}
     </update>
     </update>

+ 8 - 1
common/src/main/resources/mapper/bus/ShiftInfo.xml

@@ -25,6 +25,7 @@
 			<result property="startStationName" column="start_station_name" />
 			<result property="startStationName" column="start_station_name" />
 			<result property="currentStationName" column="current_station_name" />
 			<result property="currentStationName" column="current_station_name" />
 			<result property="endStationName" column="end_station_name" />
 			<result property="endStationName" column="end_station_name" />
+			<result property="interval" column="interval_" />
 			</resultMap>
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.bus.modules.bus.entity.ShiftInfo">
 	<insert id="insert" parameterType="com.jpsoft.bus.modules.bus.entity.ShiftInfo">
 	<!--
 	<!--
@@ -34,7 +35,9 @@
 	-->
 	-->
 	<![CDATA[
 	<![CDATA[
 		insert into bus_shift_info
 		insert into bus_shift_info
-	    (id_,driver_id,vehicle_id,route_id,start_station_id,current_station_id,current_station_status,status_,end_station_id,create_by,create_time,update_by,update_time,del_flag,finish_time)
+	    (id_,driver_id,vehicle_id,route_id,start_station_id,current_station_id,current_station_status,status_,end_station_id,create_by,create_time,update_by,update_time,del_flag,finish_time,
+	    interval_
+	    )
 		values
 		values
 		(
 		(
 #{id,jdbcType=VARCHAR}
 #{id,jdbcType=VARCHAR}
@@ -52,6 +55,7 @@
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{finishTime,jdbcType= TIMESTAMP }
 ,#{finishTime,jdbcType= TIMESTAMP }
+,#{interval,jdbcType= NUMERIC }
 		)
 		)
 	]]>
 	]]>
 	</insert>
 	</insert>
@@ -103,6 +107,9 @@
 				<if test="finishTime!=null">
 				<if test="finishTime!=null">
 		finish_time=#{finishTime,jdbcType= TIMESTAMP },
 		finish_time=#{finishTime,jdbcType= TIMESTAMP },
 		</if>
 		</if>
+			<if test="interval!=null">
+				interval_=#{interval,jdbcType= NUMERIC },
+			</if>
 		</set>
 		</set>
 	where id_=#{id}
 	where id_=#{id}
 	</update>
 	</update>