承运商接口：解绑司机与车辆

src/main/java/com/esv/freight/customer/common/component/ErrorMessageComponent.java

@@ -235,4 +235,13 @@ public class ErrorMessageComponent {
     private String carrierDriverVehicleBind1020;
     @Value("${error-message.carrier.driver.vehicle-bind.1021}")
     private String carrierDriverVehicleBind1021;
+
+    @Value("${error-message.carrier.driver.vehicle-unbind.1001}")
+    private String carrierDriverVehicleUnbind1001;
+    @Value("${error-message.carrier.driver.vehicle-unbind.1010}")
+    private String carrierDriverVehicleUnbind1010;
+    @Value("${error-message.carrier.driver.vehicle-unbind.1020}")
+    private String carrierDriverVehicleUnbind1020;
+    @Value("${error-message.carrier.driver.vehicle-unbind.1021}")
+    private String carrierDriverVehicleUnbind1021;
 }

src/main/java/com/esv/freight/customer/module/driver/controller/DriverVehicleController.java

@@ -7,6 +7,7 @@ import com.esv.freight.customer.module.driver.form.DriverQueryForm;
 import com.esv.freight.customer.module.driver.form.DriverVehicleForm;
 import com.esv.freight.customer.module.driver.service.DriverVehicleService;
 import com.esv.freight.customer.module.driver.validator.groups.ValidatorBind;
+import com.esv.freight.customer.module.driver.validator.groups.ValidatorUnbind;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -50,7 +51,7 @@ public class DriverVehicleController {
     }
 
     /**
-     * description 司机绑定车辆
+     * description 绑定司机与车辆
      * param [form]
      * return com.esv.freight.customer.common.response.EResponse
      * author Administrator
@@ -62,4 +63,18 @@ public class DriverVehicleController {
         
         return EResponse.ok();
     }
+
+    /**
+     * description 解绑司机与车辆
+     * param [form]
+     * return com.esv.freight.customer.common.response.EResponse
+     * author Administrator
+     * createTime 2020/04/30 9:53
+     **/
+    @PostMapping("/unbind")
+    public EResponse unbind(@RequestBody @Validated(ValidatorUnbind.class) DriverVehicleForm form) throws EException {
+        driverVehicleService.driverUnbindVehicle(form);
+
+        return EResponse.ok();
+    }
 }

src/main/java/com/esv/freight/customer/module/driver/service/DriverVehicleService.java

@@ -26,7 +26,7 @@ public interface DriverVehicleService {
     List<DriverVehicleListVO> getDriverBindVehicleList(Long id);
 
     /**
-     * description 司机绑定车辆
+     * description 绑定司机与车辆
      * param [form]
      * return java.lang.Integer
      * author Administrator
@@ -34,4 +34,13 @@ public interface DriverVehicleService {
      **/
     Integer driverBindVehicle(DriverVehicleForm form);
 
+    /**
+     * description 解绑司机与车辆
+     * param [form]
+     * return java.lang.Integer
+     * author Administrator
+     * createTime 2020/04/30 9:38
+     **/
+    Integer driverUnbindVehicle(DriverVehicleForm form);
+
 }

src/main/java/com/esv/freight/customer/module/driver/service/impl/DriverVehicleServiceImpl.java

@@ -115,4 +115,37 @@ public class DriverVehicleServiceImpl implements DriverVehicleService {
         vehicleDriverEntity.setOperateUser(ReqUtils.getRequestUserAccount());
         return this.vehicleDriverService.getBaseMapper().insert(vehicleDriverEntity);
     }
