修改能源类型

src/main/java/com/ydtech/constants/enums/JingyouEnergyTypes.java

@@ -0,0 +1,57 @@
+package com.ydtech.constants.enums;
+
+
+import com.ydtech.constants.enums.dict.insurance.EnergyType;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Optional;
+
+
+/**
+ * @description: 精友能源种类
+ * @author: wenks
+ * @date: 2024/4/26 14:54
+ **/
+
+@Getter
+@AllArgsConstructor
+public enum JingyouEnergyTypes {
+
+    D1("D1", "汽油", EnergyType.ET_0.getCode()),
+    D2("D2", "柴油", EnergyType.ET_0.getCode()),
+    D3("D3", "天然气(NG/CNG/LNG)", EnergyType.ET_9.getCode()),
+    D4("D4", "液化石油气(LPG)", EnergyType.ET_9.getCode()),
+    D5("D5", "混合动力", EnergyType.ET_4.getCode()),
+    D6("D6", "电动", EnergyType.ET_1.getCode()),
+    D7("D7", "两用燃料", EnergyType.ET_9.getCode()),
+    D8("D8", "燃料电池", EnergyType.ET_2.getCode()),
+    D9("D9", "甲醇", EnergyType.ET_9.getCode()),
+    D10("D10", "乙醇", EnergyType.ET_9.getCode()),
+    D11("D11", "其它", EnergyType.ET_9.getCode()),
+    D12("D12", "插电式混合动力", EnergyType.ET_3.getCode()),
+    D13("D13", "混合油", EnergyType.ET_9.getCode()),
+    D14("D14", "太阳能", EnergyType.ET_9.getCode()),
+    D15("D15", "无", EnergyType.ET_9.getCode());
+
+    private final String code;
+
+    private final String desc;
+
+    private final String energyType;
+
+
+    /**
+     * 通过精友编码获取车型编码
+     * @param code
+     * @return
+     */
+    public static String getEnergyTypeByCode(String code) {
+        JingyouEnergyTypes jingyouEnergyTypes = valueOf(code);
+        return Optional
+                .of(jingyouEnergyTypes)
+                .map(JingyouEnergyTypes::getEnergyType)
+                .orElse(EnergyType.ET_0.getCode());
+    }
+
+}

src/main/java/com/ydtech/modules/ins/model/vo/CarInfoVo.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.ins.model.vo;
 
 import com.ydtech.constants.enums.dict.insurance.EnergyType;
+import com.ydtech.modules.ins.model.ya.CarModelDTO;
 import com.ydtech.validation.annotation.CheckDateTime;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -166,6 +167,7 @@ public class CarInfoVo {
 
     /**
      * 所属性质
+     *
      * @see com.ydtech.constants.enums.dict.insurance.Property
      */
     @ApiModelProperty(value = "所属性质（1个人 2企业 3机关）")
@@ -180,4 +182,19 @@ public class CarInfoVo {
     }
 
 
+    public CarModelDTO toCarModelDTO() {
+        CarModelDTO carModelDTO = new CarModelDTO();
+        carModelDTO.setModelCode(this.modelCode);
+        carModelDTO.setModelName(this.brandName);
+        carModelDTO.setSeries(this.familyName);
+        carModelDTO.setRatedPassengerCapacity(this.seatCount);
+        carModelDTO.setDisplacement(this.enginedesc);
+        carModelDTO.setMarketYear(this.caryear);
+        carModelDTO.setReplacementValue(this.purchasePrice);
+        carModelDTO.setFuelType(this.powertype);
+        carModelDTO.setEnergyTypes(this.energyType);
+        carModelDTO.setFuelTypeCode(this.energyType);
+        return carModelDTO;
+    }
+
 }

src/main/java/com/ydtech/modules/ins/model/zm/ZmCarModel.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.ins.model.zm;
 
+import com.ydtech.constants.enums.JingyouEnergyTypes;
 import com.ydtech.modules.ins.model.ya.CarModelDTO;
 import lombok.Data;
 
@@ -72,8 +73,10 @@ public class ZmCarModel {
         carModelDTO.setReplacementValue(zmCarModel.getOriginalPurchasePrice());
         carModelDTO.setRemark(zmCarModel.getRemark());
         carModelDTO.setFuelType(zmCarModel.getFuelType());
-        carModelDTO.setFuelTypeCode(zmCarModel.getFuelTypeCode());
-        carModelDTO.setEnergyTypes(zmCarModel.getFuelTypeCode());
+
+        String energyTypeByCode = JingyouEnergyTypes.getEnergyTypeByCode(zmCarModel.getFuelTypeCode());
+        carModelDTO.setFuelTypeCode(energyTypeByCode);
+        carModelDTO.setEnergyTypes(energyTypeByCode);
         carModelDTO.setPowerScale(zmCarModel.getPower());
         carModelDTO.setVehicleSeatMax(zmCarModel.getVehicleSeatMax());
         carModelDTO.setVehicleSeatMin(zmCarModel.getVehicleSeatMin());

src/main/java/com/ydtech/modules/order/convert/CarModelDTOConvert.java

@@ -1,26 +0,0 @@
-package com.ydtech.modules.order.convert;
-
-
-import com.ydtech.modules.ins.model.vo.CarInfoVo;
-import com.ydtech.modules.ins.model.ya.CarModelDTO;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.factory.Mappers;
-
-@Mapper
-public interface CarModelDTOConvert {
-
-    CarModelDTOConvert INSTANCE = Mappers.getMapper(CarModelDTOConvert.class);
-
-    @Mapping(source = "modelCode", target = "modelCode")
-    @Mapping(source = "brandName", target = "modelName")
-    @Mapping(source = "familyName", target = "series")
-    @Mapping(source = "seatCount", target = "ratedPassengerCapacity")
-    @Mapping(source = "enginedesc", target = "displacement")
-    @Mapping(source = "caryear", target = "marketYear")
-    @Mapping(source = "purchasePrice", target = "replacementValue")
-    @Mapping(source = "powertype", target = "fuelType")
-    @Mapping(source = "energyType", target = "energyTypes")
-    CarModelDTO CarInfoVotoCarModelDTO(CarInfoVo carInfoVo);
-
-}

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -40,7 +40,6 @@ import com.ydtech.modules.ins.model.ya.CarModelDTO;
 import com.ydtech.modules.ins.model.ya.ExtendInfoDto;
 import com.ydtech.modules.ins.model.ya.ResponseDataC2;
 import com.ydtech.modules.inv.utils.EasyExcelUtils;
-import com.ydtech.modules.order.convert.CarModelDTOConvert;
 import com.ydtech.modules.order.convert.MapToYaExtendInfoDto;
 import com.ydtech.modules.order.dao.InsOrdersMapper;
 import com.ydtech.modules.order.entity.BasePageResult;
@@ -210,7 +209,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         if (!ObjectUtils.isEmpty(insOrders)) {
             JSONObject carinfo = insOrders.getCarinfo();
             CarInfoVo carInfoVo = JSON.parseObject(carinfo.toJSONString(), CarInfoVo.class);
-            CarModelDTO carModelDTO = CarModelDTOConvert.INSTANCE.CarInfoVotoCarModelDTO(carInfoVo);
+            CarModelDTO carModelDTO = carInfoVo.toCarModelDTO();
             return Collections.singletonList(carModelDTO);
         }
         return Collections.emptyList();