修改车辆信息

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/constant/DictionaryKey.java

@@ -75,6 +75,9 @@ public class DictionaryKey {
     public static final String ACT_TOUR = "ACT_TOUR";
     public static final String ACT_MEMBER = "ACT_MEMBER";
 
+    public static final String VEHICLE_MANUFACTURER = "VEHICLE_MANUFACTURER";
+
+    public static final String VEHICLE = "VEHICLE";
     /**
      * 支付价格减低
      */

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

@@ -3,6 +3,7 @@ package com.xxfc.platform.vehicle.biz;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
@@ -17,6 +18,9 @@ import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.xxfc.platform.universal.constant.DictionaryKey;
+import com.xxfc.platform.universal.entity.Dictionary;
+import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.common.CustomIllegalParamException;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.*;
@@ -93,7 +97,8 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
     @Autowired
     private VehicleJobHandler vehicleJobHandler;
 
-
+    @Autowired
+    private ThirdFeign thirdFeign;
     @Override
     public UserFeign getUserFeign() {
         return userFeign;
@@ -1545,4 +1550,18 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         return mapper.getAllVehicleInfo();
     }
 
+
+    /**
+     * 获取所有车辆生产商
+     * @return
+     */
+    public ObjectRestResponse getAllManufacturer() {
+        Dictionary dictionary = thirdFeign.findDictionaryByTypeAndCode(DictionaryKey.VEHICLE, DictionaryKey.VEHICLE_MANUFACTURER);
+        if (dictionary != null && StringUtils.isNotBlank(dictionary.getDetail())) {
+            return ObjectRestResponse.succ(JSONArray.parseArray(dictionary.getDetail()));
+        } else {
+            return ObjectRestResponse.succ(new JSONArray());
+        }
+    }
+
 }

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

@@ -129,6 +129,11 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
       return RestResponse.suc(vehicles);
     }
 
+    @GetMapping(value = "getAllManufacturer")
+    public ObjectRestResponse getAllManufacturer() {
+        return baseBiz.getAllManufacturer();
+    }
+
     @PostMapping(value = "/test")
     public ObjectRestResponse test(@RequestBody  VehicleBookRecord vehicleBookRecord) {
         return vehicleBiz.addVehicleBookRecord(vehicleBookRecord);

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

@@ -74,6 +74,7 @@
         v.vehicle_status,
         v.vehicle_body_status,
         v.vehicle_inner_status,
+        v.vehicle_register_date,
         v.mileage_last_update as mileage,
         c.val as useTypeName,
         ci.name as companyName,
@@ -235,6 +236,7 @@
         v.vehicle_status,
         v.vehicle_body_status,
         v.vehicle_inner_status,
+        v.vehicle_register_date,
         v.mileage_last_update as mileage,
         c.val as useTypeName,
         ci.name as companyName,
@@ -374,6 +376,7 @@
         select
         v.`code`,
         v.number_plate,
+        v.vehicle_register_date,
         bc.name as parkBranchCompanyName,
         c.val as useType,
         ci.name as companyName,
@@ -495,6 +498,7 @@
         select
         v.`code`,
         v.number_plate,
+        v.vehicle_register_date,
         bc.name as parkBranchCompanyName,
         c.val as useType,
         vm.name as vehicleType