From 99b945f95c42d4f422b62ca233a83a8688a64150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 3 Apr 2023 11:42:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=94=AF=E6=8C=81-?= =?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=8A=A5=E5=91=8A=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=88=97=E5=AE=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/externalReports/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index 06aa39799..4211f5e67 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -385,7 +385,7 @@ ellipsis: true, dataIndex: 'fileName', scopedSlots: { customRender: 'fileName' }, - width: 200 + width: 270 }, { title: this.$t('fileDeclaration'), @@ -393,7 +393,7 @@ ellipsis: true, dataIndex: 'fileDescription', scopedSlots: { customRender: 'projectName' }, - width: 300 + width: 390 }, { title: this.$t('uploadedBy'), @@ -412,7 +412,7 @@ align: 'left', ellipsis: true, dataIndex: 'createTime', - width: 250 + width: 245 }, { title: this.$t('operation'), From 3613ed66232d8cbb3f39213f1e16034ba92d11ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 3 Apr 2023 11:44:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=A5=E5=BF=97-=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E5=B1=85=E5=B7=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/system/DataLogList.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/system/DataLogList.vue b/jero-web/src/views/system/DataLogList.vue index 3ad660f5c..415e63866 100644 --- a/jero-web/src/views/system/DataLogList.vue +++ b/jero-web/src/views/system/DataLogList.vue @@ -41,6 +41,7 @@ size="middle" rowKey="id" :columns="columns" + :components="drag(columns,'columns')" :dataSource="dataSource" :pagination="ipagination" :loading="loading" @@ -61,10 +62,11 @@ import DataLogModal from './modules/DataLogModal' import {JeroListMixin} from '@/mixins/JeroListMixin' import JEllipsis from "@/components/jero/JEllipsis"; + import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: 'DataLogList', - mixins: [JeroListMixin], + mixins: [JeroListMixin, ResizeHeader, ResizeColumnProvide], components: { JEllipsis, DataLogModal @@ -76,28 +78,28 @@ columns: [ { title: this.$t('tableName'), - align: 'center', + align: 'left', dataIndex: 'dataTable', width: "120" }, { title: this.$t('DataID'), - align: 'center', + align: 'left', dataIndex: 'dataId', width: "120" }, { title: this.$t('VersionNumber'), - align: 'center', + align: 'left', dataIndex: 'dataVersion', width: "50" }, { title: this.$t('DataContent'), - align: 'center', + align: 'left', dataIndex: 'dataContent', width: "150", scopedSlots: {customRender: 'dataContent'}, }, { title: this.$t('creator'), - align: 'center', + align: 'left', dataIndex: 'createBy', width: "100" }, From b9a02809d91ad35a5eb4727616cf55a07a17712d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Mon, 3 Apr 2023 13:44:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/enums/OtaTitleEnum.java | 2 +- .../impl/OtaBaSjSjxtbhServiceImpl.java | 33 +++++++++++++++---- .../impl/OtaBaSjSjyxpgServiceImpl.java | 4 +-- 3 files changed, 29 insertions(+), 10 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 1e72122b2..6c63e7c5a 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 @@ -183,7 +183,7 @@ public enum OtaTitleEnum { CSRJSJ("csrjsj", "初始软件包的完整性数据", "0", "", 500), SJBYZSJ("sjbyzsj", "升级包完整性验证数据", "0", "", 500), SJBDX("sjbdx", "升级包大小", "0", "", 50), - SFCFSJ("sfcfsj", "是否差分升级", "0", "", 50), + SFCFSJ("sfcfsj", "是否差分升级", "2", "", 0), SJMDLX("sjmdlx", "升级目的类型", "0", "", 50), GNBGMS("gnbgms", "功能变更描述", "0", "", 500), SYTJBG("sytjbg", "适用条件变更", "0", "", 500), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java index 1b88b984f..ddfe59dee 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java @@ -74,6 +74,9 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl setDefault(String otaId) { + List list = this.getByOtaId(otaId); + Date now = new Date(); + OtaBaSjSjxtbh bh = new OtaBaSjSjxtbh(); + bh.setOtaId(otaId); + bh.setSjkzqmc("ADC ADAS主控制器"); + bh.setCreateTime(now); + bh.setId(UUID.randomUUID().toString().replace("-", "")); + list.add(bh); + saveBatch(list); + return list; + } + public void deleteByOtaId(String otaId) { List list = this.getByOtaId(otaId); List ids = new ArrayList<>(); @@ -183,6 +199,9 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); - parseFileList(upLoadFiles, otaId, cut,errMsg); + parseFileList(upLoadFiles, otaId, cut, errMsg); } @Override - public void parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception{ + public void parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { File upFile = null; for (File f : upLoadFiles) { if (f.getName().equals("本次升级的系统名称与变更参数.xlsx")) { @@ -221,7 +240,7 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl newList = parseFile(upFile, otaId, cut,errMsg); + List newList = parseFile(upFile, otaId, cut, errMsg); List oldList = getByOtaId(otaId); if (ObjectUtils.isEmpty(oldList)) { oldList = new ArrayList<>(); @@ -233,7 +252,7 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl parseFile(File upFile, String otaId, String cut, StringBuilder errMsg) throws Exception{ + private List parseFile(File upFile, String otaId, String cut, StringBuilder errMsg) throws Exception { Date now = new Date(); List list = new ArrayList<>(); Workbook wb = ImportFileUtil.readExcel(upFile); @@ -270,7 +289,7 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl