From de36634e1df6daa85e0083627e0027c177fd6154 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Sun, 2 Apr 2023 19:56:46 +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

---
 .../ota/controller/OtaBaCxJbxxController.java       |  2 +-
 .../com/jero/modules/ota/enums/OtaTitleEnum.java    |  2 +-
 .../ota/service/impl/OtaBaCxJbxxServiceImpl.java    |  4 ++--
 .../service/impl/OtaBaCxJsfzbacsServiceImpl.java    | 13 ++++++-------
 .../ota/service/impl/OtaBaCxSjmkServiceImpl.java    |  7 ++++---
 .../ota/service/impl/OtaBaSjGgnrfsServiceImpl.java  |  6 ++++++
 .../ota/service/impl/OtaBaSjSjmbcxServiceImpl.java  |  2 +-
 .../ota/service/impl/OtaBaSjSjyxpgServiceImpl.java  | 11 +++++++++--
 .../com/jero/modules/ota/utils/ImportFileUtil.java  |  6 +++---
 9 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java
index 42da08099..8127b0c46 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java
@@ -213,7 +213,7 @@ public class OtaBaCxJbxxController extends JeroController<OtaBaCxJbxx, IOtaBaCxJ
             e.printStackTrace();
             return Result.error(e.getMessage());
         }
