diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGgnrfs.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGgnrfs.java index e30344cd0..bf9b04d3a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGgnrfs.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGgnrfs.java @@ -99,17 +99,17 @@ public class OtaBaSjGgnrfs implements Serializable { /**告知用户升级成功或失败*/ @Excel(name = "告知用户升级成功或失败", width = 15) @ApiModelProperty(value = "告知用户升级成功或失败") - private java.lang.String sjsfcg; + private java.lang.Integer sjsfcg; /**告知实施的变更*/ @Excel(name = "告知实施的变更", width = 15) @ApiModelProperty(value = "告知实施的变更") - private java.lang.String gzbg; + private java.lang.Integer gzbg; /**告知了对用户手册的全部更新内容*/ @Excel(name = "告知了对用户手册的全部更新内容", width = 15) @ApiModelProperty(value = "告知了对用户手册的全部更新内容") - private java.lang.String gzscnr; + private java.lang.Integer gzscnr; /**告知用户方式(可多选)*/ @Excel(name = "告知用户方式(可多选)", width = 15) 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 a21dd644d..ba3534c99 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 @@ -75,33 +75,33 @@ public class OtaBaSjSjyxpg implements Serializable { /**是否变更对应车型的《公告》技术参数*/ @Excel(name = "是否变更对应车型的《公告》技术参数", width = 15) @ApiModelProperty(value = "是否变更对应车型的《公告》技术参数") - private java.lang.String sfbgcs; + private java.lang.Integer sfbgcs; /**是否涉及性能变化*/ @Excel(name = "是否涉及性能变化", width = 15) @ApiModelProperty(value = "是否涉及性能变化") - private java.lang.String sjxnbh; + private java.lang.Integer sjxnbh; /**是否符合国家法律、行政法规、规章规定,以及道路机动车辆公告管理相关国家技术标准及安全技术条件等*/ @Excel(name = "是否符合国家法律、行政法规、规章规定,以及道路机动车辆公告管理相关国家技术标准及安全技术条件等", width = 15) @ApiModelProperty(value = "是否符合国家法律、行政法规、规章规定,以及道路机动车辆公告管理相关国家技术标准及安全技术条件等") - private java.lang.String fhgd; + private java.lang.Integer fhgd; /**是否涉及汽车自动驾驶功能相关升级*/ @Excel(name = "是否涉及汽车自动驾驶功能相关升级", width = 15) @ApiModelProperty(value = "是否涉及汽车自动驾驶功能相关升级") - private java.lang.String zdjsxg; + private java.lang.Integer zdjsxg; /**兼容性评估相关*/ @Excel(name = "兼容性评估相关", width = 15) @ApiModelProperty(value = "兼容性评估相关") - private java.lang.String jrxxg; + private java.lang.Integer jrxxg; /**如何执行升级*/ @Excel(name = "如何执行升级", width = 15) @ApiModelProperty(value = "如何执行升级") @Dict(dicCode = "conditions_upgrades") - private java.lang.String zxsj; + private java.lang.Integer zxsj; /**升级失败或中断后,车辆采取的安全机制*/ @Excel(name = "升级失败或中断后,车辆采取的安全机制", width = 15) @@ -112,12 +112,12 @@ public class OtaBaSjSjyxpg implements Serializable { /**升级活动是否影响车辆安全*/ @Excel(name = "升级活动是否影响车辆安全", width = 15) @ApiModelProperty(value = "升级活动是否影响车辆安全") - private java.lang.String sfyxaq; + private java.lang.Integer sfyxaq; /**升级活动是否提供用户确认选项*/ @Excel(name = "升级活动是否提供用户确认选项", width = 15) @ApiModelProperty(value = "升级活动是否提供用户确认选项") - private java.lang.String yhqr; + private java.lang.Integer yhqr; /**升级包测试*/ @Excel(name = "升级包测试", width = 15) @@ -128,7 +128,7 @@ public class OtaBaSjSjyxpg implements Serializable { /**是杏已验证确认在线升级活动的安全性和可靠性*/ @Excel(name = "是杏已验证确认在线升级活动的安全性和可靠性", width = 15) @ApiModelProperty(value = "是杏已验证确认在线升级活动的安全性和可靠性") - private java.lang.String aqkkx; + private java.lang.Integer aqkkx; /**提供变更或扩展后的《公告》批次及证明材料*/ @Excel(name = "提供变更或扩展后的《公告》批次及证明材料", width = 15) 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 63696717d..a15d769fb 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 @@ -163,6 +163,9 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaCxAqcs::getOtaId, otaId); return this.getOne(queryWrapper, false); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java index 1dd502db9..50470134a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java @@ -156,6 +156,9 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaCxJbxx::getOtaId, otaId); return this.getOne(queryWrapper, false); 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 706170a73..7b1643198 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 @@ -236,6 +236,9 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaCxJsfzbacs::getOtaId, otaId); return this.getOne(queryWrapper, false); 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 9c3d2722e..2e08de9a6 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 @@ -195,6 +195,9 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl getByOtaId(String otaId) { + if(org.apache.commons.lang3.StringUtils.isEmpty(otaId)){ + return null; + } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaCxKsjjsmccs::getOtaId, otaId); return this.list(queryWrapper); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java index 843ec4da0..fc1be2573 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java @@ -193,6 +193,9 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl getByOtaId(String otaId) { + if(org.apache.commons.lang3.StringUtils.isEmpty(otaId)){ + return null; + } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaCxKsjxtmccs::getOtaId, otaId); return this.list(queryWrapper); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxQtServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxQtServiceImpl.java index bf26c78ac..73cbf9e59 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxQtServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxQtServiceImpl.java @@ -127,6 +127,9 @@ public class OtaBaCxQtServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaCxQt::getOtaId, otaId); return this.getOne(queryWrapper, false); 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 d74075955..c45ce3849 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 @@ -131,6 +131,9 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaSjSjmbcl::getOtaId, otaId); return this.getOne(queryWrapper, false); 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 36d90192f..7d2ad60d2 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 @@ -139,6 +139,9 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaSjSjmbcx::getOtaId, otaId); return this.getOne(queryWrapper, false); 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 06ac57f12..a71537d20 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 @@ -128,6 +128,9 @@ public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OtaBaSjSjyxpg::getOtaId, otaId); return this.getOne(queryWrapper, false);