删除接口

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

@@ -1,27 +0,0 @@
-package cn.com.taiji.core.model.comm.protocol.ias.ass;
-
-import java.time.LocalDateTime;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-
-import cn.com.taiji.core.model.comm.protocol.ias.AbstractIasRequest;
-import cn.com.taiji.core.model.comm.protocol.valid.RegexConstant;
-import lombok.Getter;
-import lombok.Setter;
-
-@Setter
-@Getter
-public class ActiveCheckSendCodeRequest extends AbstractIasRequest<ActiveCheckSendCodeResponse> {
-    public ActiveCheckSendCodeRequest() {
-        super(AssServiceCmd.ACTIVECHECKSENDCODE);
-    }
-    @Pattern(regexp = RegexConstant.REGEX_MOBILE, message = "手机号格式不正确")
-    @NotBlank(message = "手机号码不能为空")
-    private String mobile;
-    @NotBlank(message = "短信验证码不能为空")
-    private String code;
-    @NotBlank(message = "loginSource不能为空")
-    private String loginSource;
-}

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

@@ -1,16 +0,0 @@
-package cn.com.taiji.core.model.comm.protocol.ias.ass;
-
-import cn.com.taiji.core.model.comm.protocol.ias.AbstractIasResponse;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class ActiveCheckSendCodeResponse extends AbstractIasResponse {
-    //售后订单号
-    private String orderNo;
-    //状态码 1:成功 0:失败
-    private String code;
-    //状态信息
-    private String msg;
-}

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

@@ -33,7 +33,6 @@ public enum AssServiceCmd implements SignServiceCommand {
     CUSTOMERINFOCHANGEAUDIT("客户信息变更申请审核", CustomerInfoChangeAuditRequest.class),
     ACTIVEQUERYVEHICLE("设备激活查询可激活车辆列表", ActiveQueryVehicleRequest.class),
     ACTIVESAVERECORDS("设备激活保存记录", ActiveSaveRecordRequest.class),
-    ACTIVECHECKSENDCODE("设备激活校验验证码", ActiveCheckSendCodeRequest.class),
     ACTIVECHECKCANACTIVE("设备激活是否可激活", ActiveCheckCanActiveRequest.class),
     REIMBURSEORDERINPUT("补缴订单录入", ReimburseOrderInputRequest.class),
     REIMBURSEORDEROBJECTIONS("补缴订单申诉", ReimburseOrderObjectionsRequest.class),

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

@@ -38,13 +38,6 @@ public class ActiveController extends MyValidController {
         return ApiResponse.of(resDto).setMessage("保存成功");
     }
 
-    @ApiOperation(value = "校验验证码")
-    @PostMapping(value = "/checkSendCode")
-    public ApiResponse checkSendCode(@Valid @RequestBody CheckCodeRequest reqDto) throws ManagerException {
-        manager.checkSendCode(reqDto);
-        return ApiResponse.success().setMessage("操作成功");
-    }
-
     @ApiOperation(value = "是否可激活")
     @PostMapping(value = "/checkCanActive")
     public ApiResponse<CheckCanActiveResponse> checkCanActive(@Valid @RequestBody CheckCanActiveRequest reqDto) throws ManagerException {

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

@@ -10,6 +10,5 @@ import cn.com.taiji.iaw.dto.ass.active.*;
 public interface ActiveManager {
     QueryVehicleResponseDTO queryVehicle(QueryVehicleRequestDTO requestDTO) throws ManagerException;
     ActivateDetailsResponseDTO saveRecords(ActivateDetailsRequestDTO requestDTO) throws ManagerException;
-    void checkSendCode(CheckCodeRequest request) throws ManagerException;
     CheckCanActiveResponse checkCanActive(CheckCanActiveRequest request) throws ManagerException;
 }

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

@@ -1,45 +1,9 @@
 package cn.com.taiji.iaw.manager.ass;
 
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import cn.com.taiji.common.manager.net.http.ServiceHandleException;
-import cn.com.taiji.core.entity.basic.QtkObuInfo;
-import cn.com.taiji.core.entity.dict.ass.AssOrderStep;
-import cn.com.taiji.core.entity.dict.basic.CardStatus;
-import cn.com.taiji.core.entity.dict.basic.ObuStatus;
-import cn.com.taiji.core.entity.user.Staff;
-import cn.com.taiji.core.model.comm.protocol.ias.ass.*;
-import cn.com.taiji.core.repo.jpa.user.StaffRepo;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.common.pub.BeanTools;
-import cn.com.taiji.core.entity.ass.AssDeviceReactivate;
-import cn.com.taiji.core.entity.ass.AssOrderinfo;
-import cn.com.taiji.core.entity.basic.QtkCardInfo;
-import cn.com.taiji.core.entity.basic.QtkCustomerInfo;
-import cn.com.taiji.core.entity.basic.QtkVehicleInfo;
-import cn.com.taiji.core.entity.dict.AuditStatus;
-import cn.com.taiji.core.entity.dict.ass.AssOrderStatus;
-import cn.com.taiji.core.entity.dict.ass.AssOrderType;
-import cn.com.taiji.core.entity.issue.IssueOrderinfo;
-import cn.com.taiji.core.entity.managew.ActiveRecord;
-import cn.com.taiji.core.manager.cache.RedisKeyGenerator;
-import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
-import cn.com.taiji.core.repo.jpa.ass.AssDeviceReactivateRepo;
-import cn.com.taiji.core.repo.jpa.ass.AssOrderinfoRepo;
-import cn.com.taiji.core.repo.jpa.basic.QtkCardInfoRepo;
-import cn.com.taiji.core.repo.jpa.basic.QtkCustomerInfoRepo;
-import cn.com.taiji.core.repo.jpa.basic.QtkObuInfoRepo;
-import cn.com.taiji.core.repo.jpa.basic.QtkVehicleInfoRepo;
-import cn.com.taiji.core.repo.jpa.issue.IssueOrderinfoRepo;
-import cn.com.taiji.core.repo.jpa.managew.ActiveRecordRepo;
-import cn.com.taiji.core.repo.request.managew.DeviceReactivateModel;
+import cn.com.taiji.core.model.comm.protocol.ias.ass.*;
 import cn.com.taiji.iaw.dto.ass.active.*;
 import cn.com.taiji.iaw.manager.AbstractCommManager;
 
@@ -68,12 +32,6 @@ public class ActiveManagerImpl extends AbstractCommManager implements ActiveMana
         }
         return new ActivateDetailsResponseDTO();
     }
