From ab38f28e70af5e9ffae0c3efa64912e1e6870b09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Sun, 2 Apr 2023 14:53:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=AF=E5=90=A6=E5=92=8C?= =?UTF-8?q?=E6=9C=89=E6=97=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/enums/OtaTitleEnum.java | 40 +++++----- .../impl/OtaBaCxJsfzbacsServiceImpl.java | 80 +++++++++---------- .../impl/OtaBaCxKsjjsmccsServiceImpl.java | 4 +- .../modules/ota/utils/ComparisonUtil.java | 17 +++- .../modules/ota/utils/ImportFileUtil.java | 38 +++++++++ 5 files changed, 115 insertions(+), 64 deletions(-) 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 ef7da7c50..634d15a91 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 @@ -55,7 +55,7 @@ public enum OtaTitleEnum { CZXTBBH("czxtbbh", "软件版本号", "0", "", 50), GNMC("gnmc", "功能名称", "0", "", 50), - PZQK("pzqk", "配置情况", "2", "", 0), + PZQK("pzqk", "配置情况", "1", "", 0), JSZDHJB("jszdhjb", "驾驶自动化级别", "driving_automation_level", "", 0), SJGGCS("sjggcs", "升级可能变更的《公告》技术参数", "0", "", 500), GNMS("gnms", "功能描述", "0", "", 500), @@ -64,81 +64,81 @@ public enum OtaTitleEnum { CSYZSJ("csyzsj", "初始软件包的完整性验证数据", "0", "", 500), FJ("fj", "附件", "0", "", 0), - WLAQYQ_PZ("jgldPz", "激光雷达-配置", "2", "", 0), + WLAQYQ_PZ("jgldPz", "激光雷达-配置", "1", "", 0), WLAQYQ_SL("jgldSl", "激光雷达-数量", "0", "", 50), WLAQYQ_BZWZ("jgldBzwz", "激光雷达-布置位置", "0", "", 50), WLAQYQ_GGXH("jgldGgxh", "激光雷达-规格型号", "0", "", 0), WLAQYQ_SCQY("jgldScqy", "激光雷达-生产企业", "0", "", 50), - HMBLD_PZ("hmbldPz", "毫米波雷达-配置", "2", "", 0), + HMBLD_PZ("hmbldPz", "毫米波雷达-配置", "1", "", 0), HMBLD_SL("hmbldSl", "毫米波雷达-数量", "0", "", 50), HMBLD_BZWZ("hmbldBzwz", "毫米波雷达-布置位置", "0", "", 50), HMBLD_GGXH("hmbldGgxh", "毫米波雷达-规格型号", "0", "", 50), HMBLD_SCQY("hmbldScqy", "毫米波雷达-生产企业", "0", "", 50), - CSBLD_PZ("csbldPz", "超声波雷达-配置", "2", "", 0), + CSBLD_PZ("csbldPz", "超声波雷达-配置", "1", "", 0), CSBLD_SL("csbldSl", "超声波雷达-数量", "0", "", 50), CSBLD_BZWZ("csbldBzwz", "超声波雷达-布置位置", "0", "", 50), CSBLD_GGXH("csbldGgxh", "超声波雷达-规格型号", "0", "", 50), CSBLD_SCQY("csbldScqy", "超声波雷达-生产企业", "0", "", 50), - SXTHS_PZ("sxthsPz", "摄像头-倒车影像/360(环视)-配置", "2", "", 0), + SXTHS_PZ("sxthsPz", "摄像头-倒车影像/360(环视)-配置", "1", "", 0), SXTHS_SL("sxthsSl", "摄像头-倒车影像/360(环视)-数量", "0", "", 50), SXTHS_BZWZ("sxthsBzwz", "摄像头-倒车影像/360(环视)-布置位置", "0", "", 50), SXTHS_GGXH("sxthsGgxh", "摄像头-倒车影像/360(环视)-规格型号", "0", "", 50), SXTHS_SCQY("sxthsScqy", "摄像头-倒车影像/360(环视)-生产企业", "0", "", 50), - SXTDSD_PZ("sxtdsdPz", "摄像头-单目/双目/多目-配置", "2", "", 50), + SXTDSD_PZ("sxtdsdPz", "摄像头-单目/双目/多目-配置", "1", "", 50), SXTDSD_SL("sxtdsdSl", "摄像头-单目双目多目-数量", "0", "", 50), SXTDSD_BZWZ("sxtdsdBzwz", "摄像头-单目双多目-布置位置", "0", "", 50), SXTDSD_GGXH("sxtdsdGgxh", "摄像头-单目/双目/多目-规格型号", "0", "", 50), SXTDSD_SCQY("sxtdsdScqy", "摄像头-单目/双目/多目-生产企业", "0", "", 50), - JSYJK_PZ("jsyjkPz", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-配置", "2", "", 0), + JSYJK_PZ("jsyjkPz", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-配置", "1", "", 0), JSYJK_SL("jsyjkSl", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-数量", "0", "", 50), JSYJK_BZWZ("jsyjkBzwz", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-布置位置", "0", "", 50), JSYJK_GGXH("jsyjkGgxh", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-规格型号", "0", "", 50), JSYJK_SCQY("jsyjkScqy", "驾驶员注意力监测系统DMS-驾驶员监控摄像头-生产企业", "0", "", 50), - JSYHW_PZ("jsyhwPz", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-配置", "2", "", 0), + JSYHW_PZ("jsyhwPz", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-配置", "1", "", 0), JSYHW_SL("jsyhwSl", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-数量", "0", "", 50), JSYHW_BZWZ("jsyhwBzwz", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-布置位置", "0", "", 50), JSYHW_GGXH("jsyhwGgxh", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-规格型号", "0", "", 50), JSYHW_SCQY("jsyhwScqy", "驾驶员注意力监测系统DMS-驾驶员监控红外传感器-生产企业", "0", "", 50), - CZWXDW_PZ("czwxdwPz", "定位及导航系统-车载卫星定位设备（接收卫星信号及辅助定位信号的装置，PPP/GNSS/RTK）-配置", "2", "", 0), + CZWXDW_PZ("czwxdwPz", "定位及导航系统-车载卫星定位设备（接收卫星信号及辅助定位信号的装置，PPP/GNSS/RTK）-配置", "1", "", 0), CZWXDW_GGXH("czwxdwGgxh", "定位及导航系统-车载卫星定位设备（接收卫星信号及辅助定位信号的装置，PPP/GNSS/RTK）-规格型号", "0", "", 50), CZWXDW_SCQY("czwxdwScqy", "定位及导航系统-车载卫星定位设备（接收卫星信号及辅助定位信号的装置，PPP/GNSS/RTK）-生产企业", "0", "", 50), - GXDH_PZ("gxdhPz", "定位及导航系统-惯性导航系统-配置", "2", "", 0), + GXDH_PZ("gxdhPz", "定位及导航系统-惯性导航系统-配置", "1", "", 0), GXDH_GGXH("gxdhGgxh", "定位及导航系统-惯性导航系统-规格型号", "0", "", 50), GXDH_SCQY("gxdhScqy", "定位及导航系统-惯性导航系统-生产企业", "0", "", 50), - LSJ_PZ("lsjPz", "定位及导航系统-轮速计-配置", "2", "", 0), + LSJ_PZ("lsjPz", "定位及导航系统-轮速计-配置", "1", "", 0), LSJ_GGXH("lsjGgxh", "定位及导航系统-轮速计-规格型号", "0", "", 50), LSJ_SCQY("lsjScqy", "定位及导航系统-轮速计-生产企业", "0", "", 50), - GJDDT_PZ("gjddtPz", "定位及导航系统-高精度地图-配置", "2", "", 0), + GJDDT_PZ("gjddtPz", "定位及导航系统-高精度地图-配置", "1", "", 0), GJDDT_GGXH("gjddtGgxh", "定位及导航系统-高精度地图-规格型号", "0", "", 50), GJDDT_SCQY("gjddtScqy", "定位及导航系统-高精度地图-生产企业", "0", "", 50), - DZWL_PZ("dzwlPz", "定位及导航系统-电子围栏-配置", "2", "", 0), + DZWL_PZ("dzwlPz", "定位及导航系统-电子围栏-配置", "1", "", 0), DZWL_DXXGCS("dzwlDxxgcs", "定位及导航系统-电子围栏-定性描述相关场所", "0", "", 50), - CZTX_PZ("cztxPz", "车载通信系统-配置", "2", "", 0), + CZTX_PZ("cztxPz", "车载通信系统-配置", "1", "", 0), CZTX_XTMC("cztxXtmc", "车载通信系统-系统名称", "0", "", 50), CZTX_GGXH("cztxGgxh", "车载通信系统-规格型号", "0", "", 50), CZTX_SCQY("cztxScqy", "车载通信系统-生产企业", "0", "", 50), CZTX_BBH("cztxBbh", "车载通信系统-版本号", "0", "", 50), CZTX_KFQY("cztxKfqy", "车载通信系统-软件开发企业", "0", "", 50), - JSFZCZJ_PZ("jsfzczjPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-配置", "2", "", 0), + JSFZCZJ_PZ("jsfzczjPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-配置", "1", "", 0), JSFZCZJ_MC("jsfzczjMc", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-操纵件名称", "0", "", 50), JSFZCZJ_YJXH("jsfzczjYjxh", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-硬件规格型号", "0", "", 50), JSFZCZJ_SCQY("jsfzczjScqy", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能操纵件-生产企业", "0", "", 50), - JSFZZSQ_PZ("jsfzzsqPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-配置", "2", "", 0), + JSFZZSQ_PZ("jsfzzsqPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-配置", "1", "", 0), JSFZZSQ_MC("jsfzzsqMc", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-指示器/信号装置名称", "0", "", 50), JSFZZSQ_YJXH("jsfzzsqYjxh", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-硬件规格型号", "0", "", 50), JSFZZSQ_SCQY("jsfzzsqScqy", "驾驶辅助系统操纵件、指示器及信号装置-驾驶辅助功能指示器/信号装置-生产企业", "0", "", 50), - FXPTSTS_PZ("fxptstsPz", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-配置", "2", "", 0), + FXPTSTS_PZ("fxptstsPz", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-配置", "1", "", 0), FXPTSTS_MC("fxptstsMc", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-指示器/信号装置名称", "0", "", 50), FXPTSTS_YJXH("fxptstsYjxh", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-硬件规格型号", "0", "", 50), FXPTSTS_SCQY("fxptstsScqy", "驾驶辅助系统操纵件、指示器及信号装置-方向盘脱手提示器/信号装置-生产企业", "0", "", 50), - JSYZYLTS_PZ("jsyzyltsPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-配置", "2", "", 0), + JSYZYLTS_PZ("jsyzyltsPz", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-配置", "1", "", 0), JSYZYLTS_MC("jsyzyltsMc", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-指示器/信号装置名称", "0", "", 50), JSYZYLTS_YJXH("jsyzyltsYjxh", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-硬件规格型号", "0", "", 50), JSYZYLTS_SCQY("jsyzyltsScqy", "驾驶辅助系统操纵件、指示器及信号装置-驾驶员注意力提醒指示器/信号装置-生产企业", "0", "", 50), - DSSAD_PZ("dssadPz", "自动驾驶数据记录系统(DSSAD)-系统配置", "2", "", 0), + DSSAD_PZ("dssadPz", "自动驾驶数据记录系统(DSSAD)-系统配置", "1", "", 0), DSSAD_GGXH("dssadGgxh", "自动驾驶数据记录系统(DSSAD)-规格型号", "0", "", 50), DSSAD_SCQY("dssadScqy", "自动驾驶数据记录系统(DSSAD)-生产企业", "0", "", 50), - EDR_PZ("edrPz", "事件数据记录系统(EDR)-配置", "2", "", 0), + EDR_PZ("edrPz", "事件数据记录系统(EDR)-配置", "1", "", 0), EDR_GGXH("edrGgxh", "事件数据记录系统(EDR)-规格型号", "0", "", 50), EDR_SCQY("edrScqy", "事件数据记录系统(EDR)-生产企业", "0", "", 50), 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 8aa311690..7d435a213 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 @@ -313,7 +313,7 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl { } public void checkAttError(String[] strs, StringBuilder errMsg, String title, String cut) { - for (String str:strs) { - if(!str.endsWith(".doc")&&!str.endsWith(".docx")&&!str.endsWith(".pdf")&&!str.endsWith(".DOC")&&!str.endsWith(".DOCX")&&!str.endsWith(".PDF")){ + for (String str : strs) { + if (!str.endsWith(".doc") && !str.endsWith(".docx") && !str.endsWith(".pdf") && !str.endsWith(".DOC") && !str.endsWith(".DOCX") && !str.endsWith(".PDF")) { errMsg.append(title + " 支持doc/docx/pdf格式 , "); } } @@ -203,6 +203,11 @@ public class ComparisonUtil { errMsg.append(title + " 的长度超过了 " + ote.getLen() + ", "); field.set(clazz, ""); } + } else if ("1".equals(ote.getType())) { + if (!"有".equals(str) && !"无".equals(str)) { + errMsg.append(title + " 必须填写是或否 , "); + field.set(clazz, ""); + } } else if ("2".equals(ote.getType())) { if (!"是".equals(str) && !"否".equals(str)) { errMsg.append(title + " 必须填写是或否 , "); @@ -285,6 +290,14 @@ public class ComparisonUtil { if (ObjectUtils.isNotEmpty(newVal)) { res = newVal.toString(); } + } else if ("1".equals(ote.getType())) { + if (ObjectUtils.isNotEmpty(newVal)) { + if ("1".equals(newVal.toString())) { + res = "有"; + } else if ("2".equals(newVal.toString())) { + res = "无"; + } + } } else if ("2".equals(ote.getType())) { if (ObjectUtils.isNotEmpty(newVal)) { if ("1".equals(newVal.toString())) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java index 9d05199bb..6660a0eef 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java @@ -164,6 +164,32 @@ public class ImportFileUtil { return res; } + + public static String getCellValueHaveOrNot(Cell cell, Workbook workbook) throws Exception { + String res = ""; + String str = getCellValue(cell, workbook); + if (StringUtils.isNotEmpty(str)) { + if (str.equals("有")) { + res = "1"; + } else if (str.equals("无")) { + res = "2"; + } + } + return res; + } + + public static String getCellValueHaveOrNotInt(Integer val) throws Exception { + String res = ""; + if (ObjectUtils.isNotEmpty(val)) { + if (val.equals(1)) { + res = "有"; + } else if (val.equals(2)) { + res = "无"; + } + } + return res; + } + public static String getCellValueYesOrNo(Cell cell, Workbook workbook) throws Exception { String res = ""; String str = getCellValue(cell, workbook); @@ -189,6 +215,18 @@ public class ImportFileUtil { return res; } + public static String getCellValueHaveOrNot(String str) throws Exception { + String res = ""; + if (StringUtils.isNotEmpty(str)) { + if (str.equals("1")) { + res = "有"; + } else if (str.equals("2")) { + res = "无"; + } + } + return res; + } + public static String getCellValueYesOrNo(String str) throws Exception { String res = ""; if (StringUtils.isNotEmpty(str)) {