操作状态名单优化修改人以及测试

src/main/java/com/qtzl/alterSales/manager/model/protocol/sales/VehicleStatusListChangeRequest.java

@@ -28,6 +28,9 @@ public class VehicleStatusListChangeRequest  extends BaseModel {
     private String openId;
     private String accessToken;
 
+    /** 操作人 */
+    private String operator ;
+
     public String getAgentId() {
         return agentId;
     }
@@ -99,4 +102,12 @@ public class VehicleStatusListChangeRequest  extends BaseModel {
     public void setAccessToken(String accessToken) {
         this.accessToken = accessToken;
     }
+
+    public String getOperator() {
+        return operator;
+    }
+
+    public void setOperator(String operator) {
+        this.operator = operator;
+    }
 }

src/main/java/com/qtzl/alterSales/manager/service/AflVehicleStatusInfoServiceImpl.java

@@ -26,9 +26,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
+import java.util.UUID;
 
 
 /**
@@ -68,13 +70,21 @@ public class AflVehicleStatusInfoServiceImpl implements  AflVehicleStatusInfoSer
             if (request.getType().equals(aflVehicleStatusInfo.getType())){
                 throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("当为状态已为"+ BlacklistOpType.findByCode(request.getType()).getValue());
             }
+            Duration dur= Duration.between(aflVehicleStatusInfo.getUpdateTime(), LocalDateTime.now() );
+            long minute = dur.toMinutes();
+//            //5分钟内不允许操作
+//            long minMinute=5L;
+//            if (minute<minMinute){
+//                throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("5分钟内不允许进行操作");
+//            }
             AflVehicleStatusHisInfo aflVehicleStatusHisInfo = new AflVehicleStatusHisInfo();
             BeanUtils.copyProperties(aflVehicleStatusInfo,aflVehicleStatusHisInfo);
+            aflVehicleStatusHisInfo.setId(UUID.randomUUID().toString().replace("-", ""));
             aflVehicleStatusHisInfoRepo.save(aflVehicleStatusHisInfo);
         }else{
              aflVehicleStatusInfo=new AflVehicleStatusInfo();
-             BeanUtils.copyProperties(request,aflVehicleStatusInfo);
         }
+        BeanUtils.copyProperties(request,aflVehicleStatusInfo);
         aflVehicleStatusInfo.setCreateTime(LocalDateTime.now());
         if (flash){
             AflBindInfo aflBindInfo =  aflBindInfoRepo.findByVehicleId(request.getVehicleId());
@@ -162,6 +172,7 @@ public class AflVehicleStatusInfoServiceImpl implements  AflVehicleStatusInfoSer
             log.error("下黑或返白时，需指定uniqueKey...");
             throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("下黑或返白时，需指定uniqueKey...");
         }
+
     }
 
 }

src/main/java/com/qtzl/alterSales/manager/service/FssBlackListManagerImpl.java

@@ -180,8 +180,9 @@ public class FssBlackListManagerImpl implements FssBlackListManager {
 //            httpJsonPost = platformHttpUtil.httpJsonPost(vehicleBlackListRequest, PlatformServiceType.PSS_ISSUE_HANDLEBLACKLIST,token);
              httpJsonPost = pssSupService.pssSup(vehicleBlackListRequest, token, PlatformJsonDepartmentResponse.class);
             log.info("操作状态名单-请求路网返回结果为{}", JSON.toJSON(httpJsonPost));
-            final boolean condition = null != httpJsonPost.getStatusCode() && httpJsonPost.getStatusCode().equals(0) &&
-                    !StringUtils.isEmpty(httpJsonPost.getBizContent()) && !httpJsonPost.getBizContent().contains("分钟");
+//            final boolean condition = null != httpJsonPost.getStatusCode() && httpJsonPost.getStatusCode().equals(0) &&
+//                    !StringUtils.isEmpty(httpJsonPost.getBizContent()) && !httpJsonPost.getBizContent().contains("分钟");
+            final boolean condition = null != httpJsonPost.getInfo() && httpJsonPost.getInfo().equals("成功");
             if (condition) {
                 // 下黑或返白成功
                 log.info("请求部中心状态名单接口成功，车辆编号：{}", vehicleBlackListRequest.getVehicleId());