-        return Result.OK().success(errMsg.toString());
+        return Result.OK(res).success(errMsg.toString());
     }
 
 }
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 634d15a91..1e72122b2 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
@@ -184,7 +184,7 @@ public enum OtaTitleEnum {
     SJBYZSJ("sjbyzsj", "升级包完整性验证数据", "0", "", 500),
     SJBDX("sjbdx", "升级包大小", "0", "", 50),
     SFCFSJ("sfcfsj", "是否差分升级", "0", "", 50),
-    SJMDLX("sjmdlx", "升级目的类型", "0", "", 0),
+    SJMDLX("sjmdlx", "升级目的类型", "0", "", 50),
     GNBGMS("gnbgms", "功能变更描述", "0", "", 500),
     SYTJBG("sytjbg", "适用条件变更", "0", "", 500),
     SJSJKZQ("sjsjkzq", "升级涉及的电子控制器", "0", "", 500),
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 e5c2474bf..de4757b51 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
@@ -89,7 +89,7 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
             if (StringUtils.isNotEmpty(ggpc)) {
                 List<OtaBaCxJbxx> xxList = this.list();
                 for (OtaBaCxJbxx xx : xxList) {
-                    if (xx.getOtaId() != otaBaCxJbxx.getOtaId() && ggpc.equals(xx.getGgpc())) {
+                    if (!xx.getOtaId().equals(otaBaCxJbxx.getOtaId()) && ggpc.equals(xx.getGgpc())) {
                         throw new JeroBootException("公告批次重复");
                     }
                 }
@@ -255,7 +255,7 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl<OtaBaCxJbxxMapper, OtaBa
         jbxx.setQymc(ImportFileUtil.getCellValue(cell, wb));
         row = s.getRow(3);
         cell = row.getCell(1);
-        jbxx.setCplb(ImportFileUtil.getCellValue(cell, wb));
+        jbxx.setCplb(ImportFileUtil.getCellValueDict(cell, wb, "product_category", sysDictService, cut));
         row = s.getRow(5);
         cell = row.getCell(1);
         jbxx.setCpsb(ImportFileUtil.getCellValue(cell, wb));
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 b8a55bbbf..26c4ff291 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
@@ -80,9 +80,6 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
         saveOrUpdate(otaBaCxJsfzbacs);
         //处理控制器列表,先删除，后添加
         List<OtaBaCxSjmk> oldList = OtaBaCxSjmkService.queryByOtaId(otaId);
-        if (ObjectUtils.isEmpty(oldList)) {
-            oldList = OtaBaCxSjmkService.setDefault(otaId);
-        }
         OtaBaCxSjmkService.deleteByOtaId(otaId);
         JSONArray kzq = json.getJSONArray("kzq");
         List<OtaBaCxSjmk> sjmkList = parseKzqData(kzq, otaId);
@@ -231,13 +228,15 @@ public class OtaBaCxJsfzbacsServiceImpl extends ServiceImpl<OtaBaCxJsfzbacsMappe
         JSONObject res = new JSONObject();
         res.put("otaId", otaId);
         OtaBaCxJsfzbacs otaBaCxJsfzbacs = getByOtaId(otaId);
-        List<OtaBaCxSjmk> kzqList = OtaBaCxSjmkService.queryByOtaId(otaId);
         if (ObjectUtils.isEmpty(otaBaCxJsfzbacs)) {
             otaBaCxJsfzbacs = getByOtaId(otaIdT);
+        }
+        List<OtaBaCxSjmk> kzqList = OtaBaCxSjmkService.queryByOtaId(otaId);
+        if(ObjectUtils.isEmpty(kzqList)){
             kzqList = OtaBaCxSjmkService.queryByOtaId(otaIdT);
-            if (ObjectUtils.isEmpty(otaBaCxJsfzbacs)) {
-                kzqList = OtaBaCxSjmkService.setDefault(otaId);
-            }
+        }
+        if(ObjectUtils.isEmpty(kzqList)){
+            kzqList = OtaBaCxSjmkService.setDefault(otaId);
         }
         res.put("bj", otaBaCxJsfzbacs);
         res.put("kzq", kzqList);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxSjmkServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxSjmkServiceImpl.java
index 979a9ab54..c81425400 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxSjmkServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxSjmkServiceImpl.java
@@ -7,6 +7,7 @@ import com.jero.modules.ota.entity.OtaBaCxSjmk;
 import com.jero.modules.ota.mapper.OtaBaCxSjmkMapper;
 import com.jero.modules.ota.service.IOtaBaCxSjmkService;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -102,12 +103,12 @@ public class OtaBaCxSjmkServiceImpl extends ServiceImpl<OtaBaCxSjmkMapper, OtaBa
 
 	@Override
 	public List<OtaBaCxSjmk> queryByOtaId(String otaId) {
+		if(StringUtils.isEmpty(otaId)){
+			return new ArrayList<>();
+		}
 		LambdaQueryWrapper<OtaBaCxSjmk> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.eq(OtaBaCxSjmk::getOtaId, otaId);
 		List<OtaBaCxSjmk> list = this.list(queryWrapper);
-		if (ObjectUtils.isEmpty(list)) {
-			list = setDefault(otaId);
-		}
 		return list;
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java
index 4bb4790f5..2b5e7f052 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java
@@ -221,6 +221,12 @@ public class OtaBaSjGgnrfsServiceImpl extends ServiceImpl<OtaBaSjGgnrfsMapper, O
         if (StringUtils.isNotEmpty(pg.getSjmd())) {
             fs.setSjmd(pg.getSjmd());
         }
+        fs.setSjky("车辆解闭锁功能可用，但不可驾驶");
+        fs.setSjbkygn("除解闭锁均不可用");
+        fs.setSjsfcg(1);
+        fs.setGzbg(1);
+        fs.setGzscnr(1);
+        fs.setGzyhfs("1,3");
         StringBuilder attStr1 = new StringBuilder();
         File[] attFiles1 = attFile.listFiles();
         //已导入文件数，用于判断超过20
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 3fbbc897d..6a873a186 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
@@ -236,7 +236,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 + " 无法找到车型备案数据");
+            errMsg.append("车型及功能备案《公告》批次:" + 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/service/impl/OtaBaSjSjyxpgServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java
index 60cf93b97..9a86599ef 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
@@ -93,8 +93,7 @@ public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl<OtaBaSjSjyxpgMapper, O
             List<OtaBaCxTxjl> reList = cu.comparisonRecord(otaBaSjSjyxpg.getOtaId(), OtaModuleEnum.SJ_SJYXPG, otaBaSjSjyxpgOld, otaBaSjSjyxpg, sysDictService);
             reList.addAll(cu.comparisonRecord(otaBaSjSjyxpg.getOtaId(), newYzcl, oldYzcl, OtaModuleEnum.SJ_SJMBCL, "验证材料", ossFileService));
             reList.addAll(cu.comparisonRecord(otaBaSjSjyxpg.getOtaId(), newZmcl, oldZmcl, OtaModuleEnum.SJ_SJMBCL, "证明材料", ossFileService));
-
-            deleteById(otaBaSjSjyxpg.getId());
+            deleteByOtaId(otaBaSjSjyxpg.getOtaId());
             saveOrUpdate(otaBaSjSjyxpg);
             otaBaCxTxjlService.saveBatch(reList);
         }
@@ -225,6 +224,14 @@ public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl<OtaBaSjSjyxpgMapper, O
             }
             sjyxpg.setSjmd(sb.toString());
         }
+        sjyxpg.setFhgd(2);
+        sjyxpg.setZdjsxg(1);
+        sjyxpg.setZxsj(2);
+        sjyxpg.setAqjz("2");
+        sjyxpg.setSfyxaq(2);
+        sjyxpg.setYhqr(1);
+        sjyxpg.setSjbcs("3,4");
+        sjyxpg.setAqkkx(1);
         StringBuilder attStr1 = new StringBuilder();
         File[] attFiles1 = attFile1.listFiles();
         for (int i = 0; i < attFiles1.length; i++) {
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 ac46de245..adb05d7f3 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
@@ -157,7 +157,7 @@ public class ImportFileUtil {
 
     public static Integer getCellValueHaveOrNotInt(Cell cell, Workbook workbook) throws Exception {
         Integer res = null;
-        String str = getCellValueYesOrNo(cell, workbook);
+        String str = getCellValueHaveOrNot(cell, workbook);
         if (StringUtils.isNotEmpty(str)) {
             res = Integer.parseInt(str);
         }
@@ -325,7 +325,7 @@ public class ImportFileUtil {
             if (StringUtils.isNotEmpty(strs[i])) {
                 File file = ImportFileUtil.findFile(attFile, strs[i]);
                 if (null == file) {
-                    errMsg.append(title + " 找不到文件, ");
+                    errMsg.append(title + " 找不到文件:" + strs[i] + ", ");
                     continue;
                 }
                 if (!file.getName().endsWith(".doc") && !file.getName().endsWith(".docx") && !file.getName().endsWith(".pdf")
@@ -368,7 +368,7 @@ public class ImportFileUtil {
             if (StringUtils.isNotEmpty(strs[i])) {
                 File file = ImportFileUtil.findFile(attFile, strs[i]);
                 if (null == file) {
-                    errMsg.append(title + " 找不到文件, ");
+                    errMsg.append(title + " 找不到文件:" + strs[i] + ", ");
                     continue;
                 }
                 if (!file.getName().endsWith(".doc") && !file.getName().endsWith(".docx") && !file.getName().endsWith(".pdf")