基础信息命名调整

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

@@ -25,9 +25,9 @@ public class BaseInfoController extends MyValidController {
     private BaseInfoManager manager;
 
     @ApiOperation(value = "001-用户信息查询")
-    @PostMapping(value = "/queryUser")
-    public ApiResponse<Pagination> queryUser(@Valid @RequestBody BaseInfoUserPageRequestDTO req) throws ManagerException {
-        return ApiResponse.of(manager.queryUser(req));
+    @PostMapping(value = "/queryCustomer")
+    public ApiResponse<Pagination> queryCustomer(@Valid @RequestBody BaseInfoCustomerPageRequestDTO req) throws ManagerException {
+        return ApiResponse.of(manager.queryCustomer(req));
     }
 
     @ApiOperation(value = "002-车辆信息查询")
@@ -49,9 +49,9 @@ public class BaseInfoController extends MyValidController {
     }
 
     @ApiOperation("005-用户详情")
-    @PostMapping("/queryUserDetail")
-    public ApiResponse<BaseInfoUserResponseDTO> queryUserDetail(@Valid @RequestBody BaseInfoUserPageRequestDTO req) throws ManagerException {
-        return ApiResponse.of(manager.queryUserDetail(req));
+    @PostMapping("/queryCustomerDetail")
+    public ApiResponse<BaseInfoCustomerResponseDTO> queryUserDetail(@Valid @RequestBody BaseInfoCustomerPageRequestDTO req) throws ManagerException {
+        return ApiResponse.of(manager.queryCustomerDetail(req));
     }
 
     @ApiOperation("006-车辆详情")

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

@@ -8,7 +8,7 @@ import lombok.Data;
 
 @Data
 @ApiModel(value = "基础信息用户分页查询参数")
-public class BaseInfoUserPageRequestDTO extends AbstractStaffBizPageRequestDTO {
+public class BaseInfoCustomerPageRequestDTO extends AbstractStaffBizPageRequestDTO {
     /**
      * 用户编号
      */

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

@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
 @Setter
 @Getter
 @ApiModel(description = "用户信息详情响应")
-public class BaseInfoUserResponseDTO {
+public class BaseInfoCustomerResponseDTO {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime insertTime;//创建时间
     @ApiModelProperty(value = "修改时间")

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

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

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

@@ -5,12 +5,15 @@ import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.managew.dto.baseInfo.*;
 
 public interface BaseInfoManager {
-    Pagination queryUser(BaseInfoUserPageRequestDTO req);
+    Pagination queryCustomer(BaseInfoCustomerPageRequestDTO req);
+
     Pagination queryVehicle(BaseInfoVehiclePageRequestDTO req);
+
     Pagination queryCard(BaseInfoCardPageRequestDTO req) throws ManagerException;
+
     Pagination queryObu(BaseInfoObuPageRequestDTO req) throws ManagerException;
 
-    BaseInfoUserResponseDTO queryUserDetail(BaseInfoUserPageRequestDTO 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/baseInfo/BaseInfoManagerImpl.java

@@ -1,7 +1,6 @@
 package cn.com.taiji.managew.manager.baseInfo;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.common.model.BaseModel;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.common.pub.StringTools;
 import cn.com.taiji.core.entity.basic.QtkCardInfo;
@@ -18,9 +17,9 @@ 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.manager.AbstractCommManager;
-import cn.com.taiji.managew.model.baseInfo.CardInfoModel;
-import cn.com.taiji.managew.model.baseInfo.ObuInfoModel;
-import cn.com.taiji.managew.model.baseInfo.VehicleInfoModel;
+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 org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -41,7 +40,7 @@ public class BaseInfoManagerImpl extends AbstractCommManager implements BaseInfo
     private QtkObuInfoRepo obuInfoRepo;
 
     @Override
-    public Pagination queryUser(BaseInfoUserPageRequestDTO req) {
+    public Pagination queryCustomer(BaseInfoCustomerPageRequestDTO req) {
         QtkCustomerInfoPageRequest request = new QtkCustomerInfoPageRequest();
         BeanUtils.copyProperties(req, request);
         return customerInfoRepo.page(request);
@@ -91,13 +90,13 @@ public class BaseInfoManagerImpl extends AbstractCommManager implements BaseInfo
     }
 
     @Override
-    public BaseInfoUserResponseDTO queryUserDetail(BaseInfoUserPageRequestDTO req) throws ManagerException {
+    public BaseInfoCustomerResponseDTO queryCustomerDetail(BaseInfoCustomerPageRequestDTO req) throws ManagerException {
         if (!StringUtils.hasText(req.getCustomerId())) {
             throw new ManagerException("用户编号不能为空");
         }
         QtkCustomerInfo customer = customerInfoRepo.findByCustomerId(req.getCustomerId());
         if (customer == null) throw new ManagerException("用户不存在");
-        BaseInfoUserResponseDTO response = new BaseInfoUserResponseDTO();
+        BaseInfoCustomerResponseDTO response = new BaseInfoCustomerResponseDTO();
         BeanUtils.copyProperties(customer, response);
         return response;
     }
@@ -119,8 +118,8 @@ public class BaseInfoManagerImpl extends AbstractCommManager implements BaseInfo
         return response;
     }
 
-    private ObuInfoModel coverObu(QtkObuInfo qtkObuInfo) {
-        ObuInfoModel model = new ObuInfoModel();
+    private BaseInfoObuModel coverObu(QtkObuInfo qtkObuInfo) {
+        BaseInfoObuModel model = new BaseInfoObuModel();
         BeanUtils.copyProperties(qtkObuInfo, model);
         String vehicleId = qtkObuInfo.getVehicleId();
         if (StringUtils.hasText(vehicleId)) {
@@ -133,8 +132,8 @@ public class BaseInfoManagerImpl extends AbstractCommManager implements BaseInfo
         return model;
     }
 
-    private CardInfoModel coverCard(QtkCardInfo qtkCardInfo) {
-        CardInfoModel model = new CardInfoModel();
+    private BaseInfoCardModel coverCard(QtkCardInfo qtkCardInfo) {
+        BaseInfoCardModel model = new BaseInfoCardModel();
         BeanUtils.copyProperties(qtkCardInfo, model);
         String vehicleId = qtkCardInfo.getVehicleId();
         if (StringUtils.hasText(vehicleId)) {
@@ -147,14 +146,14 @@ public class BaseInfoManagerImpl extends AbstractCommManager implements BaseInfo
         return model;
     }
 
-    private VehicleInfoModel coverVeh(QtkVehicleInfo qtkVehicleInfo) {
-        VehicleInfoModel model = new VehicleInfoModel();
+    private BaseInfoVehicleModel coverVeh(QtkVehicleInfo qtkVehicleInfo) {
+        BaseInfoVehicleModel model = new BaseInfoVehicleModel();
         BeanUtils.copyProperties(qtkVehicleInfo, model);
         extracted(model);
         return model;
     }
 
-    private static void extracted(VehicleInfoModel model) {
+    private static void extracted(BaseInfoVehicleModel 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/CardInfoModel.java → zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/baseInfo/BaseInfoCardModel.java

@@ -7,7 +7,7 @@ import lombok.Data;
 import java.time.LocalDateTime;
 
 @Data
-public class CardInfoModel extends BaseModel {
+public class BaseInfoCardModel extends BaseModel {
     private LocalDateTime insertTime;//创建时间;
     private LocalDateTime updateTime;//修改时间;
     private String cardId;//卡号;

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

@@ -8,7 +8,7 @@ import lombok.Data;
 import java.time.LocalDateTime;
 
 @Data
-public class CustomerInfoModel extends BaseModel {
+public class BaseInfoCustomerModel extends BaseModel {
     private LocalDateTime insertTime;//创建时间
     private LocalDateTime updateTime;//修改时间
     private String customerId;//用户编号

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

@@ -10,7 +10,7 @@ import lombok.Data;
 import java.time.LocalDateTime;
 
 @Data
-public class ObuInfoModel extends BaseModel {
+public class BaseInfoObuModel extends BaseModel {
     private LocalDateTime insertTime;//创建时间;
     private LocalDateTime updateTime;//更新时间;
     private String obuId;//obu编号;

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

@@ -7,7 +7,7 @@ import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data
-public class VehicleInfoModel extends BaseModel {
+public class BaseInfoVehicleModel extends BaseModel {
     // 创建时间
     private LocalDateTime insertTime;
     // 更新时间