修改车辆信息管理

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyBiz.java

@@ -212,6 +212,7 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
         example.createCriteria().andIn("zoneId", zoneIds);
         List<BranchCompany> zoneCompanys = selectByExample(example);
         return zoneCompanys;
+
     }
     public RestResponse<String> importExcel(MultipartFile multipartfile, HttpServletRequest request){
         try {

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleDepartureService.java

 package com.xxfc.platform.vehicle.biz;
 
+import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
@@ -97,7 +98,7 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
 
         List<VehicleDepartureLog> vehicleDepartureLogs = mapper.selectByExample(exm);
         if (vehicleDepartureLogs.size() == 1) {
-            VehicleDepartureLog vehicleDepartureLog = vehicleDepartureLogs.get(1);
+            VehicleDepartureLog vehicleDepartureLog = vehicleDepartureLogs.get(0);
             if (vehicleDepartureLog!=null) {
                 return ObjectRestResponse.succ(vehicleDepartureLog);
             }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleUpkeepService.java

@@ -2,14 +2,20 @@ 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.xxfc.platform.vehicle.entity.VehicleUpkeepItem;
+import com.xxfc.platform.vehicle.entity.VehicleUpkeepLog;
 import com.xxfc.platform.vehicle.mapper.VehicleUpkeepItemMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleUpkeepLogMapper;
 import com.xxfc.platform.vehicle.pojo.VehicleUpkeepLogItemVo;
 import com.xxfc.platform.vehicle.pojo.VehicleUpkeepLogVo;
+import org.apache.commons.beanutils.BeanUtilsBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import redis.clients.jedis.Transaction;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
 @Service
@@ -21,6 +27,7 @@ public class VehicleUpkeepService {
     @Autowired
     VehicleUpkeepLogMapper vehicleUpkeepLogMapper;
 
+
     public List<VehicleUpkeepItem> getAllItem() {
         return vehicleUpkeepItemMapper.selectAll();
     }
@@ -39,7 +46,7 @@ public class VehicleUpkeepService {
     public void updateItem(VehicleUpkeepItem item) {
         vehicleUpkeepItemMapper.updateByPrimaryKey(item);
     }
-
+    @Transactional
     public void deleteItem(Integer id) {
         vehicleUpkeepItemMapper.deleteByPrimaryKey(id);
     }
@@ -56,8 +63,18 @@ public class VehicleUpkeepService {
         return vehicleUpkeepLogVo;
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public void deleteLog(Integer id) {
         vehicleUpkeepLogMapper.deleteByPrimaryKey(id);
         vehicleUpkeepLogMapper.deleteItemsByLogId(id);
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void addLog(VehicleUpkeepLogVo vulvo) throws InvocationTargetException, IllegalAccessException {
+        VehicleUpkeepLog vul = new VehicleUpkeepLog();
+        BeanUtilsBean.getInstance().copyProperties(vul,vulvo);
+        vehicleUpkeepLogMapper.insertSelective(vul);
+        vehicleUpkeepLogMapper.insertUpkeepLogItmes(vulvo);
+
+    }
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleUpkeepLogMapper.java

@@ -20,4 +20,6 @@ public interface VehicleUpkeepLogMapper extends Mapper<VehicleUpkeepLog> {
     int deleteItemsByLogId(Integer id);
 
     VehicleUpkeepLog selectLastByVehicleId(String vehicleId);
+
+    void insertUpkeepLogItmes(VehicleUpkeepLogVo upkeepItems);
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -401,4 +401,5 @@ public class VehicleController extends BaseController<VehicleBiz> {
    }
 
 
+
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleDepartureController.java

@@ -48,6 +48,13 @@ public class VehicleDepartureController {
         return RestResponse.suc(vehicleDepartureService.page(numberPlate, page, limit));
     }
 
+    /**
+     * 根据车辆id查询并分页
+     * @param vehicleId
+     * @param page
+     * @param limit
+     * @return
+     */
     @GetMapping("findByVehicle")
     public RestResponse findByVehicle(String vehicleId, Integer page, Integer limit) {
         if (vehicleId == null) {
@@ -71,7 +78,7 @@ public class VehicleDepartureController {
     }
 
     /**
-     * 保存(出车)
+     * 保存
      * @param vehicleDepartureLog
      * @return
      */
@@ -80,6 +87,7 @@ public class VehicleDepartureController {
         return vehicleDepartureService.save(vehicleDepartureLog);
     }
 
+
     /**
      * 查询一条
      * @param vid 车辆id
@@ -91,6 +99,7 @@ public class VehicleDepartureController {
        return vehicleDepartureService.findOne(vid);
     }
 
+
     /**
      *
      * 收车
@@ -104,4 +113,5 @@ public class VehicleDepartureController {
     }
 
 
+
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleUpkeepController.java

@@ -4,9 +4,13 @@ import com.xxfc.platform.vehicle.biz.VehicleUpkeepService;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.VehicleUpkeepItem;
+import com.xxfc.platform.vehicle.pojo.VehicleUpkeepLogItemVo;
+import com.xxfc.platform.vehicle.pojo.VehicleUpkeepLogVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.lang.reflect.InvocationTargetException;
+
 @RestController
 @RequestMapping("upkeep")
 public class VehicleUpkeepController {
@@ -15,11 +19,21 @@ public class VehicleUpkeepController {
     @Autowired
     private VehicleUpkeepService vehicleUpkeepService;
 
+    /**
+     * 查询所有保养项目
+     * @return
+     */
     @GetMapping("item/all")
     public RestResponse allItem() {
         return RestResponse.suc(vehicleUpkeepService.getAllItem());
     }
 
+    /**
+     * 分页查询所用保养项目
+     * @param page
+     * @param limit
+     * @return
+     */
     @GetMapping("item/page")
     public RestResponse pageItem(Integer page, Integer limit) {
         if (page == null || limit == null) {
@@ -29,6 +43,11 @@ public class VehicleUpkeepController {
         return RestResponse.suc(vehicleUpkeepService.pageItem(page, limit));
     }
 
+    /**
+     * 保存保养项目
+     * @param name
+     * @return
+     */
     @PostMapping("item")
     public RestResponse addItem(String name) {
         if (name == null || name.trim().equals("")) {
@@ -39,6 +58,11 @@ public class VehicleUpkeepController {
         return RestResponse.suc();
     }
 
+    /**
+     * 修改项目
+     * @param item
+     * @return
+     */
     @PutMapping("item")
     public RestResponse editItem(VehicleUpkeepItem item) {
         if (item == null || item.getId() == null || item.getName() == null || item.getName().trim().equals("")) {
@@ -49,6 +73,11 @@ public class VehicleUpkeepController {
         return RestResponse.suc();
     }
 
+    /**
+     * 删除保养项目
+     * @param id
+     * @return
+     */
     @DeleteMapping("item/{id}")
     public RestResponse delItem(@PathVariable("id") Integer id) {
         if (id == null) {
@@ -59,6 +88,13 @@ public class VehicleUpkeepController {
         return RestResponse.suc();
     }
 
+    /**
+     * 分页查询保养记录
+     * @param numberPlate
+     * @param page
+     * @param limit
+     * @return
+     */
     @GetMapping("log/page")
     public RestResponse pageLog(String numberPlate, Integer page, Integer limit) {
         if (page == null || limit == null) {
@@ -68,6 +104,11 @@ public class VehicleUpkeepController {
         return RestResponse.suc(vehicleUpkeepService.pageLog(numberPlate, page, limit));
     }
 
+    /**
+     * 根据id查询一条保养记录(包含车牌、分公司名和保养项目)
+     * @param id
+     * @return
+     */
     @GetMapping("log/{id}")
     public RestResponse getLog(@PathVariable("id") Integer id) {
         if (id == null) {
@@ -77,6 +118,11 @@ public class VehicleUpkeepController {
         return RestResponse.suc(vehicleUpkeepService.getLogVoById(id));
     }
 
+    /**
+     * 根据id删除一条保养记录
+     * @param id
+     * @return
+     */
     @DeleteMapping("log/{id}")
     public RestResponse delLog(@PathVariable("id") Integer id) {
         if (id == null) {
@@ -87,4 +133,24 @@ public class VehicleUpkeepController {
         return RestResponse.suc();
     }
 
+    /**
+     * 添加一条保养记录
+     * @param vulvo
+     * @return
+     * @throws InvocationTargetException
+     * @throws IllegalAccessException
+     */
+    @PostMapping("log/addLog")
+    public RestResponse addLog(VehicleUpkeepLogVo vulvo) throws InvocationTargetException, IllegalAccessException {
+
+        if (vulvo==null) {
+
+            return  RestResponse.codeAndMessage(ResCode.INVALID_REST_REQ_PARAM.getCode(),
+                    ResCode.INVALID_REST_REQ_PARAM.getDesc());
+        }
+        vehicleUpkeepService.addLog(vulvo);
+        return RestResponse.suc();
+
+    }
+
 }

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleUpkeepLogMapper.xml

@@ -60,4 +60,14 @@
         order by create_time desc
         limit 1
     </select>
+
+    <insert id="insertUpkeepLogItmes" parameterType="com.xxfc.platform.vehicle.pojo.VehicleUpkeepLogVo">
+        insert into vehicle_upkeep_log_item(log_id, item_id)
+        values
+        <trim suffixOverrides=",">
+            <foreach collection="upkeepItems" item="item">
+                (#{id}, #{item.itemId}),
+            </foreach>
+        </trim>
+    </insert>
 </mapper>
\ No newline at end of file