新增 车主 线路与车主关联表

common/src/main/java/com/jpsoft/bus/modules/bus/dao/RouteAccountDAO.java

@@ -0,0 +1,19 @@
+package com.jpsoft.bus.modules.bus.dao;
+
+import java.util.List;
+
+import com.jpsoft.bus.modules.bus.entity.RouteAccount;
+import org.springframework.stereotype.Repository;
+import java.util.Map;
+import com.jpsoft.bus.modules.common.dto.Sort;
+
+@Repository
+public interface RouteAccountDAO {
+	int insert(RouteAccount entity);
+	int update(RouteAccount entity);
+	int exist(String id);
+	RouteAccount get(String id);
+	int delete(String id);
+	List<RouteAccount> list();
+	List<RouteAccount> search(Map<String,Object> searchParams,List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/bus/modules/bus/entity/RouteAccount.java

@@ -0,0 +1,51 @@
+package com.jpsoft.bus.modules.bus.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:bus_route_account的实体类
+ */
+@Data
+@ApiModel(value = "bus_route_account的实体类")
+public class RouteAccount {
+        @ApiModelProperty(value = "主键")
+    private String id;
+        @ApiModelProperty(value = "路线")
+    private String name;
+        @ApiModelProperty(value = "创建人")
+    private String createBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+        @ApiModelProperty(value = "更新人")
+    private String updateBy;
+        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+        @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+        @ApiModelProperty(value = "地图路线(坐标用|分隔，经纬度用,)")
+    private String mapPath;
+        @ApiModelProperty(value = "单位编号")
+    private String companyId;
+        @ApiModelProperty(value = "商品编号")
+    private String goodsId;
+        @ApiModelProperty(value = "开始时间")
+    private String startTime;
+        @ApiModelProperty(value = "结束时间")
+    private String endTime;
+        @ApiModelProperty(value = "地区id")
+    private String regionId;
+        @ApiModelProperty(value = "间隔时间(分钟)")
+    private Integer interval;
+}

common/src/main/java/com/jpsoft/bus/modules/bus/entity/VehicleInfo.java

@@ -65,6 +65,10 @@ public class VehicleInfo {
     private String latestAddress;
     @ApiModelProperty(value = "运行线路名称")
     private String routeName;
+    @ApiModelProperty(value = "车主ID")
+    private String accountId;
+    @ApiModelProperty(value = "车主名称")
+    private String accountName;
 
     private String companyName;
 }

common/src/main/java/com/jpsoft/bus/modules/bus/service/RouteAccountService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.bus.modules.bus.service;
+
+import java.util.List;
+import java.util.Map;
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.bus.entity.RouteAccount;
+import com.jpsoft.bus.modules.common.dto.Sort;
+
+public interface RouteAccountService {
+	RouteAccount get(String id);
+	boolean exist(String id);
+	int insert(RouteAccount model);
+	int update(RouteAccount model);
+	int delete(String id);
+	List<RouteAccount> list();
+	Page<RouteAccount> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/bus/modules/bus/service/impl/RouteAccountServiceImpl.java

@@ -0,0 +1,71 @@
+package com.jpsoft.bus.modules.bus.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+
+import com.jpsoft.bus.modules.bus.dao.RouteAccountDAO;
+import com.jpsoft.bus.modules.bus.entity.RouteAccount;
+import com.jpsoft.bus.modules.bus.service.RouteAccountService;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.github.pagehelper.Page;
+import com.jpsoft.bus.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="routeAccountService")
+public class RouteAccountServiceImpl implements RouteAccountService {
+	@Resource(name="routeAccountDAO")
+	private RouteAccountDAO routeAccountDAO;
+
+	@Override
+	public RouteAccount get(String id) {
+		// TODO Auto-generated method stub
+		return routeAccountDAO.get(id);
+	}
+
+	@Override
+	public int insert(RouteAccount model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return routeAccountDAO.insert(model);
+	}
+
+	@Override
+	public int update(RouteAccount model) {
+		// TODO Auto-generated method stub
+		return routeAccountDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return routeAccountDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = routeAccountDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<RouteAccount> list() {
+		// TODO Auto-generated method stub
+		return routeAccountDAO.list();
+	}
+		
+	@Override
+	public Page<RouteAccount> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<RouteAccount> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            routeAccountDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

common/src/main/resources/mapper/bus/RouteAccount.xml

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.bus.modules.bus.dao.RouteAccountDAO">
+	<resultMap id="RouteAccountMap" type="com.jpsoft.bus.modules.bus.entity.RouteAccount">
+		<id property="id" column="id_" />
+			<result property="name" column="name_" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			<result property="mapPath" column="map_path" />
+			<result property="companyId" column="company_id" />
+			<result property="goodsId" column="goods_id" />
+			<result property="startTime" column="start_time" />
+			<result property="endTime" column="end_time" />
+			<result property="regionId" column="region_id" />
+			<result property="interval" column="interval_" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.bus.modules.bus.entity.RouteAccount">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into bus_route_account
+	    (id_,name_,create_by,create_time,update_by,update_time,del_flag,map_path,company_id,goods_id,start_time,end_time,region_id,interval_)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{name,jdbcType=VARCHAR}
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+,#{mapPath,jdbcType=VARCHAR}
+,#{companyId,jdbcType=VARCHAR}
+,#{goodsId,jdbcType=VARCHAR}
+,#{startTime,jdbcType=VARCHAR}
+,#{endTime,jdbcType=VARCHAR}
+,#{regionId,jdbcType=VARCHAR}
+,#{interval,jdbcType= NUMERIC }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from bus_route_account where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.bus.modules.bus.entity.RouteAccount">
+		update bus_route_account
+		<set>
+				<if test="name!=null">
+		name_=#{name,jdbcType=VARCHAR},
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="mapPath!=null">
+		map_path=#{mapPath,jdbcType=VARCHAR},
+		</if>
+				<if test="companyId!=null">
+		company_id=#{companyId,jdbcType=VARCHAR},
+		</if>
+				<if test="goodsId!=null">
+		goods_id=#{goodsId,jdbcType=VARCHAR},
+		</if>
+				<if test="startTime!=null">
+		start_time=#{startTime,jdbcType=VARCHAR},
+		</if>
+				<if test="endTime!=null">
+		end_time=#{endTime,jdbcType=VARCHAR},
+		</if>
+				<if test="regionId!=null">
+		region_id=#{regionId,jdbcType=VARCHAR},
+		</if>
+				<if test="interval!=null">
+		interval_=#{interval,jdbcType= NUMERIC },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="RouteAccountMap">
+		select 
+id_,name_,create_by,create_time,update_by,update_time,del_flag,map_path,company_id,goods_id,start_time,end_time,region_id,interval_		from bus_route_account where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from bus_route_account where id_=#{0}
+	</select>
+	<select id="list" resultMap="RouteAccountMap">
+		select * from bus_route_account
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="RouteAccountMap">
+		<![CDATA[
+			select * from bus_route_account
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

common/src/main/resources/mapper/bus/VehicleInfo.xml

@@ -26,6 +26,8 @@
 			<result property="online" column="online_" />
 			<result property="latestAddress" column="latest_address" />
 			<result property="routeName" column="route_name" />
+			<result property="accountId" column="account_id" />
+			<result property="accountName" column="account_name" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.bus.modules.bus.entity.VehicleInfo">
 	<!--
@@ -35,7 +37,8 @@
 	-->
 	<![CDATA[
 		insert into bus_vehicle_info
-	    (id_,route_id,license_plate_number,activation_code,gps_device_no,device_no,picture_,load_number,longitude_,latitude_,status_,create_by,create_time,update_by,update_time,del_flag,company_id,running_,acc_,online_,latest_address)
+	    (id_,route_id,license_plate_number,activation_code,gps_device_no,device_no,picture_,load_number,longitude_,latitude_,status_,create_by,create_time,update_by,update_time,del_flag,company_id,running_,acc_,online_,latest_address,
+	    account_id)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -59,6 +62,7 @@
 ,#{acc,jdbcType= NUMERIC }
 ,#{online,jdbcType= NUMERIC }
 ,#{latestAddress,jdbcType=VARCHAR}
+,#{accountId,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -128,6 +132,9 @@
 				<if test="latestAddress!=null">
 		latest_address=#{latestAddress,jdbcType=VARCHAR},
 		</if>
+			<if test="accountId!=null">
+				account_id=#{accountId,jdbcType=VARCHAR},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>