diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjyxpg.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjyxpg.java index ba3534c99..cb092367c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjyxpg.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjyxpg.java @@ -109,7 +109,14 @@ public class OtaBaSjSjyxpg implements Serializable { @Dict(dicCode = "upgrade_failed") private java.lang.String aqjz; - /**升级活动是否影响车辆安全*/ + + /**升级失败或中断后_文本框*/ + @Excel(name = "升级失败或中断后_文本框", width = 15) + @ApiModelProperty(value = "升级失败或中断后_文本框") + private java.lang.String aqjzWbk; + + + /**升级活动是否影响车辆安全*/ @Excel(name = "升级活动是否影响车辆安全", width = 15) @ApiModelProperty(value = "升级活动是否影响车辆安全") private java.lang.Integer sfyxaq; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java index 4b5e5cad3..855ce20b3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java @@ -165,6 +165,7 @@ public enum OtaTitleEnum { JRXXG("jrxxg", "兼容性评估相关", "2", "", 0), ZXSJ("zxsj", "如何执行升级", "conditions_upgrades", "", 0), AQJZ("aqjz", "升级失败或中断后,车辆采取的安全机制", "upgrade_failed", "", 0), + AQJZWBK("aqjzWbk", "升级失败或中断后,车辆采取的安全机制-文本框", "0", "", 1000), SFYXAQ("sfyxaq", "升级活动是否影响车辆安全", "2", "", 0), YHQR("yhqr", "升级活动是否提供用户确认选项", "2", "", 0), SJBCS("sjbcs", "升级包测试", "package_test", "", 0), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java index e6736d272..5021e2b95 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java @@ -221,9 +221,13 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { File upFile = null; for (File f : upLoadFiles) { - if (f.getName().equals("车型基本信息.xlsx")) { - upFile = f; + if (f.isDirectory() && f.getName().equals("车型基本信息")) { + for (File f1 : f.listFiles()) { + if (f1.getName().equals("车型基本信息.xlsx")) { + upFile = f1; + } + } } } if (null == upFile) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java index 6adca19af..04df42083 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java @@ -274,8 +274,12 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { File upFile = null; for (File f : upLoadFiles) { - if (f.getName().equals("驾驶辅助系统基础备案参数.xlsx")) { - upFile = f; + if (f.isDirectory() && f.getName().equals("驾驶辅助系统基础备案参数")) { + for (File f1 : f.listFiles()) { + if (f1.getName().equals("驾驶辅助系统基础备案参数.xlsx")) { + upFile = f1; + } + } } } if (null == upFile) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java index 946350682..b1671b877 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java @@ -245,9 +245,13 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { File upFile = null; for (File f : upLoadFiles) { - if (f.getName().equals("本次升级的驾驶辅助功能名称与参数变化.xlsx")) { - upFile = f; + if (f.isDirectory() && f.getName().equals("本次升级的驾驶辅助功能名称与参数变化")) { + for (File f1 : f.listFiles()) { + if (f1.getName().equals("本次升级的驾驶辅助功能名称与参数变化.xlsx")) { + upFile = f1; + } + } } } if (null == upFile) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java index 22d14668c..22cdf4d23 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java @@ -184,8 +184,12 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { File upFile = null; for (File f : upLoadFiles) { - if (f.getName().equals("本次升级的目标车辆.xlsx")) { - upFile = f; + if (f.isDirectory() && f.getName().equals("本次升级的目标车辆")) { + for (File f1 : f.listFiles()) { + if (f1.getName().equals("本次升级的目标车辆.xlsx")) { + upFile = f1; + } + } } } if (null == upFile) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java index 1469ad627..25e6ded50 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java @@ -190,8 +190,12 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { File upFile = null; for (File f : upLoadFiles) { - if (f.getName().equals("升级目标车型.xlsx")) { - upFile = f; + if (f.isDirectory() && f.getName().equals("升级目标车型")) { + for (File f1 : f.listFiles()) { + if (f1.getName().equals("升级目标车型.xlsx")) { + upFile = f1; + } + } } } if (null == upFile) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java index 000e93844..c337efadd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java @@ -222,8 +222,12 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { File upFile = null; for (File f : upLoadFiles) { - if (f.getName().equals("本次升级的系统名称与参数变化.xlsx")) { - upFile = f; + if (f.isDirectory() && f.getName().equals("本次升级的系统名称与参数变化")) { + for (File f1 : f.listFiles()) { + if (f1.getName().equals("本次升级的系统名称与参数变化.xlsx")) { + upFile = f1; + } + } } } if (null == upFile) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java index 9adcbf67a..e857ead96 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java @@ -164,6 +164,7 @@ public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl file, String fileName) throws Exception {