-    @Override
-    public void checkSendCode(CheckCodeRequest request) throws ManagerException {
-        ActiveCheckSendCodeRequest req = new ActiveCheckSendCodeRequest();
-        copyProperties(request, req);
-        jsonPostRepeat(req);
-    }
 
     @Override
     public CheckCanActiveResponse checkCanActive(CheckCanActiveRequest request) throws ManagerException {

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/active/ActiveCheckSendCodeManager.java

@@ -1,39 +0,0 @@
-package cn.com.taiji.ias.manager.ass.active;
-
-
-import cn.com.taiji.core.entity.dict.basic.SourceType;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import cn.com.taiji.common.manager.net.http.ServiceHandleException;
-import cn.com.taiji.core.manager.cache.RedisKeyGenerator;
-import cn.com.taiji.core.manager.cache.RedisManager;
-import cn.com.taiji.core.model.comm.protocol.ias.ass.ActiveCheckSendCodeRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.ass.ActiveCheckSendCodeResponse;
-import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
-import cn.com.taiji.ias.manager.AbstractCommManager;
-
-@Service
-public class ActiveCheckSendCodeManager extends AbstractCommManager {
-    @Autowired(required = false)
-    protected RedisManager redisManager;
-
-    public ActiveCheckSendCodeResponse serviceHandle(ActiveCheckSendCodeRequest req) throws ServiceHandleException {
-        String smsCode = redisManager.get(RedisKeyGenerator.getSmsCodeKey(req.getMobile(), SourceType.findByCode(req.getLoginSource()).name(), 4));
-        ActiveCheckSendCodeResponse response = new ActiveCheckSendCodeResponse();
-        if (!hasText(smsCode)){
-            response.setCode("0");
-            response.setMsg("短信验证码已过期，请重新发送!");
-            throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("短信验证码已过期，请重新发送!");
-        }
-        if (!smsCode.equals(req.getCode())){
-            response.setCode("0");
-            response.setMsg("短信验证码错误!");
-            throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("短信验证码错误！");
-        }
-        response.setCode("1");
-        response.setMsg("验证成功!");
-        return response;
-    }
-
-}

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/handler/AssServiceHandler.java

@@ -1,5 +1,10 @@
 package cn.com.taiji.ias.manager.handler;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.zgglyun.common.model.AbstractHttpRequestInfo;
+
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.file.FileProtocolSystemError;
 import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeRequest;
@@ -10,12 +15,13 @@ import cn.com.taiji.core.model.comm.protocol.ias.ass.*;
 import cn.com.taiji.core.model.comm.protocol.ias.ass.vehicleInfoChange.VehicleChangeCancelRequest;
 import cn.com.taiji.ias.manager.ass.*;
 import cn.com.taiji.ias.manager.ass.active.ActiveCheckCanActiveManager;
-import cn.com.taiji.ias.manager.ass.active.ActiveCheckSendCodeManager;
 import cn.com.taiji.ias.manager.ass.active.ActiveQueryVehicleManager;
 import cn.com.taiji.ias.manager.ass.active.ActiveSaveRecordManager;
 import cn.com.taiji.ias.manager.ass.customerInfoChange.CustomerInfoChangeApplyManager;
-import cn.com.taiji.ias.manager.ass.device.*;
 import cn.com.taiji.ias.manager.ass.device.DeviceCancelApplyManager;
+import cn.com.taiji.ias.manager.ass.device.DeviceCancelConfirmQdManager;
+import cn.com.taiji.ias.manager.ass.device.DeviceEnableApplyManager;
+import cn.com.taiji.ias.manager.ass.device.DeviceLossManager;
 import cn.com.taiji.ias.manager.ass.deviceReplace.DeviceReplaceApplyManager;
 import cn.com.taiji.ias.manager.ass.reimburseOrder.*;
 import cn.com.taiji.ias.manager.ass.releasePlate.PlateOccupyQueryManager;
@@ -26,9 +32,6 @@ import cn.com.taiji.ias.manager.ass.signChange.SignChangeApplyManager;
 import cn.com.taiji.ias.manager.ass.signChange.SignChangeCollectManager;
 import cn.com.taiji.ias.manager.ass.vehicleChange.VehicleChangeApplyManager;
 import cn.com.taiji.ias.manager.vehicleInfoChange.VehicleChangeCancelManager;
-import com.zgglyun.common.model.AbstractHttpRequestInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 
 //import cn.com.taiji.ias.manager.vehicleInfoChange.VehicleChangeArtificialManager;
 //import cn.com.taiji.ias.manager.vehicleInfoChange.VehicleInfoChangeManager;
@@ -81,8 +84,6 @@ public class AssServiceHandler extends AbstractIasServiceHandler<AssServiceCmd>
     @Autowired
     private ActiveCheckCanActiveManager activeCheckCanActiveManager;
     @Autowired
-    private ActiveCheckSendCodeManager activeCheckSendCodeManager;
-    @Autowired
     private ReimburseOrderQueryManager reimburseOrderQueryManager;
     @Autowired
     private ReimburseOrderInputManager reimburseOrderInputManager;
@@ -164,8 +165,6 @@ public class AssServiceHandler extends AbstractIasServiceHandler<AssServiceCmd>
                 return activeQueryVehicleManager.serviceHandle((ActiveQueryVehicleRequest) request);
             case ACTIVESAVERECORDS:
                 return activeSaveRecordsManager.serviceHandle((ActiveSaveRecordRequest) request);
-            case ACTIVECHECKSENDCODE:
-                return activeCheckSendCodeManager.serviceHandle((ActiveCheckSendCodeRequest) request);
             case ACTIVECHECKCANACTIVE:
                 return activeCheckCanActiveManager.serviceHandle((ActiveCheckCanActiveRequest) request);
             case REIMBURSEORDERQUERY: