diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 101213375..a8deb64c5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -4007,6 +4007,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsCollectManifestIdList = configDataList.stream().map(ParamsConfigDataEO::getParamsCollectManifestId).distinct().collect(Collectors.toList()); + for (String paramsCollectManifestId : paramsCollectManifestIdList) { + // 删除之前的参数项 + QueryWrapper targetConfigDataRemoveWrap = new QueryWrapper<>(); + targetConfigDataRemoveWrap.lambda().eq(ParamsConfigDataEO::getParamsCollectManifestId, paramsCollectManifestId); + this.paramsConfigDataEOService.remove(targetConfigDataRemoveWrap); + } + // 批量新增参数项 Boolean isSuccess = paramsConfigDataEOService.saveOrUpdateBatch(configDataList); @@ -5416,7 +5424,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl 1) { + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[1], isMust, true, cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setPullData(value.split("#")[1]); + + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + + } else if (value.split("#").length == 1 && value.endsWith("#")) { + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + } + } } } else if (ControlTypeEnum.TEXT_PULL_MORE.getValue().equals(controlType)) { // 校验必填 - if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { + /*if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { if (CutEnum.CN.getValue().equals(cut)) { errorMsg += configMap.get(key) + "为必填项,不能为空;"; } else { @@ -5511,11 +5549,39 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl 1) { + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[1], isMust, false, cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setPullData(value.split("#")[1]); + + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + } else if (value.split("#").length == 1 && value.endsWith("#")) { + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + } + } + } } else if (ControlTypeEnum.TEXT_FILE.getValue().equals(controlType)) { // 校验必填 - if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { + /*if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { if (CutEnum.CN.getValue().equals(cut)) { errorMsg += configMap.get(key) + "为必填项,不能为空;"; } else { @@ -5551,11 +5617,40 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl 1) { + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], isMust, "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + + resultMap = validateFile(configMap.get(key), unzipfilepath, value.split("#")[1], ParamsIsMustEnum.NO.getValue(), cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setFileConnectId(value.split("#")[1]); + } else if (value.split("#").length == 1 && value.endsWith("#")) { + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], isMust, "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + } + } } } else if (ControlTypeEnum.PULL_SINGLE_FILE.getValue().equals(controlType)) { // 校验必填 - if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { + /*if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { if (CutEnum.CN.getValue().equals(cut)) { errorMsg += configMap.get(key) + "为必填项,不能为空;"; } else { @@ -5590,11 +5685,40 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl 1) { + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[0], isMust, true, cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setPullData(value.split("#")[0]); + + resultMap = validateFile(configMap.get(key), unzipfilepath, value.split("#")[1], ParamsIsMustEnum.NO.getValue(), cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setFileConnectId(value.split("#")[1]); + } else if (value.split("#").length == 1 && value.endsWith("#")) { + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[0], isMust, true, cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setPullData(value.split("#")[0]); + } + } } } else if (ControlTypeEnum.PULL_MORE_FILE.getValue().equals(controlType)) { // 校验必填 - if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { + /*if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { if (CutEnum.CN.getValue().equals(cut)) { errorMsg += configMap.get(key) + "为必填项,不能为空;"; } else { @@ -5630,11 +5754,40 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl 1) { + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[0], isMust, false, cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setPullData(value.split("#")[0]); + + resultMap = validateFile(configMap.get(key), unzipfilepath, value.split("#")[1], ParamsIsMustEnum.NO.getValue(), cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setFileConnectId(value.split("#")[1]); + } else if (value.split("#").length == 1 && value.endsWith("#")) { + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[0], isMust, false, cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setPullData(value.split("#")[0]); + } + } } } else if (ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue().equals(controlType)) { // 校验必填 - if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { + /*if (ParamsIsMustEnum.YES.getValue().equals(isMust) && StringUtils.isEmpty(value)) { if (CutEnum.CN.getValue().equals(cut)) { errorMsg += configMap.get(key) + "为必填项,不能为空;"; } else { @@ -5689,6 +5842,42 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl 1) { + resultMap = validatePull(configMap.get(key), controlValues, value.split("#")[1], isMust, true, cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setPullData(value.split("#")[1]); + + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + + if (!value.endsWith("#")) { //3 + resultMap = validateFile(configMap.get(key), unzipfilepath, value.split("#")[2], ParamsIsMustEnum.NO.getValue(), cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setFileConnectId(value.split("#")[2]); + } + } else if (value.split("#").length == 1 && value.endsWith("#")) { + resultMap = validateText(configMap.get(key), controlVerify, value.split("#")[0], ParamsIsMustEnum.NO.getValue(), "1000", cut); + errorMsg += (String) resultMap.get("errorMsg"); + countError += (int) resultMap.get("countError"); + configDataEO.setTextData(value.split("#")[0]); + } + } } } else { @@ -5701,7 +5890,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl list = new LinkedList<>(); @@ -5960,14 +5960,21 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl phasedImplDetailsList = Arrays.asList(value.split("#")); for (String phasedImplDetails : phasedImplDetailsList) { PhasedImplementationDetailsEO phasedImplementationDetailsEO = new PhasedImplementationDetailsEO(); - String[] phasedImplDetailsArr = phasedImplDetails.split("

"); + String[] phasedImplDetailsArr = phasedImplDetails.split(""); if(phasedImplDetailsArr.length >= 1){ String standNumberOrClause = phasedImplDetailsArr[0]; - if (StringUtils.isNotBlank(standNumberOrClause) && standNumberOrClause.length() > 100) { + if(StringUtils.isEmpty(standNumberOrClause)){ if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += "分阶段实施详情-法规编号/条款不能超过" + 100 + "个字符, "; + errorMsg += "分阶段实施详情-法规编号/条款不能为空, "; }else{ - errorMsg += "Details of the phased implementation standNumberOrClause Can not be more than " + 100 + " char, "; + errorMsg += "Phased Implementation Details - Regulation No./clause cannot be empty,"; + } + countError++; + } else if (StringUtils.isNotBlank(standNumberOrClause) && standNumberOrClause.length() > 200) { + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += "分阶段实施详情-法规编号/条款不能超过" + 200 + "个字符, "; + }else{ + errorMsg += "Phased Implementation Details - Regulation No./clause Can not be more than " + 200 + " char, "; } countError++; }else { @@ -5976,6 +5983,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl= 2){ String implementationTypeName = phasedImplDetailsArr[1]; + if(StringUtils.isNotEmpty(implementationTypeName)){ String[] implementationTypeNameArr = implementationTypeName.split(","); ImplementationTypeEnum[] implementationTypeEnums = ImplementationTypeEnum.values(); @@ -5993,30 +6001,47 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl= 3){ - Date implementationDate = null; - try { - implementationDate = DateUtils.parseDate(phasedImplDetailsArr[2], "yyyy-MM-dd"); - } catch (ParseException e) { - e.printStackTrace(); - } - if(implementationDate == null){ + String implementationDateStr = phasedImplDetailsArr[2]; + if(StringUtils.isEmpty(implementationDateStr)){ if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += "分阶段实施详情-实施日期格式错误,正确格式为'yyyy-MM-dd', "; + errorMsg += "分阶段实施详情-实施日期不能为空, "; }else{ - errorMsg += "Details of the phased implementation implementationDate format is incorrect. The correct format is 'yyyy-MM-dd', "; + errorMsg += "Phased Implementation Details - Implementation Date cannot be empty,"; } countError++; }else { - phasedImplementationDetailsEO.setImplementationDate(implementationDate); + Date implementationDate = null; + try { + implementationDate = DateUtils.parseDate(phasedImplDetailsArr[2], "yyyy-MM-dd"); + } catch (ParseException e) { + e.printStackTrace(); + } + if(implementationDate == null){ + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += "分阶段实施详情-实施日期格式错误,正确格式为'yyyy-MM-dd', "; + }else{ + errorMsg += "Phased Implementation Details - implementationDate format is incorrect. The correct format is 'yyyy-MM-dd', "; + } + countError++; + }else { + phasedImplementationDetailsEO.setImplementationDate(implementationDate); + } } } if(phasedImplDetailsArr.length >= 4){ @@ -6025,7 +6050,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl @@ -283,7 +283,7 @@ :maxLength="1000" :disabled="itemval.isLock == '1' ? true: false" :placeholder="$t('pleaseEnter')+$t('chinese')" - @input="onInput" + @input="onInput(itemval.dataValue,item,index1)" onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))" v-model="itemval.dataValue"/> @@ -405,7 +405,7 @@

@@ -730,7 +730,7 @@ :disabled="itemval.isLock == '1' ? true: false" :maxLength="1000" :placeholder="$t('pleaseEnter')+$t('chinese')" - @input="onInput" + @input="onInput(itemval.dataValue,item,index1)" onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\u4E00-\u9FA5]/g,''))" v-model="itemval.dataValue"/>
@@ -917,14 +917,14 @@ } }) }, - onInput(r) { - let value = r.target.value - r.target.value = value.replace(/[^\u4e00-\u9fa5]/g, '') - this.detailDateList.forEach((item) => { - if (item.controlVerify == '2') { - item.dataValue = r.target.value - } - }) + onInput(r, item, index) { + let value = r.replace(/[^\u4e00-\u9fa5]/g, '') + this.detailDate.paramsConfigData[item][index].dataValue = value + // this.detailDateList.forEach((item) => { + // if (item.controlVerify == '2') { + // item.dataValue = value + // } + // }) }, uploadSuccess(data) { let attIdList = [] diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index d947ca94f..dfaff90fc 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -149,9 +149,9 @@ @click="maintenanceClick(record)">{{$t('maintenance')}} {{$t('endUpgrade')}} + @click="endUpgrade(record , '0')" v-if="record.sjzt == '0' && record.bazt=='4'">{{$t('endUpgrade')}} {{$t('upgradecompletion')}} + @click="endUpgrade(record , '1')" v-if="record.sjzt == '1'">{{$t('upgradecompletion')}} {{$t('export')}}   {{$t('positioningandnavigationsystem')}} - -   {{$t('vehiclesatellitepositioningequipment')}} + + {{$t('vehiclesatellitepositioningequipment')}}   {{$t('inertialnavigationsystem')}} @@ -70,19 +70,19 @@ -   {{$t('signalingdevices')}} + {{$t('signalingdevices')}} -   {{$t('driverassistancefunctioncontrols')}} + {{$t('driverassistancefunctioncontrols')}} -   {{$t('drivingassistancefunctionindicatorsignaldevice')}} + {{$t('drivingassistancefunctionindicatorsignaldevice')}} -   {{$t('steerinwheelreleaseindicatorsignaldevice')}} + {{$t('steerinwheelreleaseindicatorsignaldevice')}} -   {{$t('driverattentionindicatorsignaldevice')}} + {{$t('driverattentionindicatorsignaldevice')}}