车辆维护相关

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/biz/VehicleUpkeepService.java

+package com.xinxincaravan.caravan.vehicle.biz;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xinxincaravan.caravan.vehicle.entity.VehicleUpkeepItem;
+import com.xinxincaravan.caravan.vehicle.mapper.BranchCompanyStockApplyInfoMapper;
+import com.xinxincaravan.caravan.vehicle.mapper.VehicleUpkeepItemMapper;
+import com.xinxincaravan.caravan.vehicle.mapper.VehicleUpkeepLogMapper;
+import com.xinxincaravan.caravan.vehicle.vo.VehicleUpkeepLogVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class VehicleUpkeepService {
+
+    @Autowired
+    VehicleUpkeepItemMapper vehicleUpkeepItemMapper;
+
+    @Autowired
+    VehicleUpkeepLogMapper vehicleUpkeepLogMapper;
+
+    public List<VehicleUpkeepItem> getAllItem() {
+        return vehicleUpkeepItemMapper.selectAll();
+    }
+
+    public void addItem(String itemName) {
+        VehicleUpkeepItem item = new VehicleUpkeepItem();
+        item.setName(itemName);
+        vehicleUpkeepItemMapper.insert(item);
+    }
+
+    public void updateItem(VehicleUpkeepItem item) {
+        vehicleUpkeepItemMapper.updateByPrimaryKey(item);
+    }
+
+    public void deleteItem(Integer id) {
+        vehicleUpkeepItemMapper.deleteByPrimaryKey(id);
+    }
+
+    public PageInfo<VehicleUpkeepLogVo> pageLog(String numberPlate, Integer page, Integer limit) {
+        PageHelper.startPage(page, limit);
+        return new PageInfo<>(vehicleUpkeepLogMapper.selectVoAll(numberPlate));
+    }
+
+    public VehicleUpkeepLogVo getLogVoById(Integer id) {
+        return vehicleUpkeepLogMapper.selectVoById(id);
+    }
+
+    public void deleteLog(Integer id) {
+        vehicleUpkeepLogMapper.deleteByPrimaryKey(id);
+    }
+}

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/entity/VehicleUpkeepItem.java

+package com.xinxincaravan.caravan.vehicle.entity;
+
+import javax.persistence.*;
+
+@Table(name = "vehicle_upkeep_item")
+public class VehicleUpkeepItem {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY, generator = "JDBC")
+    private Integer id;
+
+    /**
+     * 保养项目名称
+     */
+    private String name;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取保养项目名称
+     *
+     * @return name - 保养项目名称
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * 设置保养项目名称
+     *
+     * @param name 保养项目名称
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+}
\ No newline at end of file

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/entity/VehicleUpkeepLog.java

