From 38c2a0e15fe043058e69eec8929c19d34c736bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 30 Mar 2023 11:19:45 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/ota/entity/OtaBaSjSjxtbh.java | 159 +++++++++++++----- .../impl/OtaBaSjSjxtbhServiceImpl.java | 5 +- 2 files changed, 123 insertions(+), 41 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjxtbh.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjxtbh.java index 25f9af23d..8b0c67320 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjxtbh.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaBaSjSjxtbh.java @@ -3,11 +3,13 @@ package com.jero.modules.ota.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.StringUtils; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import com.jero.common.aspect.annotation.Dict; @@ -21,109 +23,188 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** * @Description: 升级备案-本次升级的系统名称与参数变化 * @Author: jero-boot - * @Date: 2023-03-17 + * @Date: 2023-03-17 * @Version: V1.0 */ @Data @TableName("ota_ba_sj_sjxtbh") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="ota_ba_sj_sjxtbh对象", description="升级备案-本次升级的系统名称与参数变化") +@ApiModel(value = "ota_ba_sj_sjxtbh对象", description = "升级备案-本次升级的系统名称与参数变化") public class OtaBaSjSjxtbh implements Serializable { private static final long serialVersionUID = 1L; - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") private java.lang.String id; - /**创建人*/ + /** + * 创建人 + */ @ApiModelProperty(value = "创建人") private java.lang.String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + /** + * 创建日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期") private java.util.Date createTime; - /**更新人*/ + /** + * 更新人 + */ @ApiModelProperty(value = "更新人") private java.lang.String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + /** + * 更新日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; - /**所属部门*/ + /** + * 所属部门 + */ @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; - /**otaId*/ - @Excel(name = "otaId", width = 15) + /** + * otaId + */ + @Excel(name = "otaId", width = 15) @ApiModelProperty(value = "otaId") private java.lang.String otaId; - /**系统名称*/ - @Excel(name = "系统名称", width = 15) + /** + * 系统名称 + */ + @Excel(name = "系统名称", width = 15) @ApiModelProperty(value = "系统名称") private java.lang.String xtmc; - /**升级前已变更《公告》参数的对应调整*/ - @Excel(name = "升级前已变更《公告》参数的对应调整", width = 15) + /** + * 升级前已变更《公告》参数的对应调整 + */ + @Excel(name = "升级前已变更《公告》参数的对应调整", width = 15) @ApiModelProperty(value = "升级前已变更《公告》参数的对应调整") private java.lang.String sjqbgcs; - /**升级后已变更《公告》参数的对应调整*/ - @Excel(name = "升级后已变更《公告》参数的对应调整", width = 15) + /** + * 升级后已变更《公告》参数的对应调整 + */ + @Excel(name = "升级后已变更《公告》参数的对应调整", width = 15) @ApiModelProperty(value = "升级后已变更《公告》参数的对应调整") private java.lang.String sjhbgcs; - /**升级的电子控制器名称*/ - @Excel(name = "升级的电子控制器名称", width = 15) + /** + * 升级的电子控制器名称 + */ + @Excel(name = "升级的电子控制器名称", width = 15) @ApiModelProperty(value = "升级的电子控制器名称") private java.lang.String sjkzqmc; - /**适配的硬件版本*/ - @Excel(name = "适配的硬件版本", width = 15) + /** + * 适配的硬件版本 + */ + @Excel(name = "适配的硬件版本", width = 15) @ApiModelProperty(value = "适配的硬件版本") private java.lang.String yjbb; - /**软件版本号升级前*/ - @Excel(name = "软件版本号升级前", width = 15) + /** + * 软件版本号升级前 + */ + @Excel(name = "软件版本号升级前", width = 15) @ApiModelProperty(value = "软件版本号升级前") private java.lang.String sjqrjbb; - /**软件版本号升级后*/ - @Excel(name = "软件版本号升级后", width = 15) + /** + * 软件版本号升级后 + */ + @Excel(name = "软件版本号升级后", width = 15) @ApiModelProperty(value = "软件版本号升级后") private java.lang.String sjhrjbb; - /**操作系统版本号升级前*/ - @Excel(name = "操作系统版本号升级前", width = 15) + /** + * 操作系统版本号升级前 + */ + @Excel(name = "操作系统版本号升级前", width = 15) @ApiModelProperty(value = "操作系统版本号升级前") private java.lang.String sjqczxt; - /**操作系统版本号升级后*/ - @Excel(name = "操作系统版本号升级后", width = 15) + /** + * 操作系统版本号升级后 + */ + @Excel(name = "操作系统版本号升级后", width = 15) @ApiModelProperty(value = "操作系统版本号升级后") private java.lang.String sjhczxt; - /**升级包完整性验证数据*/ - @Excel(name = "升级包完整性验证数据", width = 15) + /** + * 升级包完整性验证数据 + */ + @Excel(name = "升级包完整性验证数据", width = 15) @ApiModelProperty(value = "升级包完整性验证数据") private java.lang.String sjbyzsj; - /**升级包大小*/ - @Excel(name = "升级包大小", width = 15) + /** + * 升级包大小 + */ + @Excel(name = "升级包大小", width = 15) @ApiModelProperty(value = "升级包大小") private java.lang.String sjbdx; - /**是否差分升级*/ - @Excel(name = "是否差分升级", width = 15) + /** + * 是否差分升级 + */ + @Excel(name = "是否差分升级", width = 15) @ApiModelProperty(value = "是否差分升级") private java.lang.String sfcfsj; + public boolean isNull() { + if (StringUtils.isNotEmpty(xtmc)) { + return false; + } + if (StringUtils.isNotEmpty(sjqbgcs)) { + return false; + } + if (StringUtils.isNotEmpty(sjhbgcs)) { + return false; + } + if (StringUtils.isNotEmpty(sjkzqmc)) { + return false; + } + if (StringUtils.isNotEmpty(yjbb)) { + return false; + } + if (StringUtils.isNotEmpty(sjqrjbb)) { + return false; + } + if (StringUtils.isNotEmpty(sjhrjbb)) { + return false; + } + if (StringUtils.isNotEmpty(sjqczxt)) { + return false; + } + if (StringUtils.isNotEmpty(sjhczxt)) { + return false; + } + if (StringUtils.isNotEmpty(sjbyzsj)) { + return false; + } + if (StringUtils.isNotEmpty(sjbdx)) { + return false; + } + if (StringUtils.isNotEmpty(sfcfsj)) { + return false; + } + return true; + } + + } 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 4a5ed30b7..2ba86905d 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 @@ -239,7 +239,6 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl Date: Thu, 30 Mar 2023 11:45:41 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OtaBaSjSjmbcxServiceImpl.java | 5 +++- .../impl/OtaBaSjSjyxpgServiceImpl.java | 30 +++++++++++++++++-- 2 files changed, 31 insertions(+), 4 deletions(-) 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 44dea6f27..35aad036a 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 @@ -90,9 +90,12 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaBaSjSjmbcx.getOtaId(), OtaModuleEnum.SJ_SJMBCX, otaBaSjSjmbcxOld, otaBaSjSjmbcx, sysDictService); + if (StringUtils.isEmpty(otaBaSjSjmbcx.getQymc())) { + otaBaSjSjmbcx.setQymc("安徽江淮汽车集团股份有限公司"); + } + saveOrUpdate(otaBaSjSjmbcx); otaBaCxTxjlService.saveBatch(reList); return otaBaSjSjmbcx; } 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 37ce93468..a3607d886 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 @@ -16,8 +16,6 @@ import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.apache.poi.xwpf.usermodel.XWPFTable; -import org.apache.poi.xwpf.usermodel.XWPFTableCell; -import org.apache.poi.xwpf.usermodel.XWPFTableRow; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -85,7 +83,6 @@ public class OtaBaSjSjyxpgServiceImpl extends ServiceImpl 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)); + + if (null == otaBaSjSjyxpg.getFhgd()) { + otaBaSjSjyxpg.setFhgd(2); + } + if (null == otaBaSjSjyxpg.getZdjsxg()) { + otaBaSjSjyxpg.setZdjsxg(1); + } + if (null == otaBaSjSjyxpg.getZxsj()) { + otaBaSjSjyxpg.setZxsj(2); + } + if (StringUtils.isEmpty(otaBaSjSjyxpg.getAqjz())) { + otaBaSjSjyxpg.setAqjz("2"); + } + if (null == otaBaSjSjyxpg.getSfyxaq()) { + otaBaSjSjyxpg.setSfyxaq(2); + } + + if (null == otaBaSjSjyxpg.getYhqr()) { + otaBaSjSjyxpg.setYhqr(1); + } + if (StringUtils.isEmpty(otaBaSjSjyxpg.getSjbcs())) { + otaBaSjSjyxpg.setSjbcs("3,4"); + } + if (null == otaBaSjSjyxpg.getAqkkx()) { + otaBaSjSjyxpg.setAqkkx(1); + } + saveOrUpdate(otaBaSjSjyxpg); otaBaCxTxjlService.saveBatch(reList); } } From 544b081826be98526411c05291e27e8bbe66307f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 30 Mar 2023 13:38:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=BC=80=E5=8F=91OTA=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7-=E8=BD=A6=E8=BE=86=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OtaBaCxKsjjsmccsServiceImpl.java | 23 ++++++++ .../impl/OtaBaCxKsjxtmccsServiceImpl.java | 23 ++++++++ .../impl/OtaBaSjGgnrfsServiceImpl.java | 27 ++++++++- .../impl/OtaBaSjSjyxpgServiceImpl.java | 56 ++++++++++--------- 4 files changed, 100 insertions(+), 29 deletions(-) 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 5b95535dc..275353fe4 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 @@ -80,6 +80,9 @@ public class OtaBaCxKsjjsmccsServiceImpl extends ServiceImpl setDefault(String otaId) { + Date now = new Date(); + List res = new ArrayList<>(); + String[] titles = {"前向碰撞预警(FCW)", "车道偏离预警(LDW)", "百区监测(BSD)", "驾驶员疲劳监测(DFM)", + "自动紧急制动(AEB)", "自适应巡航控制(ACC)", "车道保持辅助(LKA)", "智能泊车辅助(IPA)", "交通拥堵辅助(TJA)"}; + for (String t : titles) { + OtaBaCxKsjjsmccs cs = new OtaBaCxKsjjsmccs(); + cs.setOtaId(otaId); + cs.setGnmc(t); + cs.setCreateTime(now); + cs.setId(UUID.randomUUID().toString().replace("-", "")); + res.add(cs); + } + saveBatch(res); + return res; + } + @Override public JSONObject queryByOtaId(String otaId, String otaIdT) { List res = this.getByOtaId(otaId); if (ObjectUtil.isEmpty(res)) { res = getByOtaId(otaIdT); } + if (ObjectUtil.isEmpty(res)) { + res = setDefault(otaId); + } JSONObject json = new JSONObject(); json.put("list", res); OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java index b48223a74..08e7f3c69 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java @@ -81,6 +81,9 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl setDefault(String otaId) { + Date now = new Date(); + List res = new ArrayList<>(); + String[] titles = {"动力系统", "传动系统", "转向系统", "制动系统", "车身系统", "车载能源系统"}; + for (String t : titles) { + OtaBaCxKsjxtmccs cs = new OtaBaCxKsjxtmccs(); + cs.setOtaId(otaId); + cs.setXtlb(t); + cs.setCreateTime(now); + cs.setId(UUID.randomUUID().toString().replace("-", "")); + res.add(cs); + } + saveBatch(res); + return res; + } + @Override public JSONObject queryByOtaId(String otaId, String otaIdT) { List res = getByOtaId(otaId); if (ObjectUtil.isEmpty(res)) { res = getByOtaId(otaIdT); } + if (ObjectUtil.isEmpty(res)) { + res = setDefault(otaId); + } JSONObject json = new JSONObject(); json.put("list", res); OtaBaCxList otaBaCxList = otaBaCxListService.queryById(otaId); 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 df7aa690f..1a92b0884 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 @@ -67,7 +67,7 @@ public class OtaBaSjGgnrfsServiceImpl extends ServiceImpl reList = cu.comparisonRecord(otaBaSjGgnrfs.getOtaId(), OtaModuleEnum.SJ_YHGZNRFS, otaBaSjGgnrfsOld, otaBaSjGgnrfs, sysDictService); - reList.addAll(cu.comparisonRecord(otaBaSjGgnrfs.getOtaId(), otaBaSjGgnrfs.getXgwj(), oldFjStr, OtaModuleEnum.SJ_YHGZNRFS, "附件", ossFileService)); otaBaCxTxjlService.saveBatch(reList); } @@ -150,6 +149,28 @@ public class OtaBaSjGgnrfsServiceImpl extends ServiceImpl Date: Thu, 30 Mar 2023 13:40:59 +0800 Subject: [PATCH 4/4] bug 67631 --- jero-web/src/common/lang/en-us.js | 2 +- jero-web/src/common/lang/zh-cn.js | 2 +- jero-web/src/components/uploadFile/file.vue | 2 +- jero-web/src/components/uploadFileOta/file.vue | 11 ++++++++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 4f0c90365..b07dc98e7 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1739,5 +1739,5 @@ module.exports = { verifyConformanceConfirmation:'Verify conformance confirmation', designConformanceVerification:'Design conformance verification', nomorethan:'No more than 10', - uploadedfilelarger:'The uploaded file is larger than 50 MB', + uploadedfilelarger:'The uploaded file is larger than', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index aaa978cf2..37ca1e33e 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1841,5 +1841,5 @@ module.exports = { verifyConformanceConfirmation:'验证符合性确认', designConformanceVerification:'设计符合性确认', nomorethan:'不能超过10个', - uploadedfilelarger:'文件大于50M', + uploadedfilelarger:'文件大于', } \ No newline at end of file diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue index 747211830..b5af5bf18 100644 --- a/jero-web/src/components/uploadFile/file.vue +++ b/jero-web/src/components/uploadFile/file.vue @@ -103,7 +103,7 @@ const isLt2KB = file.size / 1024 /1024 < this.size let name = file.name if (!isLt2KB) { - this.$message.error(name + this.$t('uploadedfilelarger')) + this.$message.error(name + this.$t('uploadedfilelarger') + this.size + 'M') return false } } diff --git a/jero-web/src/components/uploadFileOta/file.vue b/jero-web/src/components/uploadFileOta/file.vue index eee02201e..06be66e1c 100644 --- a/jero-web/src/components/uploadFileOta/file.vue +++ b/jero-web/src/components/uploadFileOta/file.vue @@ -34,7 +34,7 @@ export default { name: 'file', - props: ['disableds', 'disabled','acceptcode', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'], + props: ['disableds', 'disabled','acceptcode', 'thisFileUploadUrl','size', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'], data() { return { visible: false, @@ -98,6 +98,15 @@ return false } } + // 根据大小拦截 + if(this.size){ + const isLt2KB = file.size / 1024 /1024 < this.size + let name = file.name + if (!isLt2KB) { + this.$message.error(name + this.$t('uploadedfilelarger') + this.size + 'M') + return false + } + } if (this.isMultiple) { if ((this.myfileList && this.myfileList.length == 1) || this.myfileList && this.myfileList.length > 1) { this.$message.warning(this.$t('onlyOnefileUploaded'))