+
+    @Override
+    public Integer driverUnbindVehicle(DriverVehicleForm form) {
+        // 1:校验
+        // 1.1:校验司机ID是否有效
+        DriverAccountEntity driverAccountEntity = this.driverAccountService.getById(form.getDriverId());
+        if (null == driverAccountEntity) {
+            throw new EException(1001, errorMessageComponent.getCarrierDriverVehicleUnbind1001());
+        }
+        String driverAccount = driverAccountEntity.getAccount();
+        // 1.2:校验车辆ID是否有效
+        VehicleEntity vehicleEntity = this.vehicleService.getById(form.getVehicleId());
+        if (null == vehicleEntity) {
+            throw new EException(1010, errorMessageComponent.getCarrierDriverVehicleUnbind1010());
+        }
+        // 1.3:校验车辆与司机是否绑定
+        VehicleDriverEntity vehicleDriverEntity = this.vehicleDriverService.getBaseMapper().selectOne(new QueryWrapper<VehicleDriverEntity>().lambda()
+                        .eq(VehicleDriverEntity::getVehicleId, form.getVehicleId())
+                        .eq(VehicleDriverEntity::getDriverId, form.getDriverId()));
+        if (null == vehicleDriverEntity) {
+            throw new EException(1020, errorMessageComponent.getCarrierDriverVehicleUnbind1020());
+        }
+        // 1.4:校验司机自主绑定的车辆，平台不可解绑
+        if (VehicleConstants.VEHICLE_SOURCE_TYPE_REGISTER.equals(vehicleEntity.getSourceType())
+                && driverAccount.equals(vehicleEntity.getCreateUser())) {
+            throw new EException(1021, errorMessageComponent.getCarrierDriverVehicleUnbind1021());
+        }
+
+        // 1:解绑司机与车辆
+        return this.vehicleDriverService.getBaseMapper().delete(new QueryWrapper<VehicleDriverEntity>().lambda()
+                        .eq(VehicleDriverEntity::getVehicleId, form.getVehicleId())
+                        .eq(VehicleDriverEntity::getDriverId, form.getDriverId()));
+    }
 }

src/main/resources/application-dev.yml

@@ -184,3 +184,8 @@ error-message:
         1012: 车辆未审核通过
         1020: 司机与车辆所属承运商不一致
         1021: 重复绑定
+      vehicle-unbind:
+        1001: 无效的司机ID
+        1010: 无效的车辆ID
+        1020: 车辆与司机未绑定
+        1021: 司机自主绑定的车辆，平台不可解绑
\ No newline at end of file

src/test/java/com/esv/freight/customer/module/driver/controller/DriverAccountAddTest.java

