修改违章,把查询到的车型代码和类型保存到数据库3

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/Vehicle.java

@@ -127,9 +127,11 @@ public class  Vehicle {
      * 最后更新里程数
      */
     private Integer mileageLastUpdate;
+
     /**
-     * 停车分公司id
+     * 停车分公司（id）
      */
+    @Column(name = "park_branch_company_id")
     private Integer parkBranchCompanyId;
     /**
      * 预计目的地分公司id

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/AddOrUpdateVehicleVo.java

@@ -41,6 +41,13 @@ public class AddOrUpdateVehicleVo {
     @Column(name = "subordinate_branch")
     private Integer subordinateBranch;
 
+
+    /**
+     * 停车分公司（id）
+     */
+    @Column(name = "park_branch_company_id")
+    private Integer parkBranchCompanyId;
+
     /**
      * 用途类型：租赁房车（1）、展车等，对应关系见车辆常量表
      */

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

@@ -10,6 +10,8 @@ import org.springframework.stereotype.Service;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.mapper.VehicleModelMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -45,6 +47,9 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
             PageDataVO<VehicleModelVo> mPageDataVO = PageDataVO.pageInfo(vmqc.getPage(),
                     vmqc.getLimit(), () -> mapper.findVehicleModelPage(vmqc));
 
+//            List<VehicleModelVo> vehicleModelVos = mPageDataVO.getData();
+//            vehicleModelVos.parallelStream().forEach(vehicleModelVo -> vehicleModelVo.setPicture(vehicleModelVo.getPicture().split(",")[0]));
+
             return ObjectRestResponse.succ(mPageDataVO);
         } catch (Exception e) {
             e.printStackTrace();
@@ -53,13 +58,14 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
 
     }
 
-
+    @Transactional
     public Integer insertAndGetId(VehicleModel vm) {
         try {
             mapper.insertSelective(vm);
             return vm.getId();
         } catch (Exception e) {
             e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
         }
         return null;
 

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

@@ -104,6 +104,9 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
 //
 //            }
 //        }
+        if (vmqc.getIsDel()==null) {
+            vmqc.setIsDel(0);
+        }
 
 
         if (vmqc == null || vmqc.getPage() == null || vmqc.getLimit() == null || vmqc.getPage() < 0 || vmqc.getLimit() <= 0) {