WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改OTA

Browse Source
This commit is contained in:
高嵩
2023-04-04 23:50:23 +08:00
parent 5675ff6809
commit 1819d1ab24
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java
+3 -3
View File
@@ -3,7 +3,7 @@ package com.jero.modules.ota.enums;
public enum OtaTitleEnum { public enum OtaTitleEnum {
CPDJBH("cpdjbh", "产品登记编号", "0", "Product registration number", 50), CPDJBH("cpdjbh", "产品登记编号", "0", "Product registration number", 500),
GGPC("ggpc", "公告批次", "0", "Notice batch", 500), GGPC("ggpc", "公告批次", "0", "Notice batch", 500),
CPSB("cpsb", "产品商标", "0", "Product Trademark", 50), CPSB("cpsb", "产品商标", "0", "Product Trademark", 50),
CPMC("cpmc", "产品名称", "0", "Product Name", 50), CPMC("cpmc", "产品名称", "0", "Product Name", 50),
@@ -15,7 +15,7 @@ public enum OtaTitleEnum {
CXMB("cxmb", "车型模板", "0", "Model template", 500), CXMB("cxmb", "车型模板", "0", "Model template", 500),
// QYMC("qymc", "企业名称", "0","enterprise name ",0), // QYMC("qymc", "企业名称", "0","enterprise name ",0),
DJBH("djbh", "产品登记编号", "0", "Product Registration Number ", 50), DJBH("djbh", "产品登记编号", "0", "Product Registration Number ", 500),
CPLB("cplb", "产品类别", "product_category", "Product category", 0), CPLB("cplb", "产品类别", "product_category", "Product category", 0),
DLLX1("dllx1", "车辆动力类型", "0", "Vehicle Power Type", 50), DLLX1("dllx1", "车辆动力类型", "0", "Vehicle Power Type", 50),
DLLX2("dllx2", "车辆动力类型", "0", "Vehicle Power Type", 50), DLLX2("dllx2", "车辆动力类型", "0", "Vehicle Power Type", 50),
@@ -151,7 +151,7 @@ public enum OtaTitleEnum {
SJBBHCS("sjbbhcs", "软件版本（集）识别与存储", "0", "", 500), SJBBHCS("sjbbhcs", "软件版本（集）识别与存储", "0", "", 500),
BABH("babh", "备案编号", "0", "", 50), BABH("babh", "备案编号", "0", "", 500),
BAPC("bapc", "备案批次", "0", "", 50), BAPC("bapc", "备案批次", "0", "", 50),
ZSL("zsl", "总数量", "0", "", 50), ZSL("zsl", "总数量", "0", "", 50),
SCRQKS("scrqks", "生产日期开始", "3", "", 0), SCRQKS("scrqks", "生产日期开始", "3", "", 0),
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java
+3 -3
View File
@@ -232,10 +232,10 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
Cell cell = row.getCell(1); Cell cell = row.getCell(1);
String cpbh = ImportFileUtil.getCellValue(cell, wb); String cpbh = ImportFileUtil.getCellValue(cell, wb);
if (StringUtils.isEmpty(cpbh)) { if (StringUtils.isEmpty(cpbh)) {
throw new JeroBootException("产品编号不能为空"); throw new JeroBootException("产品登记编号不能为空");
} }
if (cpbh.length() > 50) { if (cpbh.length() > 500) {
throw new JeroBootException("产品编号字数超过50"); throw new JeroBootException("产品登记编号字数超过500");
} }
jbxx.setDjbh(cpbh); jbxx.setDjbh(cpbh);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java
+1 -1
View File
@@ -237,7 +237,7 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl<OtaBaSjSjmbcxMapper, O
queryWrapper.eq(OtaBaCxJbxx::getGgpc, pc); queryWrapper.eq(OtaBaCxJbxx::getGgpc, pc);
OtaBaCxJbxx jbxx = otaBaCxJbxxService.getOne(queryWrapper, false); OtaBaCxJbxx jbxx = otaBaCxJbxxService.getOne(queryWrapper, false);
if (ObjectUtils.isEmpty(jbxx)) { if (ObjectUtils.isEmpty(jbxx)) {
errMsg.append("车型及功能备案《公告》批次:" + pc + " 无法找到车型备案数据, "); throw new JeroBootException("车型及功能备案《公告》批次:\" + pc + \" 无法找到车型备案数据");
} else { } else {
mbcx.setCpsb(jbxx.getCpsb()); mbcx.setCpsb(jbxx.getCpsb());
mbcx.setCpmc(jbxx.getCpmc()); mbcx.setCpmc(jbxx.getCpmc());
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java
+2 -2
View File
@@ -62,13 +62,13 @@ public class ComparisonUtil<T> {
} }
public OtaBaCxTxjl addAttRecord(String otaId, OtaModuleEnum otaModuleEnum, String title, String attName) { public OtaBaCxTxjl addAttRecord(String otaId, OtaModuleEnum otaModuleEnum, String title, String attName) {
String content = title + "中添加了附件:'" + attName + ","; String content = title + "中添加了附件:'" + attName + "'";
OtaBaCxTxjl jl = new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content); OtaBaCxTxjl jl = new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content);
return jl; return jl;
} }
public OtaBaCxTxjl delAttRecord(String otaId, OtaModuleEnum otaModuleEnum, String title, String attName) { public OtaBaCxTxjl delAttRecord(String otaId, OtaModuleEnum otaModuleEnum, String title, String attName) {
String content = title + "中删除了附件:'" + attName + ","; String content = title + "中删除了附件:'" + attName + "'";
OtaBaCxTxjl jl = new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content); OtaBaCxTxjl jl = new OtaBaCxTxjl(otaId, otaModuleEnum.getName(), content);
return jl; return jl;
} }