国任 货车修改

src/main/java/com/ydtech/modules/admin/controller/SysRoleController.java

@@ -35,7 +35,7 @@ public class SysRoleController extends BaseController {
     @Autowired
     private SysRoleMenuService sysRoleMenuService;
 
-//    @PreAuthorize("hasAuthority('sys:role:add') AND hasAuthority('sys:role:edit')")
+    //    @PreAuthorize("hasAuthority('sys:role:add') AND hasAuthority('sys:role:edit')")
     @PostMapping(value = "/save")
     public HttpResult save(@RequestBody SysRole record) {
         SysRole role = sysRoleService.getById(record.getId());
@@ -52,7 +52,7 @@ public class SysRoleController extends BaseController {
         return HttpResult.ok(sysRoleService.saveOrUpdate(record));
     }
 
-//    @PreAuthorize("hasAuthority('sys:role:delete')")
+    //    @PreAuthorize("hasAuthority('sys:role:delete')")
     @PostMapping(value = "/delete")
     @Transactional
     public HttpResult delete(@RequestBody List<SysRole> records) {
@@ -63,17 +63,17 @@ public class SysRoleController extends BaseController {
 //        return HttpResult.ok(sysRoleService.delete(records));
     }
 
-//    @PreAuthorize("hasAuthority('sys:role:view')")
+    //    @PreAuthorize("hasAuthority('sys:role:view')")
     @PostMapping(value = "/findPage")
     public HttpResult findPage(@RequestBody PageRequest pageRequest) {
         return HttpResult.ok(sysRoleService.findPage(pageRequest));
     }
 
-//    @PreAuthorize("hasAuthority('sys:role:view')")
+    //    @PreAuthorize("hasAuthority('sys:role:view')")
     @GetMapping(value = "/findAll")
     public HttpResult findAll() {
         LambdaQueryWrapper<SysRole> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(SysRole::getDelFlag,"0");
+        lqw.eq(SysRole::getDelFlag, "0");
         List<SysRole> list = sysRoleService.list(lqw);
         return HttpResult.ok(list);
     }
@@ -84,28 +84,28 @@ public class SysRoleController extends BaseController {
         SysUser user = getUser();
         LambdaQueryWrapper<SysRole> lqw = new LambdaQueryWrapper<>();
         //获取角色的配置信息
-        RoleConstants roleConstants = RoleConstants. getRoleConstants(user.getRoleId());
-        if(!"".equals(roleConstants.getRoleIds())){
-            lqw.in(SysRole::getId,roleConstants.getRoleIds().split(","));
+        RoleConstants roleConstants = RoleConstants.getRoleConstants(user.getRoleId());
+        if (!"".equals(roleConstants.getRoleIds())) {
+            lqw.in(SysRole::getId, roleConstants.getRoleIds().split(","));
         }
 
-        lqw.eq(SysRole::getDelFlag,"0");
+        lqw.eq(SysRole::getDelFlag, "0");
         List<SysRole> list = sysRoleService.list(lqw);
         return HttpResult.ok(list);
     }
 
 
-//    @PreAuthorize("hasAuthority('sys:role:view')")
+    //    @PreAuthorize("hasAuthority('sys:role:view')")
     @GetMapping(value = "/findRoleMenus")
     public HttpResult findRoleMenus(@RequestParam Long roleId) {
         return HttpResult.ok(sysRoleService.findRoleMenus(roleId));
     }
 
-//    @PreAuthorize("hasAuthority('sys:role:view')")
+    //    @PreAuthorize("hasAuthority('sys:role:view')")
     @PostMapping(value = "/saveRoleMenus")
     public HttpResult saveRoleMenus(@RequestBody List<SysRoleMenu> records) {
 
-        if(null == records || records.size() < 1){
+        if (null == records || records.size() < 1) {
             return HttpResult.error("参数空");
         }
         SysRole sysRole = sysRoleService.getById(records.get(0).getRoleId());

src/main/java/com/ydtech/modules/ins/model/guoren/CarPriceReq.java

@@ -5,13 +5,11 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydtech.constants.enums.InsuranceRisk;
+import com.ydtech.constants.enums.dict.insurance.TrafficManagementVehicleType;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.vo.CustomerInfoVo;
 import com.ydtech.modules.ins.model.vo.RiskInfoVo;
-import com.ydtech.modules.order.entity.api.guoren.constants.CategoriesOfVehicles;
-import com.ydtech.modules.order.entity.api.guoren.constants.ClauseTypeSystem;
-import com.ydtech.modules.order.entity.api.guoren.constants.FuelType;
-import com.ydtech.modules.order.entity.api.guoren.constants.UseNatureCodeMapping;
+import com.ydtech.modules.order.entity.api.guoren.constants.*;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.utils.StringUtils;
 import lombok.Data;
@@ -108,6 +106,16 @@ public class CarPriceReq {
         prpTitemCar.setTonCount(vinQ.getTonCount());
         //新车标识	newCarFlag	字符串	新车传空，非新车-1
         prpTitemCar.setNewCarFlag(StringUtils.isEmpty(carInfo.getLicenseNo()) ? "" : "-1");
+
+        TrafficManagementVehicleType trafficManagementVehicleType = Enum.valueOf(TrafficManagementVehicleType.class, carInfo.getCartype());
+
+        // 货车修改
+        if (trafficManagementVehicleType.getDesc().contains(CarKindCode.H3.getDesc())) {
+            prpTitemCar.setCarKindCode(CarKindCode.H3.getCode());
+        } else if (trafficManagementVehicleType.getDesc().contains(CarKindCode.T11.getDesc())) {
+            prpTitemCar.setCarKindCode(CarKindCode.T11.getCode());
+        }
+
         prpTitemCar.setLicenseKindCode("02");
         prpTitemCar.setPurchasePrice(vinQ.getPurchasePriceSZ());
         prpTitemCar.setClauseType("F54");
@@ -246,6 +254,11 @@ public class CarPriceReq {
             @JsonProperty(value = "newCarFlag")
             @JSONField(name = "newCarFlag")
             private String newCarFlag;
+
+            @JsonProperty(value = "carKindCode")
+            @JSONField(name = "carKindCode")
+            private String carKindCode;
+
             @JsonProperty(value = "licenseKindCode")
             @JSONField(name = "licenseKindCode")
             private String licenseKindCode;

src/main/java/com/ydtech/modules/order/entity/api/guoren/constants/CarKindCode.java

@@ -0,0 +1,102 @@
+package com.ydtech.modules.order.entity.api.guoren.constants;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @version
+ * @description: 国任财险 车辆种类
+ * @author: wenks
+ * @date: 2024/2/1 15:01
+ **/
+
+@AllArgsConstructor
+@Getter
+public enum CarKindCode {
+
+    A0("A0", "客车"),
+    A1("A1", "警车"),
+    A2("A2", "普通救护车"),
+    A3("A3", "普通囚车"),
+    A4("A4", "普通殡葬车"),
+    G0("G0", "挂车"),
+    G1("G1", "罐式挂车"),
+    G2("G2", "特种二挂"),
+    G3("G3", "特种三挂"),
+    H0("H0", "载货机动车"),
+    H1("H1", "低速载货汽车"),
+    H2("H2", "三轮汽车"),
+    H3("H3", "厢式货车"),
+    H4("H4", "客货两用车"),
+    H5("H5", "半挂牵引车"),
+    H6("H6", "自卸车"),
+    H7("H7", "电瓶运输车"),
+    H8("H8", "起重运输车"),
+    J0("J0", "拖拉机"),
+    J1("J1", "大中型拖拉机"),
+    J2("J2", "联合收割机"),
+    J3("J3", "合规变拖"),
+    J4("J4", "超标变拖"),
+    M1("M1", "两轮摩托车"),
+    M5("M5", "正三轮摩托车"),
+    M6("M6", "侧三轮摩托车"),
+    N0("N0", "农用运输车"),
+    T1("T1", "起重车"),
+    T10("T10", "专用净水车"),
+    T11("T11", "罐式货车"),
+    T12("T12", "保温车"),
+    T13("T13", "推土车"),
+    T14("T14", "压路车"),
+    T15("T15", "矿山车"),
+    T16("T16", "油汽田操作用车"),
+    T17("T17", "清扫车"),
+    T18("T18", "水泥泵车"),
+    T19("T19", "牵引车"),
+    T2("T2", "装卸车"),
+    T20("T20", "清障车"),
+    T21("T21", "雷达车"),
+    T22("T22", "X光检测车"),
+    T23("T23", "电信工程车"),
+    T24("T24", "电力工程车"),
+    T25("T25", "专业拖车"),
+    T26("T26", "运钞车"),
+    T27("T27", "警用车"),
+    T3("T3", "工程车"),
+    T4("T4", "监测车"),
+    T5("T5", "邮电车"),
+    T6("T6", "消防车"),
+    T7("T7", "清洁车"),
+    T8("T8", "医疗车"),
+    T9("T9", "救护车"),
+    TA("TA", "一类特种车(油罐车、气罐车、液罐车、冷藏车)"),
+    TB("TB", "二类特种车(起重车、装卸车、工程车、监测车、邮电车、消防车、清洁车、医疗车、救护车)"),
+    TC("TC", "电视转播车"),
+    TD("TD", "升降车"),
+    TE("TE", "搅拌车"),
+    TF("TF", "挖掘车"),
+    TG("TG", "推土车"),
+    TH("TH", "压路车"),
+    TI("TI", "矿用车"),
+    TJ("TJ", "油汽田操作用车"),
+    TK("TK", "清扫车"),
+    TL("TL", "水泥泵车"),
+    TM("TM", "牵引车"),
+    TN("TN", "清障车"),
+    TO("TO", "雷达车"),
+    TP("TP", "油罐车"),
+    TQ("TQ", "气罐车"),
+    TR("TR", "液罐车"),
+    TS("TS", "冷藏车"),
+    TT("TT", "集装箱拖头"),
+    TU("TU", "X光检测车"),
+    TV("TV", "电信工程车"),
+    TW("TW", "电力工程车"),
+    TX("TX", "专业拖车"),
+    TY("TY", "运钞车"),
+    TZ("TZ", "警用车");
+
+    private final String code;
+
+    private final String desc;
+
+}