QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

法规清单导入去掉英文

Browse Source
This commit is contained in:
梁琦涛
2024-08-08 09:11:11 +08:00
parent 29295a3721
commit cc847f6379
5 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java
+20 -20
View File
@@ -80,7 +80,7 @@ public class LawsMarketStandardDetail implements Serializable {
*/
@NotBlank(message = "标准编号不能为空")
@ApiModelProperty(value = "标准编号")
@Excel(name = "标准编号(Regulation No.)", width = 15)
@Excel(name = "标准编号", width = 15)
private String standardNumber;
/**
@@ -88,20 +88,20 @@ public class LawsMarketStandardDetail implements Serializable {
*/
@ApiModelProperty(value = "标准名称")
@NotBlank(message = "标准名称不能为空")
@Excel(name = "标准名称(Regulation Name)", width = 15)
@Excel(name = "标准名称", width = 15)
private String standardName;
/**
* 标准英文名称
*/
@ApiModelProperty(value = "标准英文名称")
@Excel(name = "标准英文名称(Regulation English Name)", width = 15)
@Excel(name = "标准英文名称", width = 15)
private String standardEnglishName;
/**
* 新生产车实施日期
*/
@Excel(name = "新生产车实施日期(New Production Vehicle Implementation Date)", width = 15)
@Excel(name = "新生产车实施日期", width = 15)
@NotBlank(message = "新生产车实施日期不能为空")
@ApiModelProperty(value = "新生产车实施日期")
private String newProductImplDate;
@@ -109,7 +109,7 @@ public class LawsMarketStandardDetail implements Serializable {
/**
* 新认证车实施日期
*/
@Excel(name = "新认证车实施日期(New Certified Vehicle Implementation Date)", width = 15)
@Excel(name = "新认证车实施日期", width = 15)
@NotBlank(message = "新认证车实施日期不能为空")
@ApiModelProperty(value = "新认证车实施日期")
private String newAuthImplDate;
@@ -117,7 +117,7 @@ public class LawsMarketStandardDetail implements Serializable {
/**
* 注册日期
*/
@Excel(name = "注册日期(Registration Date)", width = 15)
@Excel(name = "注册日期", width = 15)
@NotBlank(message = "注册日期不能为空")
@ApiModelProperty(value = "注册日期")
private String registrationDate;
@@ -125,7 +125,7 @@ public class LawsMarketStandardDetail implements Serializable {
/**
* 国家
*/
@Excel(name = "适用国家/地区(Country/Region)", width = 15,dicCode = "market_state")
@Excel(name = "适用国家/地区", width = 15,dicCode = "market_state")
@NotBlank(message = "适用国家/地区不能为空")
@ApiModelProperty(value = "国家")
@Dict(dicCode = "market_state")
@@ -134,7 +134,7 @@ public class LawsMarketStandardDetail implements Serializable {
/**
* 适用车型
*/
@Excel(name = "适用车型(Vehicle Category)", width = 15, dicCode = "applicable_vehicle_type")
@Excel(name = "适用车型", width = 15, dicCode = "applicable_vehicle_type")
@Dict(dicCode = "applicable_vehicle_type")
@ApiModelProperty(value = "适用车型")
private String applicableVehicle;
@@ -144,21 +144,21 @@ public class LawsMarketStandardDetail implements Serializable {
*/
@ApiModelProperty(value = "认证对象")
@Dict(dicCode = "authentication_object")
@Excel(name = "认证对象(Certification Item)", width = 15, dicCode = "authentication_object")
@Excel(name = "认证对象", width = 15, dicCode = "authentication_object")
private String authenticationObject;
/**
* 认证交付物
*/
@ApiModelProperty(value = "认证交付物")
@Excel(name = "认证交付物(Verification)", width = 15)
@Excel(name = "认证交付物", width = 15)
private String certifyTheDeliverables;
/**
* 类型
*/
@Dict(dicCode = "type")
@Excel(name = "类型(Requirement Category)", width = 15, dicCode = "type")
@Excel(name = "类型", width = 15, dicCode = "type")
@ApiModelProperty(value = "类型")
private String type;
@@ -167,7 +167,7 @@ public class LawsMarketStandardDetail implements Serializable {
*/
@Dict(dicCode = "dynamic_type")
@ApiModelProperty(value = "动力类型")
@Excel(name = "动力类型(Power Propulsion Type)", width = 15, dicCode = "dynamic_type")
@Excel(name = "动力类型", width = 15, dicCode = "dynamic_type")
private String dynamicType;
/**
@@ -176,7 +176,7 @@ public class LawsMarketStandardDetail implements Serializable {
@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@ApiModelProperty(value = "主控部门")
@NotBlank(message = "主控部门不能为空")
@Excel(name = "主控部门(Main Responsible Dept.)", width = 15,dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@Excel(name = "主控部门", width = 15,dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
private String mainDept;
/**
@@ -185,7 +185,7 @@ public class LawsMarketStandardDetail implements Serializable {
@ApiModelProperty(value = "主控部门专业模块")
@NotBlank(message = "主控部门专业模块不能为空")
@Dict(dicCode = "professional_module")
@Excel(name = "主控部门专业模块(Module of Main Responsible Dept.)", width = 15, dicCode = "professional_module")
@Excel(name = "主控部门专业模块", width = 15, dicCode = "professional_module")
private String mainDeptProfMode;
/**
@@ -193,14 +193,14 @@ public class LawsMarketStandardDetail implements Serializable {
*/
@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@ApiModelProperty(value = "关联部门")
@Excel(name = "关联部门(Related Dept.)", width = 15,dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@Excel(name = "关联部门", width = 15,dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
private String associateDept;
/**
* 关联部门专业模块
*/
@ApiModelProperty(value = "关联部门专业模块")
@Excel(name = "关联部门专业模块(Module of Related Dept.)", width = 15, dicCode = "professional_module")
@Excel(name = "关联部门专业模块", width = 15, dicCode = "professional_module")
@Dict(dicCode = "professional_module")
private String associateDeptProfMode;
@@ -208,7 +208,7 @@ public class LawsMarketStandardDetail implements Serializable {
* 批量限制
*/
@ApiModelProperty(value = "批量限制")
@Excel(name = "批量限制(Production Amount)", width = 15, dicCode = "batch_restriction")
@Excel(name = "批量限制", width = 15, dicCode = "batch_restriction")
@Dict(dicCode = "batch_restriction")
private String batchLimit;
@@ -217,7 +217,7 @@ public class LawsMarketStandardDetail implements Serializable {
*/
@Dict(dicCode = "automatic_driving_level")
@ApiModelProperty(value = "自动驾驶等级")
@Excel(name = "自动驾驶等级(Automatic Driving Level)", width = 15,dicCode = "automatic_driving_level")
@Excel(name = "自动驾驶等级", width = 15,dicCode = "automatic_driving_level")
private String autopilotLevel;
/**
@@ -225,13 +225,13 @@ public class LawsMarketStandardDetail implements Serializable {
*/
@Dict(dicCode = "requirement_type")
@ApiModelProperty(value = "要求类型")
@Excel(name = "要求类型(Optional/Compulsory)", width = 15,dicCode = "requirement_type")
@Excel(name = "要求类型", width = 15,dicCode = "requirement_type")
private String requireType;
/**
* 备注
*/
@ApiModelProperty(value = "备注")
@Excel(name = "备注(Note)", width = 15)
@Excel(name = "备注", width = 15)
private String remark;
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetailExcel.java
+20 -20
View File
@@ -78,7 +78,7 @@ public class LawsMarketStandardDetailExcel implements Serializable {
*/
@NotBlank(message = "标准编号不能为空")
@ApiModelProperty(value = "标准编号")
@Excel(name = "*标准编号(Regulation No.)", width = 15)
@Excel(name = "*标准编号", width = 15)
private String standardNumber;
/**
@@ -86,20 +86,20 @@ public class LawsMarketStandardDetailExcel implements Serializable {
*/
@ApiModelProperty(value = "标准名称")
@NotBlank(message = "标准名称不能为空")
@Excel(name = "*标准名称(Regulation Name)", width = 15)
@Excel(name = "*标准名称", width = 15)
private String standardName;
/**
* 标准英文名称
*/
@ApiModelProperty(value = "标准英文名称")
@Excel(name = "标准英文名称(Regulation English Name)", width = 15)
@Excel(name = "标准英文名称", width = 15)
private String standardEnglishName;
/**
* 新生产车实施日期
*/
@Excel(name = "*新生产车实施日期(New Production Vehicle Implementation Date)", width = 15)
@Excel(name = "*新生产车实施日期", width = 15)
@NotBlank(message = "新生产车实施日期不能为空")
@ApiModelProperty(value = "新生产车实施日期")
private String newProductImplDate;
@@ -107,7 +107,7 @@ public class LawsMarketStandardDetailExcel implements Serializable {
/**
* 新认证车实施日期
*/
@Excel(name = "*新认证车实施日期(New Certified Vehicle Implementation Date)", width = 15)
@Excel(name = "*新认证车实施日期", width = 15)
@NotBlank(message = "新认证车实施日期不能为空")
@ApiModelProperty(value = "新认证车实施日期")
private String newAuthImplDate;
@@ -115,7 +115,7 @@ public class LawsMarketStandardDetailExcel implements Serializable {
/**
* 注册日期
*/
@Excel(name = "*注册日期(Registration Date)", width = 15)
@Excel(name = "*注册日期", width = 15)
@NotBlank(message = "注册日期不能为空")
@ApiModelProperty(value = "注册日期")
private String registrationDate;
@@ -123,7 +123,7 @@ public class LawsMarketStandardDetailExcel implements Serializable {
/**
* 国家
*/
@Excel(name = "*适用国家/地区(Country/Region)", width = 15,dicCode = "market_state")
@Excel(name = "*适用国家/地区", width = 15,dicCode = "market_state")
@NotBlank(message = "适用国家/地区不能为空")
@ApiModelProperty(value = "国家")
@Dict(dicCode = "market_state")
@@ -132,7 +132,7 @@ public class LawsMarketStandardDetailExcel implements Serializable {
/**
* 适用车型
*/
@Excel(name = "适用车型(Vehicle Category)", width = 15, dicCode = "applicable_vehicle_type")
@Excel(name = "适用车型", width = 15, dicCode = "applicable_vehicle_type")
@Dict(dicCode = "applicable_vehicle_type")
@ApiModelProperty(value = "适用车型")
private String applicableVehicle;
@@ -143,21 +143,21 @@ public class LawsMarketStandardDetailExcel implements Serializable {
*/
@ApiModelProperty(value = "认证对象")
@Dict(dicCode = "authentication_object")
@Excel(name = "认证对象(Certification Item)", width = 15, dicCode = "authentication_object")
@Excel(name = "认证对象", width = 15, dicCode = "authentication_object")
private String authenticationObject;
/**
* 认证交付物
*/
@ApiModelProperty(value = "认证交付物")
@Excel(name = "认证交付物(Verification)", width = 15)
@Excel(name = "认证交付物", width = 15)
private String certifyTheDeliverables;
/**
* 类型
*/
@Dict(dicCode = "type")
@Excel(name = "类型(Requirement Category)", width = 15, dicCode = "type")
@Excel(name = "类型", width = 15, dicCode = "type")
@ApiModelProperty(value = "类型")
private String type;
@@ -166,7 +166,7 @@ public class LawsMarketStandardDetailExcel implements Serializable {
*/
@Dict(dicCode = "dynamic_type")
@ApiModelProperty(value = "动力类型")
@Excel(name = "动力类型(Power Propulsion Type)", width = 15, dicCode = "dynamic_type")
@Excel(name = "动力类型", width = 15, dicCode = "dynamic_type")
private String dynamicType;
/**
@@ -175,7 +175,7 @@ public class LawsMarketStandardDetailExcel implements Serializable {
@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@ApiModelProperty(value = "主控部门")
@NotBlank(message = "主控部门不能为空")
@Excel(name = "*主控部门(Main Responsible Dept.)", width = 15,dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@Excel(name = "*主控部门", width = 15,dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
private String mainDept;
/**
@@ -184,7 +184,7 @@ public class LawsMarketStandardDetailExcel implements Serializable {
@ApiModelProperty(value = "主控部门专业模块")
@NotBlank(message = "主控部门专业模块不能为空")
@Dict(dicCode = "professional_module")
@Excel(name = "*主控部门专业模块(Module of Main Responsible Dept.)", width = 15, dicCode = "professional_module")
@Excel(name = "*主控部门专业模块", width = 15, dicCode = "professional_module")
private String mainDeptProfMode;
/**
@@ -192,14 +192,14 @@ public class LawsMarketStandardDetailExcel implements Serializable {
*/
@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@ApiModelProperty(value = "关联部门")
@Excel(name = "关联部门(Related Dept.)", width = 15,dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@Excel(name = "关联部门", width = 15,dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
private String associateDept;
/**
* 关联部门专业模块
*/
@ApiModelProperty(value = "关联部门专业模块")
@Excel(name = "关联部门专业模块(Module of Related Dept.)", width = 15, dicCode = "professional_module")
@Excel(name = "关联部门专业模块", width = 15, dicCode = "professional_module")
@Dict(dicCode = "professional_module")
private String associateDeptProfMode;
@@ -207,7 +207,7 @@ public class LawsMarketStandardDetailExcel implements Serializable {
* 批量限制
*/
@ApiModelProperty(value = "批量限制")
@Excel(name = "批量限制(Production Amount)", width = 15, dicCode = "batch_restriction")
@Excel(name = "批量限制", width = 15, dicCode = "batch_restriction")
@Dict(dicCode = "batch_restriction")
private String batchLimit;
@@ -216,7 +216,7 @@ public class LawsMarketStandardDetailExcel implements Serializable {
*/
@Dict(dicCode = "automatic_driving_level")
@ApiModelProperty(value = "自动驾驶等级")
@Excel(name = "自动驾驶等级(Automatic Driving Level)", width = 15,dicCode = "automatic_driving_level")
@Excel(name = "自动驾驶等级", width = 15,dicCode = "automatic_driving_level")
private String autopilotLevel;
/**
@@ -224,14 +224,14 @@ public class LawsMarketStandardDetailExcel implements Serializable {
*/
@Dict(dicCode = "requirement_type")
@ApiModelProperty(value = "要求类型")
@Excel(name = "要求类型(Optional/Compulsory)", width = 15,dicCode = "requirement_type")
@Excel(name = "要求类型", width = 15,dicCode = "requirement_type")
private String requireType;
/**
* 备注
*/
@ApiModelProperty(value = "备注")
@Excel(name = "备注(Note)", width = 15)
@Excel(name = "备注", width = 15)
private String remark;
laws-modules/src/main/java/com/jero/modules/laws/utils/ValidUtil.java
+4 -4
View File
@@ -108,10 +108,10 @@ public class ValidUtil {
if(Objects.equals(constraintViolation.getPropertyPath().toString(),field.getName())){
if (field.isAnnotationPresent(Excel.class) && field.isAnnotationPresent(NotBlank.class)) {
String name = field.getAnnotation(Excel.class).name();
String[] str1 = name.split("\\(");
String en = str1.length > 1 ? str1[1].split("\\)")[0] : str1[0];
String zh = str1[0];
name = Objects.equals(locale,Locale.ENGLISH) ? en : zh;
// String[] str1 = name.split("\\(");
// String en = str1.length > 1 ? str1[1].split("\\)")[0] : str1[0];
// String zh = str1[0];
// name = Objects.equals(locale,Locale.ENGLISH) ? en : zh;
msg.append(MessageUtils.getMessage(ResultCommon.EMPTY_COMMON,name)).append(",");
}
}