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-02 19:56:46 +08:00
parent bb92fe9963
commit de36634e1d
9 changed files with 33 additions and 20 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/controller/OtaBaCxJbxxController.java
+1 -1
View File
@@ -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());
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java
+1 -1
View File
@@ -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),
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java
+2 -2
View File
@@ -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));
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJsfzbacsServiceImpl.java
+6 -7
View File
@@ -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);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxSjmkServiceImpl.java
+4 -3
View File
@@ -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;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjGgnrfsServiceImpl.java
+6
View File
@@ -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
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbcxServiceImpl.java
+1 -1
View File
@@ -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());
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjyxpgServiceImpl.java
+9 -2
View File
@@ -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++) {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ImportFileUtil.java
+3 -3
View File
@@ -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")