diff --git a/fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/enums/CarUseTypeEnum.java b/fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/enums/CarUseTypeEnum.java index a881310..11a34e5 100644 --- a/fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/enums/CarUseTypeEnum.java +++ b/fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/enums/CarUseTypeEnum.java @@ -15,11 +15,11 @@ public enum CarUseTypeEnum implements IEnum { /** * 个人 */ - NO_OPERATING(1, "非运营"), + NO_OPERATING(1, "非营运"), /** * 企业单位 */ - OPERATING(2, "运营"); + OPERATING(2, "营运"); /** * 值 @@ -57,7 +57,7 @@ public enum CarUseTypeEnum implements IEnum { */ public static CarUseTypeEnum ofName(final String name) { for (final CarUseTypeEnum typeEnum : CarUseTypeEnum.values()) { - if (typeEnum.name.equals(name)) { + if (typeEnum.getName().equals(name)) { return typeEnum; } } diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/component/AuthVehicleConsumer.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/component/AuthVehicleConsumer.java index f3b579c..5216f7f 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/component/AuthVehicleConsumer.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/component/AuthVehicleConsumer.java @@ -1,7 +1,8 @@ package cn.fw.valhalla.component; import cn.fw.identify.sdk.api.mq.AuthDataEvent; -import cn.fw.valhalla.common.utils.*; +import cn.fw.valhalla.common.utils.DateUtil; +import cn.fw.valhalla.common.utils.StringUtils; import cn.fw.valhalla.domain.dto.NewVehicleDTO; import cn.fw.valhalla.rpc.member.MemberRpcService; import cn.fw.valhalla.rpc.member.dto.MemberUserDTO; @@ -20,6 +21,7 @@ import java.util.Objects; /** * 监听认证mq + * * @author xiatian */ @Slf4j @@ -41,21 +43,21 @@ public class AuthVehicleConsumer implements RocketMQListener { log.info("监听认证mq: AuthDataEvent=[{}]", t); try { String identifyCode = "NS9k"; - if(!identifyCode.equals(t.getIdentifyCode())){ + if (!identifyCode.equals(t.getIdentifyCode())) { return; } - if(StringUtils.isEmpty(t.getVin())){ + if (StringUtils.isEmpty(t.getVin())) { log.error("认证mq的vin为空"); } //保存车辆认证信息 - memberVehicleBizService.saveVehicle(with(JSON.parseObject(t.getExtraData(),VehicleData.class),t)); + memberVehicleBizService.saveVehicle(with(JSON.parseObject(t.getExtraData(), VehicleData.class), t)); } catch (Exception ex) { log.error("消费关注公众号mq失败,原因:{}", JSON.toJSONString(ex)); } } @Data - private static class VehicleData{ + private static class VehicleData { private String plateNum; private String vehicleType; @@ -93,19 +95,16 @@ public class AuthVehicleConsumer implements RocketMQListener { private String inspectionRecord; } - private NewVehicleDTO with(VehicleData vehicleData,AuthDataEvent t){ - log.info("行驶证转换结果:{}",JSON.toJSONString(vehicleData)); + private NewVehicleDTO with(VehicleData vehicleData, AuthDataEvent t) { + log.info("行驶证转换结果:{}", JSON.toJSONString(vehicleData)); MemberUserDTO member = memberRpcService.user(t.getMemberId()); - String brandName = StringUtils.matchFirst(vehicleData.getModel(),"[\\u4e00-\\u9fa5]+",0); - if(Objects.isNull(brandName)){ + String brandName = StringUtils.matchFirst(vehicleData.getModel(), "[\\u4e00-\\u9fa5]+", 0); + if (Objects.isNull(brandName)) { log.error("未匹配行驶证品牌"); return null; } - CarUseTypeEnum useType = CarUseTypeEnum.ofName(vehicleData.getUseCharacter()); - if(Objects.isNull(useType)){ - log.error("未匹配行驶证使用性质"); - return null; - } + CarUseTypeEnum useType = CarUseTypeEnum.NO_OPERATING.getName().equals(vehicleData.getUseCharacter()) + ? CarUseTypeEnum.NO_OPERATING : CarUseTypeEnum.OPERATING; Date regDate = DateUtil.parse1(vehicleData.registerDate); NewVehicleDTO newVehicle = new NewVehicleDTO(); newVehicle.setMemberId(t.getMemberId()); @@ -118,7 +117,7 @@ public class AuthVehicleConsumer implements RocketMQListener { newVehicle.setFrameNo(vehicleData.getVin()); newVehicle.setName(vehicleData.getOwner()); newVehicle.setRegDate(regDate); - newVehicle.setSpecCode(vehicleData.getModel().replace(brandName,"")); + newVehicle.setSpecCode(vehicleData.getModel().replace(brandName, "")); return newVehicle; } } \ No newline at end of file