挂失解挂验证码

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/portal/SendCodeRequest.java

@@ -20,9 +20,9 @@ public class SendCodeRequest extends AbstractPortalRequest<SendCodeResponse> {
     @Pattern(regexp = RegexConstant.REGEX_MOBILE, message = "请传入正确格式的11位手机号码")
     @NotBlank(message = "手机号不能为空")
     private String mobile;
-    @IntegerConstant(values = "0,1,2,3,4")
+    @IntegerConstant(values = "0,1,2,3,4,5")
     @NotNull(message = "业务类型不能为空")
-    private Integer businessType;//0-登录 1-注册 2-忘记密码 3-修改手机号 4-非本人激活
+    private Integer businessType;//0-登录 1-注册 2-忘记密码 3-修改手机号 4-非本人激活 5-用户信息确认
     @NotNull(message = "来源不能为空")
     private SourceType loginSource;
 

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/api/ass/DeviceLossController.java

@@ -3,6 +3,8 @@ package cn.com.taiji.iaw.api.ass;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.web.ApiResponse;
 import cn.com.taiji.iaw.api.MyValidController;
+import cn.com.taiji.iaw.dto.ass.AssBaseInfoQueryRequestDTO;
+import cn.com.taiji.iaw.dto.ass.AssBaseInfoQueryResponseDTO;
 import cn.com.taiji.iaw.dto.ass.DeviceLossReqDTO;
 import cn.com.taiji.iaw.manager.ass.DeviceLossManager;
 import io.swagger.annotations.Api;
@@ -30,4 +32,9 @@ public class DeviceLossController extends MyValidController {
         return ApiResponse.success().setMessage("操作成功");
     }
 
+    @ApiOperation("02-信息查询")
+    @PostMapping("/query")
+    public ApiResponse<AssBaseInfoQueryResponseDTO> query(@Valid @RequestBody AssBaseInfoQueryRequestDTO dto) throws ManagerException {
+        return ApiResponse.of(manager.query(dto));
+    }
 }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/AssBaseInfoQueryRequestDTO.java

@@ -0,0 +1,20 @@
+package cn.com.taiji.iaw.dto.ass;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@ApiModel(description = "卡签挂失解挂基础信息查询")
+@Getter
+@Setter
+public class AssBaseInfoQueryRequestDTO {
+    @ApiModelProperty(value = "车辆ID", required = true)
+    @NotBlank(message = "车辆ID不能为空")
+    private String vehicleId;//车辆ID;
+
+    @ApiModelProperty(value = "状态 1-查询正常的 2-查询挂失的 null-查询全部")
+    private String status;
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/AssBaseInfoQueryResponseDTO.java

@@ -0,0 +1,31 @@
+package cn.com.taiji.iaw.dto.ass;
+
+import cn.com.taiji.iaw.model.ass.CardObuInfoModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@ApiModel(description = "卡签挂失解挂基础信息查询响应")
+@Getter
+@Setter
+public class AssBaseInfoQueryResponseDTO {
+    @ApiModelProperty(value = "用户名称")
+    private String customerName;
+    @ApiModelProperty(value = "用户手机号")
+    private String customerTel;
+    @ApiModelProperty(value = "用户证件类型")
+    private String customerIdType;
+    @ApiModelProperty(value = "用户证件号")
+    private String customerIdNum;
+    @ApiModelProperty(value = "车牌号")
+    private String vehiclePlate;
+    @ApiModelProperty(value = "车牌颜色")
+    private String vehiclePlateColor;
+    @ApiModelProperty(value = "收费车型")
+    private String vehicleType;
+    @ApiModelProperty(value = "卡签信息")
+    private List<CardObuInfoModel> cardObuInfos;
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/DeviceLossReqDTO.java

@@ -48,6 +48,12 @@ public class DeviceLossReqDTO extends AbstractBizRequestDTO {
     @ApiModelProperty(value = "员工Id app时不能为空")
     private String staffId;
 
+    @ApiModelProperty(value = "用户手机号 app时不能为空")
+    private String customerTel;
+
+    @ApiModelProperty(value = "验证码 app时不能为空")
+    private String code;
+
     @Override
     protected void validate(ViolationValidator validator) {
         super.validate(validator);
@@ -64,6 +70,8 @@ public class DeviceLossReqDTO extends AbstractBizRequestDTO {
             validator.validFieldNotBlank("staffId", staffId);
             validator.validFieldNotBlank("vehPosImgUrl", vehPosImgUrl);
             validator.validFieldNotBlank("vehNegImgUrl", vehNegImgUrl);
+            validator.validFieldNotBlank("customerTel", customerTel);
+            validator.validFieldNotBlank("code", code);
         }
         if (getOrderSource() == SourceType.WEB){
             validator.validFieldNotBlank("staffId", staffId);

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/portal/SendCodeDTO.java

@@ -21,7 +21,7 @@ public class SendCodeDTO extends BaseModel {
     @Pattern(regexp = RegexConstant.REGEX_MOBILE, message = "请传入正确格式的11位手机号码")
     @NotBlank(message = "手机号不能为空")
     private String mobile;
-    @IntegerConstant(values = "0,1,2,3,4")
+    @IntegerConstant(values = "0,1,2,3,4,5")
     @NotNull(message = "业务类型不能为空")
     private Integer businessType;//0-登录 1-注册 2-忘记密码
     @NotBlank(message = "来源不能为空")

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/ass/DeviceLossManager.java

@@ -1,8 +1,12 @@
 package cn.com.taiji.iaw.manager.ass;
 
 import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.iaw.dto.ass.AssBaseInfoQueryRequestDTO;
+import cn.com.taiji.iaw.dto.ass.AssBaseInfoQueryResponseDTO;
 import cn.com.taiji.iaw.dto.ass.DeviceLossReqDTO;
 
 public interface DeviceLossManager {
     void loss(DeviceLossReqDTO reqDto) throws ManagerException;
+
+    AssBaseInfoQueryResponseDTO query(AssBaseInfoQueryRequestDTO dto) throws ManagerException;
 }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/model/ass/CardObuInfoModel.java

@@ -0,0 +1,28 @@
+package cn.com.taiji.iaw.model.ass;
+
+import cn.com.taiji.core.entity.dict.basic.CardStatus;
+import cn.com.taiji.core.entity.dict.basic.CardType;
+import cn.com.taiji.core.entity.dict.basic.ObuStatus;
+import cn.com.taiji.core.entity.dict.basic.ObuType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+@ApiModel(description = "卡签信息")
+public class CardObuInfoModel {
+    @ApiModelProperty(value = "卡编号")
+    private String cardId;
+    @ApiModelProperty(value = "卡类型 字典CARD_TYPE")
+    private CardType cardType;
+    @ApiModelProperty(value = "卡状态 字典CARD_STATUS")
+    private CardStatus cardStatus;
+    @ApiModelProperty(value = "OBU编号")
+    private String obuId;
+    @ApiModelProperty(value = "OBU类型 字典OBU_TYPE")
+    private ObuType obuType;
+    @ApiModelProperty(value = "OBU状态 字典OBU_STATUS")
+    private ObuStatus obuStatus;
+}