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