@@ -74,12 +74,10 @@ public class DriverAccountAddTest extends BaseTestController {
         form.setCertificateVehicle(DriverConstants.ACCOUNT_DRIVING_VEHICLE_TYPE_1); // 道路运输从业资格证-所驾驶车辆(字典表)：1-4.5吨及以下、2-4.5吨以上
         form.setRemark("测试数据");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -131,12 +129,10 @@ public class DriverAccountAddTest extends BaseTestController {
         form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg");
         form.setRemark("测试数据");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -189,12 +185,10 @@ public class DriverAccountAddTest extends BaseTestController {
         form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg");
         form.setRemark("测试数据");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -246,12 +240,10 @@ public class DriverAccountAddTest extends BaseTestController {
         form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg");
         form.setRemark("测试数据");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -303,12 +295,10 @@ public class DriverAccountAddTest extends BaseTestController {
         form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg");
         form.setRemark("测试数据");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -360,12 +350,10 @@ public class DriverAccountAddTest extends BaseTestController {
         form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg");
         form.setRemark("测试数据");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -414,12 +402,10 @@ public class DriverAccountAddTest extends BaseTestController {
         form.setCertificateVehicle(DriverConstants.ACCOUNT_DRIVING_VEHICLE_TYPE_2); // 道路运输从业资格证-所驾驶车辆(字典表)：1-4.5吨及以下、2-4.5吨以上
         form.setRemark("测试数据");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -468,12 +454,10 @@ public class DriverAccountAddTest extends BaseTestController {
         form.setCertificateVehicle(DriverConstants.ACCOUNT_DRIVING_VEHICLE_TYPE_1); // 道路运输从业资格证-所驾驶车辆(字典表)：1-4.5吨及以下、2-4.5吨以上
         form.setRemark("测试数据");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();

src/test/java/com/esv/freight/customer/module/driver/controller/DriverAccountEditTest.java

@@ -74,12 +74,10 @@ public class DriverAccountEditTest extends BaseTestController {
         form.setCertificateVehicle(DriverConstants.ACCOUNT_DRIVING_VEHICLE_TYPE_1); // 道路运输从业资格证-所驾驶车辆(字典表)：1-4.5吨及以下、2-4.5吨以上
         form.setRemark("测试数据");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -130,12 +128,10 @@ public class DriverAccountEditTest extends BaseTestController {
         form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg");
         form.setRemark("测试数据");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -186,12 +182,10 @@ public class DriverAccountEditTest extends BaseTestController {
         form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg");
         form.setRemark("测试数据");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -242,12 +236,10 @@ public class DriverAccountEditTest extends BaseTestController {
         form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg");
         form.setRemark("测试数据");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -298,12 +290,10 @@ public class DriverAccountEditTest extends BaseTestController {
         form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg");
         form.setRemark("测试数据");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -354,12 +344,10 @@ public class DriverAccountEditTest extends BaseTestController {
         form.setCertificateUrl("http://127.0.0.1/certificate_url_18512340002.jpg");
         form.setRemark("测试数据");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -408,12 +396,10 @@ public class DriverAccountEditTest extends BaseTestController {
         form.setCertificateVehicle(DriverConstants.ACCOUNT_DRIVING_VEHICLE_TYPE_2); // 道路运输从业资格证-所驾驶车辆(字典表)：1-4.5吨及以下、2-4.5吨以上
         form.setRemark("测试数据");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();

src/test/java/com/esv/freight/customer/module/driver/controller/DriverVehicleControllerTest.java

@@ -49,12 +49,10 @@ public class DriverVehicleControllerTest extends BaseTestController {
         DriverQueryForm form = new DriverQueryForm();
         form.setId(1L);
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -78,12 +76,10 @@ public class DriverVehicleControllerTest extends BaseTestController {
         DriverQueryForm form = new DriverQueryForm();
         form.setId(99999L);
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -106,12 +102,10 @@ public class DriverVehicleControllerTest extends BaseTestController {
         DriverQueryForm form = new DriverQueryForm();
         form.setId(2L);
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -124,7 +118,7 @@ public class DriverVehicleControllerTest extends BaseTestController {
     }
 
     /**
-     * 司机绑定车辆
+     * 绑定司机与车辆
      **/
     @Test
     @Rollback
@@ -136,12 +130,38 @@ public class DriverVehicleControllerTest extends BaseTestController {
         form.setDriverId(3L);
         form.setVehicleId(4L);
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
+        MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
+                .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
+                .headers(this.getDefaultHttpHeaders())
+                .content(form.toString()))
+                .andDo(MockMvcResultHandlers.print())
+                .andExpect(MockMvcResultMatchers.status().isOk())
+                .andReturn();
+
+        String responseStr = mvcResult.getResponse().getContentAsString();
+        log.info(responseStr);
+
+        JSONObject result = JSONObject.parseObject(responseStr);
+        Assert.assertEquals(ECode.SUCCESS.code(), result.getIntValue("code"));
+    }
+
+    /**
+     * 解绑司机与车辆
+     **/
+    @Test
+    @Rollback
+    public void c1_unbind_success_test() throws Exception {
+        String url = "/carrier/driver/vehicle/unbind";
+
+        // 构造数据
+        DriverVehicleForm form = new DriverVehicleForm();
+        form.setDriverId(3L);
+        form.setVehicleId(4L);
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -152,4 +172,60 @@ public class DriverVehicleControllerTest extends BaseTestController {
         JSONObject result = JSONObject.parseObject(responseStr);
         Assert.assertEquals(ECode.SUCCESS.code(), result.getIntValue("code"));
     }
+
+    /**
+     * 解绑司机与车辆：司机自主绑定的车辆，平台不可解绑
+     **/
+    @Test
+    @Rollback
+    public void c2_unbind_driver_add_vehicle_failure_test() throws Exception {
+        String url = "/carrier/driver/vehicle/unbind";
+
+        // 构造数据
+        DriverVehicleForm form = new DriverVehicleForm();
+        form.setDriverId(3L);
+        form.setVehicleId(4L);
+
+        MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
+                .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
+                .headers(this.getDefaultHttpHeaders())
+                .content(form.toString()))
+                .andDo(MockMvcResultHandlers.print())
+                .andExpect(MockMvcResultMatchers.status().isOk())
+                .andReturn();
+
+        String responseStr = mvcResult.getResponse().getContentAsString();
+        log.info(responseStr);
+
+        JSONObject result = JSONObject.parseObject(responseStr);
+        Assert.assertEquals(1021, result.getIntValue("code"));
+    }
+
+    /**
+     * 解绑司机与车辆：车辆与司机未绑定​
+     **/
+    @Test
+    @Rollback
+    public void c3_unbind_not_bind_failure_test() throws Exception {
+        String url = "/carrier/driver/vehicle/unbind";
+
+        // 构造数据
+        DriverVehicleForm form = new DriverVehicleForm();
+        form.setDriverId(3L);
+        form.setVehicleId(3L);
+
+        MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
+                .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
+                .headers(this.getDefaultHttpHeaders())
+                .content(form.toString()))
+                .andDo(MockMvcResultHandlers.print())
+                .andExpect(MockMvcResultMatchers.status().isOk())
+                .andReturn();
+
+        String responseStr = mvcResult.getResponse().getContentAsString();
+        log.info(responseStr);
+
+        JSONObject result = JSONObject.parseObject(responseStr);
+        Assert.assertEquals(1020, result.getIntValue("code"));
+    }
 }

src/test/java/com/esv/freight/customer/module/goodsowner/controller/AccountAndAddressControllerTest.java

@@ -49,12 +49,11 @@ public class AccountAndAddressControllerTest extends BaseTestController {
         form.setOwnerId(1L);
         form.setDeliveryAddressId(7L);
         form.setReceiveAddressId(5L);
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -81,12 +80,11 @@ public class AccountAndAddressControllerTest extends BaseTestController {
         form.setOwnerId(99999L);
         form.setDeliveryAddressId(7L);
         form.setReceiveAddressId(5L);
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -110,12 +108,11 @@ public class AccountAndAddressControllerTest extends BaseTestController {
         form.setOwnerId(1L);
         form.setDeliveryAddressId(99999L);
         form.setReceiveAddressId(5L);
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -139,12 +136,11 @@ public class AccountAndAddressControllerTest extends BaseTestController {
         form.setOwnerId(1L);
         form.setDeliveryAddressId(7L);
         form.setReceiveAddressId(99999L);
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();

src/test/java/com/esv/freight/customer/module/goodsowner/controller/DeliveryAddressControllerTest.java

@@ -58,12 +58,11 @@ public class DeliveryAddressControllerTest extends BaseTestController {
         form.setDelivererTelephone("(024)24850576");
         form.setLon("123.464052");
         form.setLat("41.800415");
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -97,12 +96,11 @@ public class DeliveryAddressControllerTest extends BaseTestController {
         form.setLon("123.464052");
         form.setLat("41.800415");
         form.setAddressCopy("1");
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -136,12 +134,11 @@ public class DeliveryAddressControllerTest extends BaseTestController {
         form.setDelivererTelephone("(024)24850576");
         form.setLon("123.464052");
         form.setLat("41.800415");
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -174,12 +171,11 @@ public class DeliveryAddressControllerTest extends BaseTestController {
         form.setDelivererTelephone("(024)24850576");
         form.setLon("123.464052");
         form.setLat("41.800415");
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -213,12 +209,11 @@ public class DeliveryAddressControllerTest extends BaseTestController {
         form.setDelivererTelephone("(024)24850576");
         form.setLon("123.464053");
         form.setLat("41.800416");
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -252,12 +247,11 @@ public class DeliveryAddressControllerTest extends BaseTestController {
         form.setDelivererTelephone("(024)24850576");
         form.setLon("123.464053");
         form.setLat("41.800416");
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -291,12 +285,11 @@ public class DeliveryAddressControllerTest extends BaseTestController {
         form.setDelivererTelephone("(024)24850576");
         form.setLon("123.464053");
         form.setLat("41.800416");
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -319,12 +312,11 @@ public class DeliveryAddressControllerTest extends BaseTestController {
         // 构造数据
         DeleteAddressForm form = new DeleteAddressForm();
         form.setId("1,2,3,4,5");
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -348,12 +340,11 @@ public class DeliveryAddressControllerTest extends BaseTestController {
         // 构造数据
         DeliveryAddressForm form = new DeliveryAddressForm();
         form.setId(5L);
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -377,12 +368,11 @@ public class DeliveryAddressControllerTest extends BaseTestController {
         // 构造数据
         DeliveryAddressForm form = new DeliveryAddressForm();
         form.setId(9999L);
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -405,12 +395,11 @@ public class DeliveryAddressControllerTest extends BaseTestController {
         // 构造数据
         DeliveryAddressForm form = new DeliveryAddressForm();
         form.setOwnerId(1L);
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -434,12 +423,11 @@ public class DeliveryAddressControllerTest extends BaseTestController {
         DeliveryAddressForm form = new DeliveryAddressForm();
         form.setPageNum(1);
         form.setPageSize(10);
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();

src/test/java/com/esv/freight/customer/module/goodsowner/controller/ReceiveAddressControllerTest.java

@@ -59,12 +59,11 @@ public class ReceiveAddressControllerTest extends BaseTestController {
         form.setReceiverTelephone("(024)24850576");
         form.setLon("123.464052");
         form.setLat("41.800415");
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -98,12 +97,11 @@ public class ReceiveAddressControllerTest extends BaseTestController {
         form.setReceiverTelephone("(024)24850576");
         form.setLon("123.464052");
         form.setLat("41.800415");
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -136,12 +134,11 @@ public class ReceiveAddressControllerTest extends BaseTestController {
         form.setReceiverTelephone("(024)24850576");
         form.setLon("123.464052");
         form.setLat("41.800415");
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -174,12 +171,11 @@ public class ReceiveAddressControllerTest extends BaseTestController {
         form.setReceiverTelephone("(024)24850576");
         form.setLon("123.464053");
         form.setLat("41.800416");
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -213,12 +209,11 @@ public class ReceiveAddressControllerTest extends BaseTestController {
         form.setReceiverTelephone("(024)24850576");
         form.setLon("123.464053");
         form.setLat("41.800416");
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -252,12 +247,11 @@ public class ReceiveAddressControllerTest extends BaseTestController {
         form.setReceiverTelephone("(024)24850576");
         form.setLon("123.464053");
         form.setLat("41.800416");
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -280,12 +274,11 @@ public class ReceiveAddressControllerTest extends BaseTestController {
         // 构造数据
         DeleteAddressForm form = new DeleteAddressForm();
         form.setId("1,2,3,4,5");
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -309,12 +302,11 @@ public class ReceiveAddressControllerTest extends BaseTestController {
         // 构造数据
         ReceiveAddressForm form = new ReceiveAddressForm();
         form.setId(3L);
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -338,12 +330,11 @@ public class ReceiveAddressControllerTest extends BaseTestController {
         // 构造数据
         ReceiveAddressForm form = new ReceiveAddressForm();
         form.setId(9999L);
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -366,12 +357,11 @@ public class ReceiveAddressControllerTest extends BaseTestController {
         // 构造数据
         ReceiveAddressForm form = new ReceiveAddressForm();
         form.setOwnerId(1L);
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -395,12 +385,11 @@ public class ReceiveAddressControllerTest extends BaseTestController {
         ReceiveAddressForm form = new ReceiveAddressForm();
         form.setPageNum(1);
         form.setPageSize(10);
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
 
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();

src/test/java/com/esv/freight/customer/module/vehicle/controller/VehicleControllerAddTest.java

@@ -83,12 +83,10 @@ public class VehicleControllerAddTest extends BaseTestController {
         form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_001.jpg");
         form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_001.jpg");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -146,12 +144,10 @@ public class VehicleControllerAddTest extends BaseTestController {
         form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_011.jpg");
         form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_011.jpg");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -210,12 +206,10 @@ public class VehicleControllerAddTest extends BaseTestController {
         form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_011.jpg");
         form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_011.jpg");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -273,12 +267,10 @@ public class VehicleControllerAddTest extends BaseTestController {
         form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_011.jpg");
         form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_011.jpg");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -336,12 +328,10 @@ public class VehicleControllerAddTest extends BaseTestController {
         form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_011.jpg");
         form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_011.jpg");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -399,12 +389,10 @@ public class VehicleControllerAddTest extends BaseTestController {
         form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_011.jpg");
         form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_011.jpg");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -462,12 +450,10 @@ public class VehicleControllerAddTest extends BaseTestController {
         form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_011.jpg");
         form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_011.jpg");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -525,12 +511,10 @@ public class VehicleControllerAddTest extends BaseTestController {
         form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_011.jpg");
         form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_011.jpg");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();

src/test/java/com/esv/freight/customer/module/vehicle/controller/VehicleControllerEditTest.java

@@ -84,12 +84,10 @@ public class VehicleControllerEditTest extends BaseTestController {
         form.setRoadCertificateFrontUrl("http://127.0.0.1/Road_Certificate_Front_Url_001.jpg");
         form.setAttachedStatementUrl("http://127.0.0.1/Attached_Statement_Url_001.jpg");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -127,12 +125,10 @@ public class VehicleControllerEditTest extends BaseTestController {
         form.setLoadCapacity(new BigDecimal("4.0"));
         form.setTotalMass(new BigDecimal("5.1"));
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -156,12 +152,10 @@ public class VehicleControllerEditTest extends BaseTestController {
         form.setId(1L);
         form.setLicenseNumber("辽A12302");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -185,12 +179,10 @@ public class VehicleControllerEditTest extends BaseTestController {
         form.setId(1L);
         form.setVehicleLicenseNumber("210101123457");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -214,12 +206,10 @@ public class VehicleControllerEditTest extends BaseTestController {
         form.setId(1L);
         form.setRoadCertificateNumber("510184010714");
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();
@@ -243,12 +233,10 @@ public class VehicleControllerEditTest extends BaseTestController {
         form.setId(1L);
         form.setLoadCapacity(new BigDecimal("5.0"));
 
-        JSONObject reqJson = JSONObject.parseObject(form.toString());
-
         MvcResult mvcResult = this.getMockMvc().perform(MockMvcRequestBuilders.post(url)
                 .contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)
                 .headers(this.getDefaultHttpHeaders())
-                .content(reqJson.toJSONString()))
+                .content(form.toString()))
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andReturn();