diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 50d3dfa..97b1a55 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -26,69 +26,70 @@ import java.io.Serializable; @JsonInclude(value = JsonInclude.Include.NON_EMPTY) //""或null属性不参加序列转换 public abstract class BaseBean implements Serializable { - private static final long serialVersionUID = 1L; - - //此处使用hibernate的主键策略方式 - //手动设置,使用iplus-platform-common中的idtool生成 - @Id - @GeneratedValue(generator = "IDGenerator") - @GenericGenerator(name = "IDGenerator", strategy = "assigned") - @Column(name="id") - @ApiParam(value = "主键",example = "0") - //将Long类型系列化成String避免精度丢失 - @JsonSerialize(using = ToStringSerializer.class) - public Long id; - //get单独处理 - public Long getId() { - if(id != null) { - return id.longValue(); - }else{ - return id; - } + private static final long serialVersionUID = 1L; + + //此处使用hibernate的主键策略方式 + //手动设置,使用iplus-platform-common中的idtool生成 + //将Long类型系列化成String避免精度丢失 + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name="id") + @ApiParam(value = "主键",example = "0") + @JsonSerialize(using = ToStringSerializer.class) + public Long id; + + //get单独处理 + public Long getId() { + if(id != null) { + return id.longValue(); + }else{ + return id; } + } - @Column(name="factory_code") - @ApiParam(value = "工厂代码") - public String factoryCode; + @Column(name="factory_code") + @ApiParam(value = "工厂代码") + public String factoryCode; - @Column(name="is_valid") - @ApiParam(value = "有效性",example = "1") - public Integer isValid; //EnumUtil.isValid; + @Column(name="is_valid") + @ApiParam(value = "有效性",example = "1") + public Integer isValid; //EnumUtil.isValid; - @Column(name="create_user") - @ApiParam(value = "创建日期") - public String createUser; + @Column(name="create_user") + @ApiParam(value = "创建日期") + public String createUser; - @Column(name="create_date") - @ApiParam(value = "创建日期") - public String createDatetime; + @Column(name="create_date") + @ApiParam(value = "创建日期") + public String createDatetime; - @Column(name="modify_user") - @ApiParam(value = "修改人") - public String modifyUser; + @Column(name="modify_user") + @ApiParam(value = "修改人") + public String modifyUser; - @Column(name="modify_date") - @ApiParam(value = "修改日期") - public String modifyDatetime; + @Column(name="modify_date") + @ApiParam(value = "修改日期") + public String modifyDatetime; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="创建日期查询用,查询起始日期",example = "2000-01-01 01:00:00") - public transient String createDateTimeStart; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="创建日期查询用,查询起始日期",example = "2000-01-01 01:00:00") + public transient String createDateTimeStart; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="创建日期查询用,查询结束日期",example = "2000-01-01 01:00:00") - public transient String createDateTimeEnd; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="创建日期查询用,查询结束日期",example = "2000-01-01 01:00:00") + public transient String createDateTimeEnd; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="修改日期查询用,查询起始日期",example = "用于前台查询") - public transient String modifyDateTimeStart; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="修改日期查询用,查询起始日期",example = "用于前台查询") + public transient String modifyDateTimeStart; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "修改日期查询用,查询结束日期",example = "用于前台查询") - public transient String modifyDateTimeEnd; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "修改日期查询用,查询结束日期",example = "用于前台查询") + public transient String modifyDateTimeEnd; - @ApiParam(value = "排序属性") - public transient String orderByParam; + @ApiParam(value = "排序属性") + public transient String orderByParam; @ApiParam(value = "排序属性",example = "1") //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index 431dbb7..86021d7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -80,7 +80,7 @@ public interface BaseRepository extends JpaReposito * 通过 in 批量删除 * @param ids 熟悉值数组 */ - public void deleteByIdIn(long[] ids); + public void deleteByIds(long[] ids); /** * 通过多单属性进行单个值更新 diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 8a894ae..843eb68 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -144,7 +144,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override - public void deleteByIdIn(long[] ids) { + public void deleteByIds(long[] ids) { if(ids != null && ids.length > 0){ String hql = "delete from " + persistentClass.getName() + " model where model.id in(:ids) "; Query query = entityManager.createQuery(hql); diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index dfb816f..3dc903b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -82,7 +82,7 @@ public class SysMenu extends BaseBean { @Column(name="MENU_STATUS") @ApiParam(value ="功能状态(1.正常,2.禁用)" , example ="1" , access ="功能状态(1.正常,2.禁用)",defaultValue="1") - private Integer menuStatus = 1; + private Integer menuStatus; @ApiParam(value ="子集列表") private transient List childList;