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 1e72122b2..6c63e7c5a 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 @@ -183,7 +183,7 @@ public enum OtaTitleEnum { CSRJSJ("csrjsj", "初始软件包的完整性数据", "0", "", 500), SJBYZSJ("sjbyzsj", "升级包完整性验证数据", "0", "", 500), SJBDX("sjbdx", "升级包大小", "0", "", 50), - SFCFSJ("sfcfsj", "是否差分升级", "0", "", 50), + SFCFSJ("sfcfsj", "是否差分升级", "2", "", 0), SJMDLX("sjmdlx", "升级目的类型", "0", "", 50), GNBGMS("gnbgms", "功能变更描述", "0", "", 500), SYTJBG("sytjbg", "适用条件变更", "0", "", 500), 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 1b88b984f..ddfe59dee 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 @@ -74,6 +74,9 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl setDefault(String otaId) { + List list = this.getByOtaId(otaId); + Date now = new Date(); + OtaBaSjSjxtbh bh = new OtaBaSjSjxtbh(); + bh.setOtaId(otaId); + bh.setSjkzqmc("ADC ADAS主控制器"); + bh.setCreateTime(now); + bh.setId(UUID.randomUUID().toString().replace("-", "")); + list.add(bh); + saveBatch(list); + return list; + } + public void deleteByOtaId(String otaId) { List list = this.getByOtaId(otaId); List ids = new ArrayList<>(); @@ -183,6 +199,9 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); - parseFileList(upLoadFiles, otaId, cut,errMsg); + parseFileList(upLoadFiles, otaId, cut, errMsg); } @Override - public void parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception{ + public void parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { File upFile = null; for (File f : upLoadFiles) { if (f.getName().equals("本次升级的系统名称与变更参数.xlsx")) { @@ -221,7 +240,7 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl newList = parseFile(upFile, otaId, cut,errMsg); + List newList = parseFile(upFile, otaId, cut, errMsg); List oldList = getByOtaId(otaId); if (ObjectUtils.isEmpty(oldList)) { oldList = new ArrayList<>(); @@ -233,7 +252,7 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl parseFile(File upFile, String otaId, String cut, StringBuilder errMsg) throws Exception{ + private List parseFile(File upFile, String otaId, String cut, StringBuilder errMsg) throws Exception { Date now = new Date(); List list = new ArrayList<>(); Workbook wb = ImportFileUtil.readExcel(upFile); @@ -270,7 +289,7 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl