diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java index a7ebadbc4..edc26fec1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java @@ -88,7 +88,7 @@ public class OtaBaSjListController extends JeroController pageList = otaBaSjListService.page(page, queryWrapper); return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGgnrfs.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGgnrfs.java index 33d1299d9..8963565a4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGgnrfs.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjGgnrfs.java @@ -69,6 +69,7 @@ public class OtaBaSjGgnrfs implements Serializable { /**升级目的*/ @Excel(name = "升级目的", width = 15) @ApiModelProperty(value = "升级目的") + @Dict(dicCode = "uipgrade_purpose") private java.lang.String sjmd; /**由于软件升级活动而导致的车辆功能的任何变化*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java index a46356589..5b95535dc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjjsmccsServiceImpl.java @@ -273,7 +273,11 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl upLoadFiles, String otaId, String cut) throws Exception { File attFile = null; - File upFile = null; for (File f : upLoadFiles) { if (f.isDirectory() && f.getName().equals("用户告知内容及方式")) { attFile = f; } -// else if (f.getName().equals("用户告知内容及方式.xlsx")) { -// upFile = f; -// } } - if (null == upFile || null == attFile) { + if (null == attFile) { throw new JeroBootException("请上传正确的文件"); } + OtaBaSjGgnrfs fs = parseFile(attFile, otaId, cut); + add(fs); + } + + private OtaBaSjGgnrfs parseFile(File attFile, String otaId, String cut) throws Exception { + OtaBaSjGgnrfs fs = new OtaBaSjGgnrfs(); + fs.setOtaId(otaId); + OtaBaSjSjyxpg pg = otaBaSjSjyxpgService.queryByOtaId(otaId, ""); + if (StringUtils.isNotEmpty(pg.getSjmd())) { + fs.setSjmd(pg.getSjmd()); + } + StringBuilder attStr1 = new StringBuilder(); + File[] attFiles1 = attFile.listFiles(); + for (int i = 0; i < attFiles1.length; i++) { + if (!attFiles1[i].isDirectory() && (attFiles1[i].getName().contains(".doc") || attFiles1[i].getName().contains(".docx") || attFiles1[i].getName().contains(".pdf"))) { + if (i >= attFiles1.length - 1) { + attStr1.append(ImportFileUtil.uploadFiles(attFiles1[i], ossFileService)); + } else { + attStr1.append(ImportFileUtil.uploadFiles(attFiles1[i], ossFileService)).append(","); + } + } + } + fs.setXgwj(attStr1.toString()); + return fs; } @Override 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 5686e1c91..44dea6f27 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 @@ -188,7 +188,7 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl upLoadFiles, String otaId, String cut) throws Exception { File upFile = null; for (File f : upLoadFiles) { - if (f.getName().equals("车型基本信息.xlsx")) { + if (f.getName().equals("升级目标车型.xlsx")) { upFile = f; } } 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 be7d94fc9..37ce93468 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 @@ -183,7 +183,7 @@ public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl= attFiles1.length - 1) { + attStr1.append(ImportFileUtil.uploadFiles(attFiles1[i], ossFileService)); + } else { + attStr1.append(ImportFileUtil.uploadFiles(attFiles1[i], ossFileService)).append(","); + } + } + } + sjyxpg.setBgfj(attStr1.toString()); + StringBuilder attStr2 = new StringBuilder(); + File[] attFiles2 = attFile2.listFiles(); + for (int i = 0; i < attFiles2.length; i++) { + if (!attFiles2[i].isDirectory() && (attFiles2[i].getName().contains(".doc") || attFiles2[i].getName().contains(".docx") || attFiles2[i].getName().contains(".pdf"))) { + if (i >= attFiles2.length - 1) { + attStr2.append(ImportFileUtil.uploadFiles(attFiles2[i], ossFileService)); + } else { + attStr2.append(ImportFileUtil.uploadFiles(attFiles2[i], ossFileService)).append(","); + } + } + } + sjyxpg.setClfj(attStr2.toString()); return sjyxpg; } @Override public OtaBaSjSjyxpg parseFileList(List upLoadFiles, String otaId, String cut) throws Exception { File upFile = null; + File attFile = null; + File attFile1 = null; + File attFile2 = null; for (File f : upLoadFiles) { if (f.getName().equals("升级影响评估.docx")) { upFile = f; } + if (f.isDirectory() && f.getName().equals("升级影响评估")) { + attFile = f; + } } - if (null == upFile) { + + if (null == upFile || null == attFile) { throw new JeroBootException("请上传正确的文件"); } - OtaBaSjSjyxpg sjyxpg = parseFile(upFile, cut); + + for (File f : attFile.listFiles()) { + if (f.isDirectory() && f.getName().equals("测试报告")) { + attFile1 = f; + } + if (f.isDirectory() && f.getName().equals("硬件版本号附件")) { + attFile2 = f; + } + } + if (null == attFile1 || null == attFile2) { + throw new JeroBootException("请上传正确的文件"); + } + + + OtaBaSjSjyxpg sjyxpg = parseFile(upFile, attFile1, attFile2, cut); sjyxpg.setOtaId(otaId); add(sjyxpg); return sjyxpg; 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 13c24ace0..510ea3469 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 @@ -294,6 +294,15 @@ public class ImportFileUtil { return res; } + public static String uploadFiles(File attFile, IOSSFileService ossFileService) throws Exception { + String res = ""; + OSSFile ossFile = ossFileService.uploadLocalOfCos(ImportFileUtil.createMfileByFile(attFile), "", null, null); + if (ObjectUtils.isNotEmpty(ossFile)) { + res = ossFile.getId(); + } + return res; + } + public static String uploadFiles(File attFile, String[] strs, IOSSFileService ossFileService) throws Exception { String res = ""; for (int i = 0; i < strs.length; i++) { diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index a3b7a1546..917b25a8e 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -87,9 +87,9 @@ export default { return { dataSource: [ { - sjqbgcs:'不涉及', - sjhbgcs:'不涉及', - sjsjkzq:'ADC ADAS主控制器' + // sjqbgcs:'不涉及', + // sjhbgcs:'不涉及', + // sjsjkzq:'ADC ADAS主控制器' } ], fileList:'', @@ -222,9 +222,9 @@ export default { } getAction('/ota/otaBaSjSjfzbh/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ this.dataSource =res.result.list == null ? [ { - sjqbgcs:'不涉及', - sjhbgcs:'不涉及', - sjsjkzq:'ADC ADAS主控制器' + // sjqbgcs:'不涉及', + // sjhbgcs:'不涉及', + // sjsjkzq:'ADC ADAS主控制器' }] : res.result.list this.fileList = res.result.fj }) @@ -283,9 +283,9 @@ export default { }, addlineAtBot(){ let obj= { - sjqbgcs:'不涉及', - sjhbgcs:'不涉及', - sjsjkzq:'ADC ADAS主控制器' + // sjqbgcs:'不涉及', + // sjhbgcs:'不涉及', + // sjsjkzq:'ADC ADAS主控制器' } this.dataSource.push(obj) }, diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index c18dd9d0d..84873b48c 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -89,10 +89,10 @@ export default { data() { return { dataSource: [ - { - sjqbgcs:'不涉及', - sjhbgcs:'不涉及' - } + // { + // sjqbgcs:'不涉及', + // sjhbgcs:'不涉及' + // } ], loading: false, disable:false, @@ -288,8 +288,8 @@ export default { } getAction('/ota/otaBaSjSjxtbh/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ this.dataSource =res.result.list == null ? [ { - sjqbgcs:'不涉及', - sjhbgcs:'不涉及' + // sjqbgcs:'不涉及', + // sjhbgcs:'不涉及' }] : res.result.list }) }, @@ -323,8 +323,8 @@ export default { }, addlineAtBot(){ let obj= { - sjqbgcs:'不涉及', - sjhbgcs:'不涉及' + // sjqbgcs:'不涉及', + // sjhbgcs:'不涉及' } this.dataSource.push(obj) }, diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index 6f7e5f449..5d06e9870 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -320,14 +320,6 @@ export default { ], form:{ sjmd:'', - fhgd:1, - zdjsxg:2, - sfyxaq:2, - yhqr:1, - aqkkx:1, - zxsj:2, - aqjz:'2', - sjbcs:'3,4' } } }, @@ -385,14 +377,14 @@ this.$forceUpdate() if(res.code==200){ this.form=res.result==null ? { sjmd:'', - fhgd:1, - zdjsxg:2, - sfyxaq:2, - yhqr:1, - aqkkx:1, - zxsj:2, - aqjz:'2', - sjbcs:'3,4' + // fhgd:1, + // zdjsxg:2, + // sfyxaq:2, + // yhqr:1, + // aqkkx:1, + // zxsj:2, + // aqjz:'2', + // sjbcs:'3,4' } : res.result } }) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index 76100613c..6a806d92a 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -168,7 +168,7 @@ import ImportFile from '@/components/ImportFileData/index' confirmLoading: false, disabled: false, form:{ - qymc:'安徽江淮汽车集团股份有限公司' + qymc:'' }, url: { exportData: '/ota/otaBaSjSjmbcx/exportData', @@ -215,7 +215,8 @@ import ImportFile from '@/components/ImportFileData/index' this.form.bapc=undefined this.form.dllx1=undefined this.form.dllx2=undefined - this.form.qymc='安徽江淮汽车集团股份有限公司' + // this.form.qymc='安徽江淮汽车集团股份有限公司' + this.form.qymc='' }else{ this.form=res.result if(res.result.dllx1==null){ diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index 78e1e4d0a..a1ba7c8ec 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -20,12 +20,20 @@ {{$t('pgradepurpose')}} - + + + + + + + @@ -204,8 +212,8 @@ export default { confirmLoading: false, disabled: false, formInline:{ - sjky:'车辆解闭锁功能可用,但不可驾驶', - sjbkygn:'除解闭锁均不可用' + // sjky:'车辆解闭锁功能可用,但不可驾驶', + // sjbkygn:'除解闭锁均不可用' }, url: { exportData: '/ota/otaBaSjGgnrfs/exportData', @@ -259,8 +267,8 @@ export default { if(res.code == 200){ this.formInline= res.result ==null ? { - sjky:'车辆解闭锁功能可用,但不可驾驶', - sjbkygn:'除解闭锁均不可用' + // sjky:'车辆解闭锁功能可用,但不可驾驶', + // sjbkygn:'除解闭锁均不可用' } :res.result this.formInline.id=res.result.id this.$forceUpdate() @@ -292,6 +300,9 @@ export default { dateChange(item) { this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : '' }, + update(){ + this.$forceUpdate() + }, } }