+package com.xinxincaravan.caravan.vehicle.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import javax.persistence.*;
+
+@Table(name = "vehicle_upkeep_log")
+public class VehicleUpkeepLog {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY, generator = "JDBC")
+    private Integer id;
+
+    /**
+     * 车辆ID
+     */
+    @Column(name = "vehicle_id")
+    private String vehicleId;
+
+    /**
+     * 保养人
+     */
+    private String operator;
+
+    /**
+     * 保养日期
+     */
+    private Date date;
+
+    /**
+     * 公里数
+     */
+    private Integer mileage;
+
+    /**
+     * 花费
+     */
+    private BigDecimal amount;
+
+    /**
+     * 审批人
+     */
+    private String approvers;
+
+    /**
+     * 分公司ID
+     */
+    @Column(name = "branch_company_id")
+    private Integer branchCompanyId;
+
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取车辆ID
+     *
+     * @return vehicle_id - 车辆ID
+     */
+    public String getVehicleId() {
+        return vehicleId;
+    }
+
+    /**
+     * 设置车辆ID
+     *
+     * @param vehicleId 车辆ID
+     */
+    public void setVehicleId(String vehicleId) {
+        this.vehicleId = vehicleId;
+    }
+
+    /**
+     * 获取保养人
+     *
+     * @return operator - 保养人
+     */
+    public String getOperator() {
+        return operator;
+    }
+
+    /**
+     * 设置保养人
+     *
+     * @param operator 保养人
+     */
+    public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
+    /**
+     * 获取保养日期
+     *
+     * @return date - 保养日期
+     */
+    public Date getDate() {
+        return date;
+    }
+
+    /**
+     * 设置保养日期
+     *
+     * @param date 保养日期
+     */
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    /**
+     * 获取公里数
+     *
+     * @return mileage - 公里数
+     */
+    public Integer getMileage() {
+        return mileage;
+    }
+
+    /**
+     * 设置公里数
+     *
+     * @param mileage 公里数
+     */
+    public void setMileage(Integer mileage) {
+        this.mileage = mileage;
+    }
+
+    /**
+     * 获取花费
+     *
+     * @return amount - 花费
+     */
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    /**
+     * 设置花费
+     *
+     * @param amount 花费
+     */
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    /**
+     * 获取审批人
+     *
+     * @return approvers - 审批人
+     */
+    public String getApprovers() {
+        return approvers;
+    }
+
+    /**
+     * 设置审批人
+     *
+     * @param approvers 审批人
+     */
+    public void setApprovers(String approvers) {
+        this.approvers = approvers;
+    }
+
+    /**
+     * 获取分公司ID
+     *
+     * @return branch_company_id - 分公司ID
+     */
+    public Integer getBranchCompanyId() {
+        return branchCompanyId;
+    }
+
+    /**
+     * 设置分公司ID
+     *
+     * @param branchCompanyId 分公司ID
+     */
+    public void setBranchCompanyId(Integer branchCompanyId) {
+        this.branchCompanyId = branchCompanyId;
+    }
+
+    /**
+     * @return create_time
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * @param createTime
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}
\ No newline at end of file

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/mapper/VehicleUpkeepItemMapper.java

+package com.xinxincaravan.caravan.vehicle.mapper;
+
+import com.xinxincaravan.caravan.vehicle.entity.VehicleUpkeepItem;
+import tk.mybatis.mapper.common.Mapper;
+
+public interface VehicleUpkeepItemMapper extends Mapper<VehicleUpkeepItem> {
+}
\ No newline at end of file

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/mapper/VehicleUpkeepLogMapper.java

+package com.xinxincaravan.caravan.vehicle.mapper;
+
+import com.xinxincaravan.caravan.vehicle.entity.VehicleUpkeepLog;
+import com.xinxincaravan.caravan.vehicle.vo.VehicleUpkeepLogVo;
+import org.apache.ibatis.annotations.Param;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+public interface VehicleUpkeepLogMapper extends Mapper<VehicleUpkeepLog> {
+    List<VehicleUpkeepLogVo> selectVoAll(@Param("numberPlate") String numberPlate);
+
+    VehicleUpkeepLogVo selectVoById(Integer id);
+}
\ No newline at end of file

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/rest/VehicleUpkeepController.java

+package com.xinxincaravan.caravan.vehicle.rest;
+
+import com.xinxincaravan.caravan.vehicle.biz.VehicleUpkeepService;
+import com.xinxincaravan.caravan.vehicle.common.RestResponse;
+import com.xinxincaravan.caravan.vehicle.constant.ResCode.ResCode;
+import com.xinxincaravan.caravan.vehicle.entity.VehicleUpkeepItem;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("upkeep")
+public class VehicleUpkeepController {
+
+
+    @Autowired
+    private VehicleUpkeepService vehicleUpkeepService;
+
+    @GetMapping("item/all")
+    public RestResponse allItem() {
+        return RestResponse.suc(vehicleUpkeepService.getAllItem());
+    }
+
+    @PostMapping("item")
+    public RestResponse addItem(String itemName) {
+        if (itemName == null || itemName.trim().equals("")) {
+            return RestResponse.codeAndMessage(ResCode.INVALID_REST_REQ_PARAM.getCode(),
+                    ResCode.INVALID_REST_REQ_PARAM.getDesc());
+        }
+        vehicleUpkeepService.addItem(itemName);
+        return RestResponse.suc();
+    }
+
+    @PutMapping("item")
+    public RestResponse editItem(VehicleUpkeepItem item) {
+        if (item == null || item.getId() == null || item.getName() == null || item.getName().trim().equals("")) {
+            return RestResponse.codeAndMessage(ResCode.INVALID_REST_REQ_PARAM.getCode(),
+                    ResCode.INVALID_REST_REQ_PARAM.getDesc());
+        }
+        vehicleUpkeepService.updateItem(item);
+        return RestResponse.suc();
+    }
+
+    @DeleteMapping("item/{id}")
+    public RestResponse delItem(@PathVariable("id") Integer id) {
+        if (id == null) {
+            return RestResponse.codeAndMessage(ResCode.INVALID_REST_REQ_PARAM.getCode(),
+                    ResCode.INVALID_REST_REQ_PARAM.getDesc());
+        }
+        vehicleUpkeepService.deleteItem(id);
+        return RestResponse.suc();
+    }
+
+    @GetMapping("log/page")
+    public RestResponse pageLog(String numberPlate, Integer page, Integer limit) {
+        if (page == null || limit == null) {
+            page = 1;
+            limit = 10;
+        }
+        return RestResponse.suc(vehicleUpkeepService.pageLog(numberPlate, page, limit));
+    }
+
+    @GetMapping("log/{id}")
+    public RestResponse getLog(@PathVariable("id") Integer id) {
+        if (id == null) {
+            return RestResponse.codeAndMessage(ResCode.INVALID_REST_REQ_PARAM.getCode(),
+                    ResCode.INVALID_REST_REQ_PARAM.getDesc());
+        }
+        return RestResponse.suc(vehicleUpkeepService.getLogVoById(id));
+    }
+
+    @DeleteMapping("log/{id}")
+    public RestResponse delLog(@PathVariable("id") Integer id) {
+        if (id == null) {
+            return RestResponse.codeAndMessage(ResCode.INVALID_REST_REQ_PARAM.getCode(),
+                    ResCode.INVALID_REST_REQ_PARAM.getDesc());
+        }
+        vehicleUpkeepService.deleteLog(id);
+        return RestResponse.suc();
+    }
+
+}

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/vo/VehicleUpkeepLogVo.java

+package com.xinxincaravan.caravan.vehicle.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class VehicleUpkeepLogVo {
+
+    Integer id;
+    Integer vehiceId;
+    String numberPlate;
+    String operator;
+    Date date;
+    Integer mileage;
+    BigDecimal amount;
+    String approvers;
+    Integer branchCompanyId;
+    String branchCompanyName;
+    Date createTime;
+
+
+}

vehicle/src/main/resources/builder/generatorConfig.xml

@@ -27,15 +27,17 @@
         <javaClientGenerator targetPackage="${targetMapperPackage}" targetProject="${targetJavaProject}"
                              type="XMLMAPPER"/>
 
-        <table tableName="vehicle" domainObjectName="Vehicle">
-        </table>
-        <table tableName="vehicle_book_info" domainObjectName="VehicleBookInfo">
-        </table>
-        <table tableName="vehicle_book_record" domainObjectName="VehicleBookRecord">
-        </table>
-        <table tableName="branch_company" domainObjectName="BranchCompany">
-        </table>
-        <table tableName="branch_company_stock_info" domainObjectName="BranchCompanyStockInfo"></table>
-        <table tableName="branch_company_stock_apply_info" domainObjectName="BranchCompanyStockApplyInfo"></table>
+<!--        <table tableName="vehicle" domainObjectName="Vehicle">-->
+<!--        </table>-->
+<!--        <table tableName="vehicle_book_info" domainObjectName="VehicleBookInfo">-->
+<!--        </table>-->
+<!--        <table tableName="vehicle_book_record" domainObjectName="VehicleBookRecord">-->
+<!--        </table>-->
+<!--        <table tableName="branch_company" domainObjectName="BranchCompany">-->
+<!--        </table>-->
+<!--        <table tableName="branch_company_stock_info" domainObjectName="BranchCompanyStockInfo"></table>-->
+<!--        <table tableName="branch_company_stock_apply_info" domainObjectName="BranchCompanyStockApplyInfo"></table>-->
+        <table tableName="vehicle_upkeep_item" domainObjectName="VehicleUpkeepItem"></table>
+        <table tableName="vehicle_upkeep_log" domainObjectName="VehicleUpkeepLog"></table>
     </context>
 </generatorConfiguration>
\ No newline at end of file

vehicle/src/main/resources/mapper/BranchCompanyStockInfoMapper.xml

@@ -34,6 +34,6 @@
 
     </select>
     <select id="selectAllPrice" resultType="int">
-        select distinct price from branch_company_stock_info
+        select distinct price from branch_company_stock_info order by price
     </select>
 </mapper>
\ No newline at end of file

vehicle/src/main/resources/mapper/VehicleUpkeepItemMapper.xml

+<?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" >
+<mapper namespace="com.xinxincaravan.caravan.vehicle.mapper.VehicleUpkeepItemMapper" >
+  <resultMap id="BaseResultMap" type="com.xinxincaravan.caravan.vehicle.entity.VehicleUpkeepItem" >
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="name" property="name" jdbcType="VARCHAR" />
+  </resultMap>
+</mapper>
\ No newline at end of file

vehicle/src/main/resources/mapper/VehicleUpkeepLogMapper.xml

+<?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" >
+<mapper namespace="com.xinxincaravan.caravan.vehicle.mapper.VehicleUpkeepLogMapper">
+    <resultMap id="BaseResultMap" type="com.xinxincaravan.caravan.vehicle.entity.VehicleUpkeepLog">
+        <!--
+          WARNING - @mbg.generated
+        -->
+        <id column="id" property="id" jdbcType="INTEGER"/>
+        <result column="vehicle_id" property="vehicleId" jdbcType="VARCHAR"/>
+        <result column="operator" property="operator" jdbcType="VARCHAR"/>
+        <result column="date" property="date" jdbcType="TIMESTAMP"/>
+        <result column="mileage" property="mileage" jdbcType="INTEGER"/>
+        <result column="amount" property="amount" jdbcType="DECIMAL"/>
+        <result column="approvers" property="approvers" jdbcType="VARCHAR"/>
+        <result column="branch_company_id" property="branchCompanyId" jdbcType="INTEGER"/>
+        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
+    </resultMap>
+    <select id="selectVoAll" resultType="com.xinxincaravan.caravan.vehicle.vo.VehicleUpkeepLogVo">
+        select a.*, b.number_plate, c.name as branch_company_name
+        from vehicle_upkeep_log a
+        left join vehicle b on a.vehicle_id = b.id
+        left join branch_company c on a.branch_company_id = c.id
+        <trim prefix="where">
+            <if test="numberPlate != null and numberPlate != ''">
+                b.number_plate = #{numberPlate}
+            </if>
+        </trim>
+    </select>
+    <select id="selectVoById" resultType="com.xinxincaravan.caravan.vehicle.vo.VehicleUpkeepLogVo">
+        select a.*, b.number_plate, c.name as branch_company_name
+        from vehicle_upkeep_log a
+        left join vehicle b on a.vehicle_id = b.id
+        left join branch_company c on a.branch_company_id = c.id
+        where a.id = #{id}
+    </select>
+</mapper>
\ No newline at end of file