Skip to content

C
cloud-platform
Commit 220d969f authored by hezhen's avatar hezhen
Browse files
Options

Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

parents 778fe604 420a6586
Show whitespace changes
Inline Side-by-side
Showing with 299 additions and 494 deletions
ace-common/src/main/java/com/github/wxiaoqi/security/common/exception/BaseException.java
View file @ 220d969f
package com.github.wxiaoqi.security.common.exception;
import com.github.wxiaoqi.security.common.constant.RestCode;
import com.github.wxiaoqi.security.common.util.process.ResultCode;
/**
* Created by ace on 2017/9/8.
......@@ -44,4 +45,9 @@ public class BaseException extends RuntimeException {
super(restCode.getMsg());
this.status = restCode.getStatus();
}
public BaseException(int code) {
ResultCode.getMsg(code);
this.status = code;
}
}
ace-common/src/main/java/com/github/wxiaoqi/security/common/rest/BaseController.java
View file @ 220d969f
......@@ -58,6 +58,7 @@ public class BaseController<Biz extends BaseBiz,Entity> extends CommonBaseContro
public List<Entity> all(){
return baseBiz.selectListAll();
}
@RequestMapping(value = "/page",method = RequestMethod.GET)
@ResponseBody
public TableResultResponse<Entity> list(@RequestParam Map<String, Object> params){
......
ace-common/src/main/java/com/github/wxiaoqi/security/common/rest/CommonBaseController.java
View file @ 220d969f
......@@ -24,7 +24,6 @@ public class CommonBaseController {
@Autowired
public HttpServletRequest request;
public String getCurrentUserName(){
return BaseContextHandler.getUsername();
}
......
ace-common/src/main/java/com/github/wxiaoqi/security/common/util/process/ResultCode.java
View file @ 220d969f
......@@ -171,4 +171,9 @@ public class ResultCode {
// 未绑定社保卡
public static int NOT_BIND_SOCIAL_CARD = Integer.valueOf(SystemProperty.getResultConfig("NOT_BIND_SOCIAL_CARD"));
public static String getMsg(int code) {
return SystemProperty.getResultConfig(String.valueOf(code));
}
}
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/PageDataVO.java → ace-common/src/main/java/com/github/wxiaoqi/security/common/vo/PageDataVO.java
View file @ 220d969f
package com.xxfc.platform.vehicle.vo;
package com.github.wxiaoqi.security.common.vo;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.Data;
......@@ -16,6 +17,8 @@ public class PageDataVO<T> {
private Integer pageNum;
private Integer pageSize;
/**
* 实际数据
*/
......@@ -27,7 +30,14 @@ public class PageDataVO<T> {
pageDataVo.setData(pageInfo.getList());
pageDataVo.setPageNum(pageInfo.getPageNum());
pageDataVo.setTotalPage(pageInfo.getPages());
pageDataVo.setPageSize(pageInfo.getSize());
return pageDataVo;
}
public static <M> PageDataVO<M> pageInfo(Integer page, Integer limit, List<M> list){
PageHelper.startPage(page,limit);
PageInfo<M> branchCompanyPageInfo = new PageInfo<M>(list);
return pageInfo(branchCompanyPageInfo);
}
}
ace-common/src/main/resources/properties/resultcod.properties
View file @ 220d969f
......@@ -2,12 +2,16 @@
#操作成功
SUCCESS_CODE=200
200=操作成功
#操作失败
FAILED_CODE=1001
1001=操作失败
#数据已存在
EXIST_CODE=1002
1002=数据已存在
#数据不存在
NOTEXIST_CODE=1003
NOTEXIST_CODE=1009
1009=数据不存在
#参数为空
NULL_CODE=1003
1003=参数为空
......
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/OrderTypeEnum.java 0 → 100644
View file @ 220d969f
package com.xxfc.platform.order.contant.enumerate;
import java.util.HashMap;
import java.util.Map;
public enum OrderTypeEnum {
RentVehicle(1, "租车订单"),
;
/**
* 编码
*/
private Integer code;
/**
* 类型描述
*/
private String desc;
private static Map<Integer,String> codeAndDesc = new HashMap<Integer, String>();
//Maps.newHashMap();
// static{
// for(VehicleBookRecordStatus constantType : VehicleBookRecordStatus.values()){
// codeAndDesc.put(constantType.getCode(),constantType.getDesc());
// }
// }
OrderTypeEnum(Integer code, String desc){
this.code=code;
this.desc=desc;
}
public Integer getCode() {
return code;
}
public void setCode(Integer code) {
this.code = code;
}
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
public static Boolean exists(Integer code){
return codeAndDesc.containsKey(code);
}
}
\ No newline at end of file
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java
View file @ 220d969f
......@@ -20,6 +20,7 @@ public class BaseOrder implements Serializable {
//主键
@Id
@GeneratedValue(generator = "JDBC")
@ApiModelProperty("主键")
private Integer id;
......
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderItem.java 0 → 100644
View file @ 220d969f
package com.xxfc.platform.order.entity;
public interface OrderItem {
Integer getOrderId();
void setOrderId(Integer orderId);
}
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderRentVehicleItem.java
View file @ 220d969f
......@@ -16,7 +16,7 @@ import lombok.Data;
*/
@Data
@Table(name = "order_rent_vehicle_item")
public class OrderRentVehicleItem implements Serializable {
public class OrderRentVehicleItem implements Serializable, OrderItem {
private static final long serialVersionUID = 1L;
//主键
......
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/vo/OrderVO.java → xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/vo/OrderPageVO.java
View file @ 220d969f
......@@ -4,10 +4,9 @@ import com.xxfc.platform.order.entity.BaseOrder;
import lombok.Data;
import java.util.List;
import java.util.Map;
@Data
public class OrderVO {
//<OrderItem> {
BaseOrder baseOrder;
// List<OrderItem> orderItems;
public class OrderPageVO extends BaseOrder {
List<Map<String, Object>> orderItems;
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderRentVehicleBiz.java
View file @ 220d969f
......@@ -24,8 +24,6 @@ public class OrderRentVehicleBiz extends BaseBiz<OrderRentVehicleItemMapper, Ord
@Transactional
public void createOrder(OrderRentVehicleItem item) {
BaseOrder baseOrder = baseOrderBiz.createOrder();
item.setOrderId(baseOrder.getId());
insertSelective(item);
// mapper.select()
}
}
\ No newline at end of file
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderRentVehicleController.java
View file @ 220d969f
package com.xxfc.platform.order.rest;
import cn.hutool.db.sql.Order;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.rest.CommonBaseController;
import com.xxfc.platform.order.biz.OrderRentVehicleBiz;
import com.xxfc.platform.order.entity.OrderRentVehicleItem;
import com.xxfc.platform.order.service.OrderRentVehicleService;
import com.xxfc.platform.order.vo.OrderVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
......@@ -23,21 +20,16 @@ import org.springframework.web.bind.annotation.ResponseBody;
public class OrderRentVehicleController extends CommonBaseController {
@Autowired
OrderRentVehicleService orderRentCarService;
OrderRentVehicleService orderRentVehicleService;
@Autowired
OrderRentVehicleBiz orderRentVehicleBiz;
public class AAA {
@ApiModelProperty
String sss;
}
@RequestMapping(value = "add",method = RequestMethod.POST)
@ResponseBody
@ApiOperation(value = "确认租车订单")
public ObjectRestResponse<OrderRentVehicleItem> add(@RequestBody OrderRentVehicleItem item){
orderRentVehicleBiz.createOrder(item);
orderRentVehicleService.createOrder(item);
return new ObjectRestResponse<OrderRentVehicleItem>();
}
}
\ No newline at end of file
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/AbstractOrderHandle.java
View file @ 220d969f
package com.xxfc.platform.order.service;
import cn.hutool.core.util.IdUtil;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.github.wxiaoqi.security.common.exception.BaseException;
import com.github.wxiaoqi.security.common.util.process.ResultCode;
import com.xxfc.platform.order.biz.BaseOrderBiz;
import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
import com.xxfc.platform.order.entity.BaseOrder;
import com.xxfc.platform.order.vo.OrderVO;
import com.xxfc.platform.order.entity.OrderItem;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@Transactional
public abstract class AbstractOrderHandle<Biz extends BaseBiz, Item extends OrderItem>{
public abstract class AbstractOrderHandle<Biz extends BaseBiz> implements OrderHandle {
@Autowired
protected Biz detailOrderBiz;
protected Biz itemBiz;
@Autowired
protected BaseOrderBiz baseOrderBiz;
// public void createOrder(VO vo) {
// baseOrderBiz.insertSelective(vo.getBaseOrder());
// }
protected OrderTypeEnum orderTypeEnum = null;
/**
* 创建基础订单
* @return
*/
public BaseOrder createOrder() {
BaseOrder baseOrder = new BaseOrder();
baseOrder.setNo(IdUtil.randomUUID());
if(null == orderTypeEnum)
throw new BaseException(ResultCode.NOTEXIST_CODE);
else {
baseOrder.setType(orderTypeEnum.getCode());
}
baseOrderBiz.insertSelective(baseOrder);
return baseOrder;
}
/**
* 创建订单及其子项
* @param item
*/
public void createOrder(Item item) {
BaseOrder order = createOrder();
createOrderMakeUp(order,item);
handleItem(item);
}
/**
* 处理订单子项
* @param item
*/
public void handleItem(Item item){
itemBiz.insertSelective(item);
}
/**
* 创建订单及其多子项
* @param items
*/
public void createOrder(List<Item> items) {
BaseOrder order = createOrder();
for(Item item : items) {
createOrderMakeUp(order,item);
}
handleItem(items);
}
/**
* 处理订单多子项
* @param items
*/
public void handleItem(List<Item> items){
for(Item item : items) {
itemBiz.insertSelective(item);
}
}
//public void createOrder(List<OrderVO> o)
/**
* 子项补充处理
* @param baseOrder
* @param item
*/
void createOrderMakeUp(BaseOrder baseOrder, Item item){
item.setOrderId(baseOrder.getId());
}
// public void modifyOrder(VO vo) {
// baseOrderBiz.updateSelectiveById(vo.getBaseOrder());
// }
// abstract void createOrderMakeUp(BaseOrder baseOrder);
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java
View file @ 220d969f
package com.xxfc.platform.order.service;
import com.xxfc.platform.order.biz.OrderRentVehicleBiz;
import com.xxfc.platform.order.entity.BaseOrder;
import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
import com.xxfc.platform.order.entity.OrderRentVehicleItem;
import com.xxfc.platform.order.vo.OrderVO;
import org.springframework.stereotype.Service;
@Service
public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicleBiz> {
public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicleBiz, OrderRentVehicleItem> {
// @Override
// public void createOrder(OrderVO<OrderRentVehicleItem> vo) {
// super.createOrder(vo);
// this.detailOrderBiz.insertSelective(vo.getOrderItems().get(0));
//确定订单为租车类型
OrderTypeEnum orderTypeEnum = OrderTypeEnum.RentVehicle;
// static {
// }
// public void createOrder(OrderRentVehicleItem item) {
// super.createOrder();
// this.detailOrderBiz.insertSelective(item);
// }
// @Override
// void createOrderMakeUp(BaseOrder order) {
// OrderRentVehicleItem orderRentVehicleItem
// }
@Override
public void handleItem(OrderRentVehicleItem item) {
//获取车辆
//
super.handleItem(item);
}
}
xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml
View file @ 220d969f
......@@ -4,25 +4,37 @@
<mapper namespace="com.xxfc.platform.order.mapper.BaseOrderMapper">
<!-- 可根据自己的需求，是否要使用 -->
<resultMap type="com.xxfc.platform.order.entity.BaseOrder" id="baseOrderMap">
<result property="id" column="id"/>
<result property="no" column="no"/>
<result property="type" column="type"/>
<result property="detailId" column="detail_id"/>
<result property="status" column="status"/>
<result property="productAmount" column="product_amount"/>
<result property="orderAmount" column="order_amount"/>
<result property="detailJson" column="detail_json"/>
<result property="thirdType" column="third_type"/>
<result property="outTradeNo" column="out_trade_no"/>
<result property="crtTime" column="crt_time"/>
<result property="crtUser" column="crt_user"/>
<result property="crtName" column="crt_name"/>
<result property="crtHost" column="crt_host"/>
<result property="updTime" column="upd_time"/>
<result property="updUser" column="upd_user"/>
<result property="updName" column="upd_name"/>
<result property="updHost" column="upd_host"/>
<!-- <resultMap type="com.xxfc.platform.order.entity.BaseOrder" id="baseOrderMap">-->
<!-- <result property="id" column="id"/>-->
<!-- <result property="no" column="no"/>-->
<!-- <result property="type" column="type"/>-->
<!-- <result property="detailId" column="detail_id"/>-->
<!-- <result property="status" column="status"/>-->
<!-- <result property="productAmount" column="product_amount"/>-->
<!-- <result property="orderAmount" column="order_amount"/>-->
<!-- <result property="detailJson" column="detail_json"/>-->
<!-- <result property="thirdType" column="third_type"/>-->
<!-- <result property="outTradeNo" column="out_trade_no"/>-->
<!-- <result property="crtTime" column="crt_time"/>-->
<!-- <result property="crtUser" column="crt_user"/>-->
<!-- <result property="crtName" column="crt_name"/>-->
<!-- <result property="crtHost" column="crt_host"/>-->
<!-- <result property="updTime" column="upd_time"/>-->
<!-- <result property="updUser" column="upd_user"/>-->
<!-- <result property="updName" column="upd_name"/>-->
<!-- <result property="updHost" column="upd_host"/>-->
<!-- </resultMap>-->
<resultMap type="com.xxfc.platform.order.vo.OrderPageVO" id="orderPageMap">
<discriminator javaType="Integer" column="type">
<case value="1" resultType="com.xxfc.platform.order.entity.OrderRentVehicleItem">
<collection column="orderId=id" javaType="ArrayList" ofType="com.xxfc.platform.universal.entity.MemberFamilyInfo" property="family" select="com.xxfc.platform.order.mapper.OrderRentVehicleItemMapper.listByOrderId"></collection>
</case>
</discriminator>
</resultMap>
<select id="pageByParm" resultMap="orderPageMap">
select * from base_order;
</select>
</mapper>
\ No newline at end of file
xx-order/xx-order-server/src/main/resources/mapper/OrderRentVehicleItemMapper.xml
View file @ 220d969f
......@@ -3,5 +3,9 @@
<mapper namespace="com.xxfc.platform.order.mapper.OrderRentVehicleItemMapper">
<select id="listByOrderId" parameterType="Integer" resultType="com.xxfc.platform.order.entity.OrderRentVehicleItem">
select *
from order_rent_vehicle_item
where order_id = #{orderId}
</select>
</mapper>
\ No newline at end of file
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleModel.java
View file @ 220d969f
package com.xxfc.platform.vehicle.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import javax.persistence.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
......@@ -10,539 +13,193 @@ import javax.persistence.*;
*
* @author zjw
* @email nishijjo@qq.com
* @date 2019-05-21 14:15:27
* @date 2019-05-25 14:50:08
*/
@Data
@Table(name = "vehicle_model")
public class VehicleModel implements Serializable {
private static final long serialVersionUID = 1L;
//主键
@Id
@GeneratedValue(generator = "JDBC")
@ApiModelProperty("主键")
private Integer id;
//名称
@Column(name = "name")
@ApiModelProperty(value = "名称")
private String name;
//牌照
@Column(name = "license_plate")
@ApiModelProperty(value = "牌照")
private String licensePlate;
//厂家
@Column(name = "factory")
@ApiModelProperty(value = "厂家")
private Integer factory;
//车型
@Column(name = "category")
@ApiModelProperty(value = "车型")
private Integer category;
//长度mm
@Column(name = "length")
@ApiModelProperty(value = "长度mm")
private Integer length;
//宽度mm
@Column(name = "width")
@ApiModelProperty(value = "宽度mm")
private Integer width;
//高度mm
@Column(name = "high")
@ApiModelProperty(value = "高度mm")
private Integer high;
//乘坐人数
@Column(name = "seating")
@ApiModelProperty(value = "乘坐人数")
private Integer seating;
//离地空隙mm
@Column(name = "above_ground")
@ApiModelProperty(value = "离地空隙mm")
private Integer aboveGround;
//排量
@Column(name = "displacement")
@ApiModelProperty(value = "排量")
private Integer displacement;
//燃油类型
@Column(name = "fuel_type")
@ApiModelProperty(value = "燃油类型")
private Integer fuelType;
//功率
@Column(name = "power")
@ApiModelProperty(value = "功率")
private Integer power;
//最大扭矩
@Column(name = "max_torque")
@ApiModelProperty(value = "最大扭矩")
private Integer maxTorque;
//驱动形式
@Column(name = "drive_type")
@ApiModelProperty(value = "驱动形式")
private Integer driveType;
//变速箱
@Column(name = "gearbox")
@ApiModelProperty(value = "变速箱")
private Integer gearbox;
//油箱大小
@Column(name = "fuel_tank_size")
@ApiModelProperty(value = "油箱大小")
private Integer fuelTankSize;
//排放标准
@Column(name = "emission_standard")
@ApiModelProperty(value = "排放标准")
private Integer emissionStandard;
//最高车速
@Column(name = "max_speed")
@ApiModelProperty(value = "最高车速")
private Integer maxSpeed;
//清水箱大小
@Column(name = "water_tank_size")
@ApiModelProperty(value = "清水箱大小")
private Integer waterTankSize;
//灰水箱大小
@Column(name = "grey_water_tank_size")
@ApiModelProperty(value = "灰水箱大小")
private Integer greyWaterTankSize;
//黑水箱大小
@Column(name = "black_water_tank_size")
@ApiModelProperty(value = "黑水箱大小")
private Integer blackWaterTankSize;
//马 桶
@Column(name = "closestool")
@ApiModelProperty(value = "马 桶")
private Integer closestool;
//配置，code逗号分割
@Column(name = "config")
@ApiModelProperty(value = "配置，code逗号分割")
private String config;
//关键字，code逗号分割
@Column(name = "keyword")
@ApiModelProperty(value = "关键字，code逗号分割")
private String keyword;
//评分
@Column(name = "point")
@ApiModelProperty(value = "评分")
private Integer point;
//图片地址 多张为逗号分割
@Column(name = "picture")
@ApiModelProperty(value = "图片地址 多张为逗号分割")
private String picture;
//价格
@Column(name = "price")
@ApiModelProperty(value = "价格")
private BigDecimal price;
//创建时间
@Column(name = "crt_time")
@ApiModelProperty(value = "创建时间", hidden = true )
private Date crtTime;
//创建者id
@Column(name = "crt_user")
@ApiModelProperty(value = "创建者id")
private Integer crtUser;
//创建者名称
@Column(name = "crt_name")
@ApiModelProperty(value = "创建者名称")
private String crtName;
//创建者host
@Column(name = "crt_host")
@ApiModelProperty(value = "创建者host")
private String crtHost;
//修改时间
@Column(name = "upd_time")
@ApiModelProperty(value = "修改时间", hidden = true )
private Date updTime;
//修改者
@Column(name = "upd_user")
@ApiModelProperty(value = "修改者")
private Integer updUser;
//修改者名称
@Column(name = "upd_name")
@ApiModelProperty(value = "修改者名称")
private String updName;
//修改者host
@Column(name = "upd_host")
@ApiModelProperty(value = "修改者host")
private String updHost;
/**
* 设置：主键
*/
public void setId(Integer id) {
this.id = id;
}
/**
* 获取：主键
*/
public Integer getId() {
return id;
}
/**
* 设置：名称
*/
public void setName(String name) {
this.name = name;
}
/**
* 获取：名称
*/
public String getName() {
return name;
}
/**
* 设置：牌照
*/
public void setLicensePlate(String licensePlate) {
this.licensePlate = licensePlate;
}
/**
* 获取：牌照
*/
public String getLicensePlate() {
return licensePlate;
}
/**
* 设置：厂家
*/
public void setFactory(Integer factory) {
this.factory = factory;
}
/**
* 获取：厂家
*/
public Integer getFactory() {
return factory;
}
/**
* 设置：车型
*/
public void setCategory(Integer category) {
this.category = category;
}
/**
* 获取：车型
*/
public Integer getCategory() {
return category;
}
/**
* 设置：长度mm
*/
public void setLength(Integer length) {
this.length = length;
}
/**
* 获取：长度mm
*/
public Integer getLength() {
return length;
}
/**
* 设置：宽度mm
*/
public void setWidth(Integer width) {
this.width = width;
}
/**
* 获取：宽度mm
*/
public Integer getWidth() {
return width;
}
/**
* 设置：高度mm
*/
public void setHigh(Integer high) {
this.high = high;
}
/**
* 获取：高度mm
*/
public Integer getHigh() {
return high;
}
/**
* 设置：乘坐人数
*/
public void setSeating(Integer seating) {
this.seating = seating;
}
/**
* 获取：乘坐人数
*/
public Integer getSeating() {
return seating;
}
/**
* 设置：离地空隙mm
*/
public void setAboveGround(Integer aboveGround) {
this.aboveGround = aboveGround;
}
/**
* 获取：离地空隙mm
*/
public Integer getAboveGround() {
return aboveGround;
}
/**
* 设置：排量
*/
public void setDisplacement(Integer displacement) {
this.displacement = displacement;
}
/**
* 获取：排量
*/
public Integer getDisplacement() {
return displacement;
}
/**
* 设置：燃油类型
*/
public void setFuelType(Integer fuelType) {
this.fuelType = fuelType;
}
/**
* 获取：燃油类型
*/
public Integer getFuelType() {
return fuelType;
}
/**
* 设置：功率
*/
public void setPower(Integer power) {
this.power = power;
}
/**
* 获取：功率
*/
public Integer getPower() {
return power;
}
/**
* 设置：最大扭矩
*/
public void setMaxTorque(Integer maxTorque) {
this.maxTorque = maxTorque;
}
/**
* 获取：最大扭矩
*/
public Integer getMaxTorque() {
return maxTorque;
}
/**
* 设置：驱动形式
*/
public void setDriveType(Integer driveType) {
this.driveType = driveType;
}
/**
* 获取：驱动形式
*/
public Integer getDriveType() {
return driveType;
}
/**
* 设置：变速箱
*/
public void setGearbox(Integer gearbox) {
this.gearbox = gearbox;
}
/**
* 获取：变速箱
*/
public Integer getGearbox() {
return gearbox;
}
/**
* 设置：油箱大小
*/
public void setFuelTankSize(Integer fuelTankSize) {
this.fuelTankSize = fuelTankSize;
}
/**
* 获取：油箱大小
*/
public Integer getFuelTankSize() {
return fuelTankSize;
}
/**
* 设置：排放标准
*/
public void setEmissionStandard(Integer emissionStandard) {
this.emissionStandard = emissionStandard;
}
/**
* 获取：排放标准
*/
public Integer getEmissionStandard() {
return emissionStandard;
}
/**
* 设置：最高车速
*/
public void setMaxSpeed(Integer maxSpeed) {
this.maxSpeed = maxSpeed;
}
/**
* 获取：最高车速
*/
public Integer getMaxSpeed() {
return maxSpeed;
}
/**
* 设置：清水箱大小
*/
public void setWaterTankSize(Integer waterTankSize) {
this.waterTankSize = waterTankSize;
}
/**
* 获取：清水箱大小
*/
public Integer getWaterTankSize() {
return waterTankSize;
}
/**
* 设置：灰水箱大小
*/
public void setGreyWaterTankSize(Integer greyWaterTankSize) {
this.greyWaterTankSize = greyWaterTankSize;
}
/**
* 获取：灰水箱大小
*/
public Integer getGreyWaterTankSize() {
return greyWaterTankSize;
}
/**
* 设置：黑水箱大小
*/
public void setBlackWaterTankSize(Integer blackWaterTankSize) {
this.blackWaterTankSize = blackWaterTankSize;
}
/**
* 获取：黑水箱大小
*/
public Integer getBlackWaterTankSize() {
return blackWaterTankSize;
}
/**
* 设置：马 桶
*/
public void setClosestool(Integer closestool) {
this.closestool = closestool;
}
/**
* 获取：马 桶
*/
public Integer getClosestool() {
return closestool;
}
/**
* 设置：配置，code逗号分割
*/
public void setConfig(String config) {
this.config = config;
}
/**
* 获取：配置，code逗号分割
*/
public String getConfig() {
return config;
}
/**
* 设置：关键字，code逗号分割
*/
public void setKeyword(String keyword) {
this.keyword = keyword;
}
/**
* 获取：关键字，code逗号分割
*/
public String getKeyword() {
return keyword;
}
/**
* 设置：创建时间
*/
public void setCrtTime(Date crtTime) {
this.crtTime = crtTime;
}
/**
* 获取：创建时间
*/
public Date getCrtTime() {
return crtTime;
}
/**
* 设置：创建者id
*/
public void setCrtUser(Integer crtUser) {
this.crtUser = crtUser;
}
/**
* 获取：创建者id
*/
public Integer getCrtUser() {
return crtUser;
}
/**
* 设置：创建者名称
*/
public void setCrtName(String crtName) {
this.crtName = crtName;
}
/**
* 获取：创建者名称
*/
public String getCrtName() {
return crtName;
}
/**
* 设置：创建者host
*/
public void setCrtHost(String crtHost) {
this.crtHost = crtHost;
}
/**
* 获取：创建者host
*/
public String getCrtHost() {
return crtHost;
}
/**
* 设置：修改时间
*/
public void setUpdTime(Date updTime) {
this.updTime = updTime;
}
/**
* 获取：修改时间
*/
public Date getUpdTime() {
return updTime;
}
/**
* 设置：修改者
*/
public void setUpdUser(Integer updUser) {
this.updUser = updUser;
}
/**
* 获取：修改者
*/
public Integer getUpdUser() {
return updUser;
}
/**
* 设置：修改者名称
*/
public void setUpdName(String updName) {
this.updName = updName;
}
/**
* 获取：修改者名称
*/
public String getUpdName() {
return updName;
}
/**
* 设置：修改者host
*/
public void setUpdHost(String updHost) {
this.updHost = updHost;
}
/**
* 获取：修改者host
*/
public String getUpdHost() {
return updHost;
}
}
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/UsableVehicleVO.java
View file @ 220d969f
......@@ -11,7 +11,7 @@ import java.util.List;
@Data
public class UsableVehicleVO {
//车辆id
// String vehicleModelId;
Integer modelId;
Vehicle vehicle;
BigDecimal distance;
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/AccompanyingItemBiz.java
View file @ 220d969f
......@@ -10,7 +10,7 @@ import com.xxfc.platform.vehicle.constant.RedisKey;
import com.xxfc.platform.vehicle.entity.AccompanyingItem;
import com.xxfc.platform.vehicle.mapper.AccompanyingItemMapper;
import com.xxfc.platform.vehicle.vo.AddOrUpdateAccompanyingItem;
import com.xxfc.platform.vehicle.vo.PageDataVO;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.vehicle.vo.QueryAccompanyItemVo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.beanutils.BeanUtils;
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyBiz.java
View file @ 220d969f
......@@ -15,7 +15,7 @@ import com.xxfc.platform.vehicle.mapper.BranchCompanyMapper;
import com.xxfc.platform.vehicle.util.excel.ExcelImport;
import com.xxfc.platform.vehicle.vo.BranchCompanyVo;
import com.xxfc.platform.vehicle.vo.CompanySearchDTO;
import com.xxfc.platform.vehicle.vo.PageDataVO;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.io.FileUtils;
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/CampsiteBiz.java
View file @ 220d969f
......@@ -15,7 +15,7 @@ import com.xxfc.platform.vehicle.mapper.ConstantMapper;
import com.xxfc.platform.vehicle.mapper.SysRegionMapper;
import com.xxfc.platform.vehicle.util.excel.ExcelImport;
import com.xxfc.platform.vehicle.vo.CampsiteVo;
import com.xxfc.platform.vehicle.vo.PageDataVO;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.io.FileUtils;
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java
View file @ 220d969f
......@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.xxfc.platform.vehicle.common.CustomIllegalParamException;
......@@ -828,7 +829,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
return zoneCompanyIds.parallelStream().distinct().collect(Collectors.toList());
}
public List<UsableVehicleVO> searchUsable(UsableVeicleDTO dto){
public PageDataVO<UsableVehicleVO> searchUsable(UsableVeicleDTO dto){
//adjustBookedInfoParam(params, );
Map<String, Object> params = BeanUtil.beanToMap(dto);
List<String> notBookedDates = Lists.newArrayList();
......@@ -852,6 +853,10 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
}
//加入预定信息查询条件
fillBookedDateSearchParam(params,yearMonthAndDate,yearMonthAndDateNotBooked);
return mapper.searchUsable(params);
PageHelper.startPage(dto.getPage(), dto.getLimit());
List<UsableVehicleVO> lists = mapper.searchUsable(params);
PageInfo<UsableVehicleVO> usableVehicleInfo = new PageInfo<>(lists);
return PageDataVO.pageInfo(usableVehicleInfo);
}
}
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java
View file @ 220d969f
......@@ -3,6 +3,7 @@ package com.xxfc.platform.vehicle.biz;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleLicenseBiz.java
View file @ 220d969f
......@@ -5,24 +5,16 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.xxfc.platform.vehicle.common.RestResponse;
import com.xxfc.platform.vehicle.entity.Campsite;
import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
import com.xxfc.platform.vehicle.feign.dto.AppUserDTO;
import com.xxfc.platform.vehicle.feign.dto.UserDTO;
import com.xxfc.platform.vehicle.mapper.VehicleLicenseMapper;
import com.xxfc.platform.vehicle.vo.PageDataVO;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.vehicle.vo.VehicleUserLicenseVo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import tk.mybatis.mapper.entity.Example;
import static com.github.wxiaoqi.security.auth.common.constatns.CommonConstants.DATA_ALL_FALSE;
import static com.xxfc.platform.vehicle.constant.DbColumnConstant.COMPANY_ZONE_ID;
import static com.xxfc.platform.vehicle.constant.DbColumnConstant.ID;
@Service
@Slf4j
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleWarningMsgBiz.java
View file @ 220d969f
......@@ -16,7 +16,7 @@ import com.xxfc.platform.vehicle.mapper.VehicleWarningMsgMapper;
import com.xxfc.platform.vehicle.mapper.VehicleWarningRuleMapper;
import com.xxfc.platform.vehicle.util.JSUtil;
import com.xxfc.platform.vehicle.vo.AddVehicleWarningMsgVo;
import com.xxfc.platform.vehicle.vo.PageDataVO;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.vehicle.vo.QueryVehicleWarningMsgVo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.beanutils.BeanUtils;
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/AccompanyingItemController.java
View file @ 220d969f
......@@ -10,7 +10,7 @@ import com.xxfc.platform.vehicle.common.RestResponse;
import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
import com.xxfc.platform.vehicle.entity.AccompanyingItem;
import com.xxfc.platform.vehicle.vo.AddOrUpdateAccompanyingItem;
import com.xxfc.platform.vehicle.vo.PageDataVO;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.vehicle.vo.QueryAccompanyItemVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/BranchCompanyController.java
View file @ 220d969f
......@@ -13,7 +13,7 @@ import com.xxfc.platform.vehicle.feign.UserFeign;
import com.xxfc.platform.vehicle.feign.dto.UserDTO;
import com.xxfc.platform.vehicle.vo.BranchCompanyVo;
import com.xxfc.platform.vehicle.vo.CompanySearchDTO;
import com.xxfc.platform.vehicle.vo.PageDataVO;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/CampsiteController.java
View file @ 220d969f
......@@ -11,7 +11,7 @@ import com.xxfc.platform.vehicle.entity.Campsite;
import com.xxfc.platform.vehicle.feign.UserFeign;
import com.xxfc.platform.vehicle.feign.dto.UserDTO;
import com.xxfc.platform.vehicle.vo.CampsiteVo;
import com.xxfc.platform.vehicle.vo.PageDataVO;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java
View file @ 220d969f
......@@ -7,6 +7,7 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
import com.github.wxiaoqi.security.common.context.BaseContextHandler;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.vehicle.biz.VehicleBiz;
import com.xxfc.platform.vehicle.biz.VehicleBookRecordBiz;
import com.xxfc.platform.vehicle.common.BaseController;
......@@ -31,7 +32,6 @@ import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleLicenseController.java
View file @ 220d969f
package com.xxfc.platform.vehicle.rest;
import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
import com.xxfc.platform.vehicle.biz.VehicleLicenseBiz;
import com.xxfc.platform.vehicle.biz.VehiclePlatCataBiz;
import com.xxfc.platform.vehicle.common.RestResponse;
import com.xxfc.platform.vehicle.common.VehicleBaseController;
import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
import com.xxfc.platform.vehicle.feign.dto.AppUserDTO;
import com.xxfc.platform.vehicle.vo.CataVo;
import com.xxfc.platform.vehicle.vo.PageDataVO;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.vehicle.vo.VehicleUserLicenseVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleWarningMsgController.java
View file @ 220d969f
......@@ -10,7 +10,7 @@ import com.xxfc.platform.vehicle.common.RestResponse;
import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
import com.xxfc.platform.vehicle.entity.VehicleWarningMsg;
import com.xxfc.platform.vehicle.vo.AddVehicleWarningMsgVo;
import com.xxfc.platform.vehicle.vo.PageDataVO;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.vehicle.vo.QueryVehicleWarningMsgVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
......
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml
View file @ 220d969f
......@@ -5,8 +5,11 @@
<resultMap id="searchUsableMap" type="com.xxfc.platform.vehicle.vo.UsableVehicleVO">
<!-- <collection column="company_id" property="id" ofType="com.xxfc.platform.vehicle.entity.BranchCompany" select="com.xxfc.platform.vehicle.mapper.BranchCompanyMapper.selectByPrimaryKey" />-->
<result column="park_branch_company_id" property="companyId" jdbcType="VARCHAR" javaType="java.lang.Integer"/>
<result column="model_id" property="modelId" jdbcType="INTEGER" javaType="java.lang.Integer"/>
<!-- <result column="vehicle_id" property="modelId" jdbcType="INTEGER" javaType="java.lang.Integer"/>-->
<association property="company" column="company_id" select="com.xxfc.platform.vehicle.mapper.BranchCompanyMapper.selectByPrimaryKey" />
<association property="vehicleModel" column="model_id" select="com.xxfc.platform.vehicle.mapper.VehicleModelMapper.selectByPrimaryKey" />
<!-- <association property="vehicle" column="vehicle_id" select="com.xxfc.platform.vehicle.mapper.VehicleMapper.selectByPrimaryKey" />-->
</resultMap>
<update id="updateStatusById" parameterType="java.util.Map">
......@@ -243,6 +246,7 @@
<select id="searchUsable" parameterType="java.util.Map"
resultMap="searchUsableMap">
select distinct vm.id as model_id, bc.id as company_id
# , v.id as vehicle_id
<if test="lon != null and lat != null">
,st_distance_sphere(point(#{lon}, #{lat}), point(bc.longitude, bc.latitude)) as distance
</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment