基础信息修改

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/api/obu/InvwQryObuBatchController.java

@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.io.IOException;
 
 @Api(tags = {"003-OBU发行批次"})
 @RestController

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/dto/transfer/InvwTransferApplyEditRequestDTO.java

@@ -18,6 +18,7 @@ import javax.validation.Valid;
 public class InvwTransferApplyEditRequestDTO extends AbstractStaffBizRequestDTO {
 
     @ApiModelProperty(value = "调拨信息")
+    @Valid
     private InvwTransferApplyCommModel transferApply;
 
     @ApiModelProperty(value = "调拨明细")

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/dto/transfer/InvwTransferApplyImportRequestDTO.java

@@ -1,6 +1,5 @@
 package cn.com.taiji.invw.dto.transfer;
 
-import cn.com.taiji.core.entity.dict.invw.InventoryType;
 import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,26 +7,15 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
 @ApiModel(description = "调拨申请号段导入")
 @Getter
 @Setter
 @Accessors(chain = true)
 public class InvwTransferApplyImportRequestDTO extends AbstractStaffBizRequestDTO {
-    @ApiModelProperty(value = "发货仓库")
-    @NotBlank(message = "发货仓库不能为空")
-    private String sendStoreCode;
 
-    @ApiModelProperty(value = "设备类型")
-    @NotNull(message = "设备类型不能为空")
-    @Enumerated(EnumType.STRING)
-    private InventoryType inventoryType;//设备类型
-
-    @ApiModelProperty(value = "调拨明细文件URL")
+    @ApiModelProperty(value = "调拨明细文件URL", required = true)
     @NotBlank(message = "调拨明细文件URL不能为空")
     private String fileUrl;
 }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/api/baseInfo/BaseInfoController.java → zhywpt-app-managew/src/main/java/cn/com/taiji/managew/api/basic/BasicInfoController.java

@@ -1,11 +1,11 @@
-package cn.com.taiji.managew.api.baseInfo;
+package cn.com.taiji.managew.api.basic;
 
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.common.web.ApiResponse;
 import cn.com.taiji.managew.api.MyValidController;
-import cn.com.taiji.managew.dto.baseInfo.*;
-import cn.com.taiji.managew.manager.baseInfo.BaseInfoManager;
+import cn.com.taiji.managew.dto.basic.*;
+import cn.com.taiji.managew.manager.basic.BasicInfoManager;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,44 +19,44 @@ import javax.validation.Valid;
 @Api(tags = {"基础信息"})
 @RestController
 @RequestMapping("/api/baseInfo")
-public class BaseInfoController extends MyValidController {
+public class BasicInfoController extends MyValidController {
 
     @Autowired
-    private BaseInfoManager manager;
+    private BasicInfoManager manager;
 
     @ApiOperation(value = "001-用户信息查询")
     @PostMapping(value = "/queryCustomer")
-    public ApiResponse<Pagination> queryCustomer(@Valid @RequestBody BaseInfoCustomerPageRequestDTO req) throws ManagerException {
+    public ApiResponse<Pagination> queryCustomer(@Valid @RequestBody BasicInfoCustomerPageRequestDTO req) throws ManagerException {
         return ApiResponse.of(manager.queryCustomer(req));
     }
 
     @ApiOperation(value = "002-车辆信息查询")
     @PostMapping("/queryVehicle")
-    public ApiResponse<Pagination> queryVehicle(@Valid @RequestBody BaseInfoVehiclePageRequestDTO req) throws ManagerException {
+    public ApiResponse<Pagination> queryVehicle(@Valid @RequestBody BasicInfoVehiclePageRequestDTO req) throws ManagerException {
         return ApiResponse.of(manager.queryVehicle(req));
     }
 
     @ApiOperation("003-卡信息查询")
     @PostMapping("/queryCard")
-    public ApiResponse<Pagination> queryCard(@RequestBody BaseInfoCardPageRequestDTO req) throws ManagerException {
+    public ApiResponse<Pagination> queryCard(@RequestBody BasicInfoCardPageRequestDTO req) throws ManagerException {
         return ApiResponse.of(manager.queryCard(req));
     }
 
     @ApiOperation("004-签信息查询")
     @PostMapping("/queryObu")
-    public ApiResponse<Pagination> queryObu(@Valid @RequestBody BaseInfoObuPageRequestDTO req) throws ManagerException {
+    public ApiResponse<Pagination> queryObu(@Valid @RequestBody BasicInfoObuPageRequestDTO req) throws ManagerException {
         return ApiResponse.of(manager.queryObu(req));
     }
 
     @ApiOperation("005-用户详情")
     @PostMapping("/queryCustomerDetail")
-    public ApiResponse<BaseInfoCustomerResponseDTO> queryUserDetail(@Valid @RequestBody BaseInfoCustomerPageRequestDTO req) throws ManagerException {
+    public ApiResponse<BasicInfoCustomerResponseDTO> queryUserDetail(@Valid @RequestBody BasicInfoCustomerPageRequestDTO req) throws ManagerException {
         return ApiResponse.of(manager.queryCustomerDetail(req));
     }
 
     @ApiOperation("006-车辆详情")
     @PostMapping("/queryVehicleDetail")
-    public ApiResponse<BaseInfoVehicleResponseDTO> queryVehicleDetail(@Valid @RequestBody BaseInfoVehiclePageRequestDTO req) throws ManagerException {
+    public ApiResponse<BasicInfoVehicleResponseDTO> queryVehicleDetail(@Valid @RequestBody BasicInfoVehiclePageRequestDTO req) throws ManagerException {
         return ApiResponse.of(manager.queryVehicleDetail(req));
     }
 }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/baseInfo/BaseInfoVehicleResponseDTO.java

@@ -1,12 +0,0 @@
-package cn.com.taiji.managew.dto.baseInfo;
-
-import cn.com.taiji.managew.model.baseInfo.BaseInfoVehicleModel;
-import io.swagger.annotations.ApiModel;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-@ApiModel(description = "车辆详情响应")
-public class BaseInfoVehicleResponseDTO extends BaseInfoVehicleModel {
-}

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/baseInfo/BaseInfoCardPageRequestDTO.java → zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/basic/BasicInfoCardPageRequestDTO.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.managew.dto.baseInfo;
+package cn.com.taiji.managew.dto.basic;
 
 import cn.com.taiji.core.dto.AbstractStaffBizPageRequestDTO;
 import cn.com.taiji.core.entity.dict.basic.CardStatus;
@@ -6,13 +6,17 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+
 @Data
 @ApiModel(value = "基础信息卡分页查询参数")
-public class BaseInfoCardPageRequestDTO extends AbstractStaffBizPageRequestDTO {
+public class BasicInfoCardPageRequestDTO extends AbstractStaffBizPageRequestDTO {
 
     @ApiModelProperty(value = "卡编号")
     private String cardId;
     @ApiModelProperty(value = "卡状态")
+    @Enumerated(EnumType.STRING)
     private CardStatus cardStatus;
     @ApiModelProperty(value = "用户编号")
     private String customerId;

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/baseInfo/BaseInfoCustomerPageRequestDTO.java → zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/basic/BasicInfoCustomerPageRequestDTO.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.managew.dto.baseInfo;
+package cn.com.taiji.managew.dto.basic;
 
 import cn.com.taiji.core.dto.AbstractStaffBizPageRequestDTO;
 import cn.com.taiji.core.entity.dict.basic.IdType;
@@ -6,32 +6,26 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+
 @Data
 @ApiModel(value = "基础信息用户分页查询参数")
-public class BaseInfoCustomerPageRequestDTO extends AbstractStaffBizPageRequestDTO {
-    /**
-     * 用户编号
-     */
+public class BasicInfoCustomerPageRequestDTO extends AbstractStaffBizPageRequestDTO {
+    //用户编号
     @ApiModelProperty(value = "用户编号")
     private String customerId;
-    /**
-     * 用户姓名
-     */
+    //用户姓名
     @ApiModelProperty(value = "用户姓名")
     private String customerName;
-    /**
-     * 用户证件类型
-     */
+    //用户证件类型
     @ApiModelProperty(value = "用户证件类型")
+    @Enumerated(EnumType.STRING)
     private IdType customerIdType;
-    /**
-     * 用户证件号码
-     */
+    //用户证件号码
     @ApiModelProperty(value = "用户证件号码")
     private String customerIdNum;
-    /**
-     * 用户手机号
-     */
+    //用户手机号
     @ApiModelProperty(value = "用户手机号")
     private String customerTel;
 }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/baseInfo/BaseInfoCustomerResponseDTO.java → zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/basic/BasicInfoCustomerResponseDTO.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.managew.dto.baseInfo;
+package cn.com.taiji.managew.dto.basic;
 
 import cn.com.taiji.core.entity.dict.basic.IdType;
 import cn.com.taiji.core.entity.dict.basic.UserType;
@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
 @Setter
 @Getter
 @ApiModel(description = "用户信息详情响应")
-public class BaseInfoCustomerResponseDTO {
+public class BasicInfoCustomerResponseDTO {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime insertTime;//创建时间
     @ApiModelProperty(value = "修改时间")

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/baseInfo/BaseInfoObuPageRequestDTO.java → zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/basic/BasicInfoObuPageRequestDTO.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.managew.dto.baseInfo;
+package cn.com.taiji.managew.dto.basic;
 
 import cn.com.taiji.core.dto.AbstractStaffBizPageRequestDTO;
 import cn.com.taiji.core.entity.dict.basic.ObuStatus;
@@ -6,9 +6,12 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+
 @Data
 @ApiModel(value = "基础信息签分页查询参数")
-public class BaseInfoObuPageRequestDTO extends AbstractStaffBizPageRequestDTO {
+public class BasicInfoObuPageRequestDTO extends AbstractStaffBizPageRequestDTO {
 
     @ApiModelProperty(value = "签编号")
     private String obuId;
@@ -18,6 +21,7 @@ public class BaseInfoObuPageRequestDTO extends AbstractStaffBizPageRequestDTO {
      * 7-已过户，8-维修中，9-发行申请，10-车型不符，11-已发行，99-已删除
      */
     @ApiModelProperty(value = "签状态")
+    @Enumerated(EnumType.STRING)
     private ObuStatus obuStatus;
     @ApiModelProperty(value = "用户编号")
     private String customerId;

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/baseInfo/BaseInfoVehiclePageRequestDTO.java → zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/basic/BasicInfoVehiclePageRequestDTO.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.managew.dto.baseInfo;
+package cn.com.taiji.managew.dto.basic;
 
 import cn.com.taiji.core.dto.AbstractStaffBizPageRequestDTO;
 import cn.com.taiji.core.entity.dict.basic.IdType;
@@ -6,11 +6,15 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+
 @Data
 @ApiModel(value = "基础信息车辆分页查询参数")
-public class BaseInfoVehiclePageRequestDTO extends AbstractStaffBizPageRequestDTO {
+public class BasicInfoVehiclePageRequestDTO extends AbstractStaffBizPageRequestDTO {
 
     @ApiModelProperty(value = "用户证件类型")
+    @Enumerated(EnumType.STRING)
     private IdType customerIdType;
     @ApiModelProperty(value = "用户证件号")
     private String customerIdNum;

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/basic/BasicInfoVehicleResponseDTO.java

@@ -0,0 +1,12 @@
+package cn.com.taiji.managew.dto.basic;
+
+import cn.com.taiji.managew.model.basic.BasicInfoVehicleModel;
+import io.swagger.annotations.ApiModel;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@ApiModel(description = "车辆详情响应")
+public class BasicInfoVehicleResponseDTO extends BasicInfoVehicleModel {
+}

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/baseInfo/BaseInfoManager.java

@@ -1,19 +0,0 @@
-package cn.com.taiji.managew.manager.baseInfo;
-
-import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.common.model.dao.Pagination;
-import cn.com.taiji.managew.dto.baseInfo.*;
-
-public interface BaseInfoManager {
-    Pagination queryCustomer(BaseInfoCustomerPageRequestDTO req);
-
-    Pagination queryVehicle(BaseInfoVehiclePageRequestDTO req);
-
-    Pagination queryCard(BaseInfoCardPageRequestDTO req) throws ManagerException;
-
-    Pagination queryObu(BaseInfoObuPageRequestDTO req) throws ManagerException;
-
-    BaseInfoCustomerResponseDTO queryCustomerDetail(BaseInfoCustomerPageRequestDTO req) throws ManagerException;
-
-    BaseInfoVehicleResponseDTO queryVehicleDetail(BaseInfoVehiclePageRequestDTO req) throws ManagerException;
-}

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/basic/BasicInfoManager.java

@@ -0,0 +1,19 @@
+package cn.com.taiji.managew.manager.basic;
+
+import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.managew.dto.basic.*;
+
+public interface BasicInfoManager {
+    Pagination queryCustomer(BasicInfoCustomerPageRequestDTO req);
+
+    Pagination queryVehicle(BasicInfoVehiclePageRequestDTO req);
+
+    Pagination queryCard(BasicInfoCardPageRequestDTO req) throws ManagerException;
+
+    Pagination queryObu(BasicInfoObuPageRequestDTO req) throws ManagerException;
+
+    BasicInfoCustomerResponseDTO queryCustomerDetail(BasicInfoCustomerPageRequestDTO req) throws ManagerException;
+
+    BasicInfoVehicleResponseDTO queryVehicleDetail(BasicInfoVehiclePageRequestDTO req) throws ManagerException;
+}

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/baseInfo/BaseInfoManagerImpl.java → zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/basic/BasicInfoManagerImpl.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.managew.manager.baseInfo;
+package cn.com.taiji.managew.manager.basic;
 
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
@@ -15,11 +15,11 @@ import cn.com.taiji.core.repo.request.basic.QtkCardInfoPageRequest;
 import cn.com.taiji.core.repo.request.basic.QtkCustomerInfoPageRequest;
 import cn.com.taiji.core.repo.request.basic.QtkObuInfoPageRequest;
 import cn.com.taiji.core.repo.request.basic.QtkVehicleInfoPageRequest;
-import cn.com.taiji.managew.dto.baseInfo.*;
+import cn.com.taiji.managew.dto.basic.*;
 import cn.com.taiji.managew.manager.AbstractCommManager;
-import cn.com.taiji.managew.model.baseInfo.BaseInfoCardModel;
-import cn.com.taiji.managew.model.baseInfo.BaseInfoObuModel;
-import cn.com.taiji.managew.model.baseInfo.BaseInfoVehicleModel;
+import cn.com.taiji.managew.model.basic.BasicInfoCardModel;
+import cn.com.taiji.managew.model.basic.BasicInfoObuModel;
+import cn.com.taiji.managew.model.basic.BasicInfoVehicleModel;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,7 +28,7 @@ import org.springframework.util.StringUtils;
 import java.util.List;
 
 @Service
-public class BaseInfoManagerImpl extends AbstractCommManager implements BaseInfoManager {
+public class BasicInfoManagerImpl extends AbstractCommManager implements BasicInfoManager {
 
     @Autowired
     private QtkCustomerInfoRepo customerInfoRepo;
@@ -40,16 +40,15 @@ public class BaseInfoManagerImpl extends AbstractCommManager implements BaseInfo
     private QtkObuInfoRepo obuInfoRepo;
 
     @Override
-    public Pagination queryCustomer(BaseInfoCustomerPageRequestDTO req) {
+    public Pagination queryCustomer(BasicInfoCustomerPageRequestDTO req) {
         QtkCustomerInfoPageRequest request = new QtkCustomerInfoPageRequest();
         BeanUtils.copyProperties(req, request);
         return customerInfoRepo.page(request);
     }
 
     @Override
-    public Pagination queryVehicle(BaseInfoVehiclePageRequestDTO req) {
+    public Pagination queryVehicle(BasicInfoVehiclePageRequestDTO req) {
         QtkVehicleInfoPageRequest request = new QtkVehicleInfoPageRequest();
-
         List<String> customerIds = null;
         if (hasText(req.getCustomerIdNum())) {
             if (req.getCustomerIdType() == null) {
@@ -66,7 +65,7 @@ public class BaseInfoManagerImpl extends AbstractCommManager implements BaseInfo
     }
 
     @Override
-    public Pagination queryCard(BaseInfoCardPageRequestDTO req) throws ManagerException {
+    public Pagination queryCard(BasicInfoCardPageRequestDTO req) throws ManagerException {
         QtkCardInfoPageRequest request = new QtkCardInfoPageRequest();
         if (StringTools.hasText(req.getVehiclePlate()) != (req.getVehiclePlateColor() == null)) {
             throw new ManagerException("车牌号和车牌颜色要同时填写，才能进行查询");
@@ -78,7 +77,7 @@ public class BaseInfoManagerImpl extends AbstractCommManager implements BaseInfo
     }
 
     @Override
-    public Pagination queryObu(BaseInfoObuPageRequestDTO req) throws ManagerException {
+    public Pagination queryObu(BasicInfoObuPageRequestDTO req) throws ManagerException {
         QtkObuInfoPageRequest request = new QtkObuInfoPageRequest();
         if (StringTools.hasText(req.getVehiclePlate()) != (req.getVehiclePlateColor() == null)) {
             throw new ManagerException("车牌号和车牌颜色要同时填写，才能进行查询");
@@ -90,19 +89,19 @@ public class BaseInfoManagerImpl extends AbstractCommManager implements BaseInfo
     }
 
     @Override
-    public BaseInfoCustomerResponseDTO queryCustomerDetail(BaseInfoCustomerPageRequestDTO req) throws ManagerException {
+    public BasicInfoCustomerResponseDTO queryCustomerDetail(BasicInfoCustomerPageRequestDTO req) throws ManagerException {
         if (!StringUtils.hasText(req.getCustomerId())) {
             throw new ManagerException("用户编号不能为空");
         }
         QtkCustomerInfo customer = customerInfoRepo.findByCustomerId(req.getCustomerId());
         if (customer == null) throw new ManagerException("用户不存在");
-        BaseInfoCustomerResponseDTO response = new BaseInfoCustomerResponseDTO();
+        BasicInfoCustomerResponseDTO response = new BasicInfoCustomerResponseDTO();
         BeanUtils.copyProperties(customer, response);
         return response;
     }
 
     @Override
-    public BaseInfoVehicleResponseDTO queryVehicleDetail(BaseInfoVehiclePageRequestDTO req) throws ManagerException {
+    public BasicInfoVehicleResponseDTO queryVehicleDetail(BasicInfoVehiclePageRequestDTO req) throws ManagerException {
         if (!StringUtils.hasText(req.getVehiclePlate())) {
             throw new ManagerException("车牌号不能为空");
         }
@@ -112,14 +111,15 @@ public class BaseInfoManagerImpl extends AbstractCommManager implements BaseInfo
         String vehicleId = req.getVehiclePlate() + "_" + req.getVehiclePlateColor();
         QtkVehicleInfo vehicle = vehicleInfoRepo.findByVehicleId(vehicleId);
         if (vehicle == null) throw new ManagerException("车辆不存在");
-        BaseInfoVehicleResponseDTO response = new BaseInfoVehicleResponseDTO();
+        BasicInfoVehicleResponseDTO response = new BasicInfoVehicleResponseDTO();
         BeanUtils.copyProperties(vehicle, response);
+        //图片地址转换
         extracted(response);
         return response;
     }
 
-    private BaseInfoObuModel coverObu(QtkObuInfo qtkObuInfo) {
-        BaseInfoObuModel model = new BaseInfoObuModel();
+    private BasicInfoObuModel coverObu(QtkObuInfo qtkObuInfo) {
+        BasicInfoObuModel model = new BasicInfoObuModel();
         BeanUtils.copyProperties(qtkObuInfo, model);
         String vehicleId = qtkObuInfo.getVehicleId();
         if (StringUtils.hasText(vehicleId)) {
@@ -132,8 +132,8 @@ public class BaseInfoManagerImpl extends AbstractCommManager implements BaseInfo
         return model;
     }
 
-    private BaseInfoCardModel coverCard(QtkCardInfo qtkCardInfo) {
-        BaseInfoCardModel model = new BaseInfoCardModel();
+    private BasicInfoCardModel coverCard(QtkCardInfo qtkCardInfo) {
+        BasicInfoCardModel model = new BasicInfoCardModel();
         BeanUtils.copyProperties(qtkCardInfo, model);
         String vehicleId = qtkCardInfo.getVehicleId();
         if (StringUtils.hasText(vehicleId)) {
@@ -146,14 +146,15 @@ public class BaseInfoManagerImpl extends AbstractCommManager implements BaseInfo
         return model;
     }
 
-    private BaseInfoVehicleModel coverVeh(QtkVehicleInfo qtkVehicleInfo) {
-        BaseInfoVehicleModel model = new BaseInfoVehicleModel();
+    private BasicInfoVehicleModel coverVeh(QtkVehicleInfo qtkVehicleInfo) {
+        BasicInfoVehicleModel model = new BasicInfoVehicleModel();
         BeanUtils.copyProperties(qtkVehicleInfo, model);
+        //图片地址转换
         extracted(model);
         return model;
     }
 
-    private static void extracted(BaseInfoVehicleModel model) {
+    private static void extracted(BasicInfoVehicleModel model) {
         if (StringTools.hasText(model.getOwnerPosImgUrl()))
             model.setOwnerPosImgUrl(model.getOwnerPosImgUrl().replace("http://100.64.2.113:9000", "https://qtzl.etcjz.cn/"));
         if (StringTools.hasText(model.getOwnerNegImgUrl()))

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/baseInfo/BaseInfoCardModel.java → zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/basic/BasicInfoCardModel.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.managew.model.baseInfo;
+package cn.com.taiji.managew.model.basic;
 
 import cn.com.taiji.common.model.BaseModel;
 import cn.com.taiji.core.entity.dict.basic.DeviceVersion;
@@ -7,7 +7,7 @@ import lombok.Data;
 import java.time.LocalDateTime;
 
 @Data
-public class BaseInfoCardModel extends BaseModel {
+public class BasicInfoCardModel extends BaseModel {
     private LocalDateTime insertTime;//创建时间;
     private LocalDateTime updateTime;//修改时间;
     private String cardId;//卡号;

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/baseInfo/BaseInfoCustomerModel.java → zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/basic/BasicInfoCustomerModel.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.managew.model.baseInfo;
+package cn.com.taiji.managew.model.basic;
 
 import cn.com.taiji.common.model.BaseModel;
 import cn.com.taiji.core.entity.dict.basic.IdType;
@@ -8,7 +8,7 @@ import lombok.Data;
 import java.time.LocalDateTime;
 
 @Data
-public class BaseInfoCustomerModel extends BaseModel {
+public class BasicInfoCustomerModel extends BaseModel {
     private LocalDateTime insertTime;//创建时间
     private LocalDateTime updateTime;//修改时间
     private String customerId;//用户编号

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/baseInfo/BaseInfoObuModel.java → zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/basic/BasicInfoObuModel.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.managew.model.baseInfo;
+package cn.com.taiji.managew.model.basic;
 
 import cn.com.taiji.common.model.BaseModel;
 import cn.com.taiji.core.entity.dict.basic.DeviceVersion;
@@ -10,7 +10,7 @@ import lombok.Data;
 import java.time.LocalDateTime;
 
 @Data
-public class BaseInfoObuModel extends BaseModel {
+public class BasicInfoObuModel extends BaseModel {
     private LocalDateTime insertTime;//创建时间;
     private LocalDateTime updateTime;//更新时间;
     private String obuId;//obu编号;

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/baseInfo/BaseInfoVehicleModel.java → zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/basic/BasicInfoVehicleModel.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.managew.model.baseInfo;
+package cn.com.taiji.managew.model.basic;
 
 import cn.com.taiji.common.model.BaseModel;
 import lombok.Data;
@@ -7,7 +7,7 @@ import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data
-public class BaseInfoVehicleModel extends BaseModel {
+public class BasicInfoVehicleModel extends BaseModel {
     // 创建时间
     private LocalDateTime insertTime;
     // 更新时间