From 1819d1ab24de629a49280d5b3bb20369c5be97ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 4 Apr 2023 23:50:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jero/modules/ota/enums/OtaTitleEnum.java  | 6 +++---
 .../modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java    | 6 +++---
 .../modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java  | 2 +-
 .../java/com/jero/modules/ota/utils/ComparisonUtil.java     | 4 ++--
 4 files changed, 9 insertions(+), 9 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 6c63e7c5a..4bbe0526e 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
@@ -3,7 +3,7 @@ package com.jero.modules.ota.enums;
 public enum OtaTitleEnum {
 
 
-    CPDJBH("cpdjbh", "产品登记编号", "0", "Product registration number", 50),
+    CPDJBH("cpdjbh", "产品登记编号", "0", "Product registration number", 500),
     GGPC("ggpc", "公告批次", "0", "Notice batch", 500),
     CPSB("cpsb", "产品商标", "0", "Product Trademark", 50),
     CPMC("cpmc", "产品名称", "0", "Product Name", 50),
@@ -15,7 +15,7 @@ public enum OtaTitleEnum {
 
     CXMB("cxmb", "车型模板", "0", "Model template", 500),
     //    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),
     DLLX1("dllx1", "车辆动力类型", "0", "Vehicle Power Type", 50),
     DLLX2("dllx2", "车辆动力类型", "0", "Vehicle Power Type", 50),
@@ -151,7 +151,7 @@ public enum OtaTitleEnum {
     SJBBHCS("sjbbhcs", "软件版本（集）识别与存储", "0", "", 500),
 
 
-    BABH("babh", "备案编号", "0", "", 50),
+    BABH("babh", "备案编号", "0", "", 500),
     BAPC("bapc", "备案批次", "0", "", 50),
     ZSL("zsl", "总数量", "0", "", 50),
     SCRQKS("scrqks", "生产日期开始", "3", "", 0),
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 288849bb5..bef8b2448 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
@@ -232,10 +232,10 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
         Cell cell = row.getCell(1);
         String cpbh = ImportFileUtil.getCellValue(cell, wb);
         if (StringUtils.isEmpty(cpbh)) {
-            throw new JeroBootException("产品编号不能为空");
+            throw new JeroBootException("产品登记编号不能为空");
         }
-        if (cpbh.length() > 50) {
-            throw new JeroBootException("产品编号字数超过50");
+        if (cpbh.length() > 500) {
+            throw new JeroBootException("产品登记编号字数超过500");
         }
         jbxx.setDjbh(cpbh);
 
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 3801c6551..e6917e2ca 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
@@ -237,7 +237,7 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl<OtaBaSjSjmbcxMapper, O
         queryWrapper.eq(OtaBaCxJbxx::getGgpc, pc);
         OtaBaCxJbxx jbxx = otaBaCxJbxxService.getOne(queryWrapper, false);
         if (ObjectUtils.isEmpty(jbxx)) {
-            errMsg.append("车型及功能备案《公告》批次:" + pc + " 无法找到车型备案数据, ");
+            throw new JeroBootException("车型及功能备案《公告》批次:\" + pc + \" 无法找到车型备案数据");
         } else {
             mbcx.setCpsb(jbxx.getCpsb());
             mbcx.setCpmc(jbxx.getCpmc());
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java
index fb694b87c..43702ff83 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java
@@ -62,13 +62,13 @@ public class ComparisonUtil<T> {
     }
 
     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);
         return jl;
     }
 
     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);
         return jl;
     }