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 29d85ba..50d3dfa 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,69 @@ 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生成 + @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; + } } - } - @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/JpaConfig.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/JpaConfig.java deleted file mode 100644 index b839105..0000000 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/JpaConfig.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.base.jpa; - -import cn.estsh.i3plus.pojo.base.jpa.factory.BaseRepositoryFactoryBean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; - -/** - * @Description : 自定义jps接口实现配置说明 - * @Reference : 现在有平台对持久层进行控制 - * @Author : alwaysfrin - * @CreateDate : 2018-09-13 14:55 - * @Modify: - **/ -//@Configuration -//@EnableJpaRepositories(basePackages = {"cn.estsh.**"}, repositoryFactoryBeanClass = BaseRepositoryFactoryBean.class)//指定自己的工厂类 -public class JpaConfig { -} 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 e55750a..189a329 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 @@ -182,7 +182,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T getById(long id) { - return this.getOne(id); + return entityManager.find(persistentClass,id); } @Override diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogOperateRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogOperateRepository.java index 5085132..798cefd 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogOperateRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogOperateRepository.java @@ -2,13 +2,14 @@ package cn.estsh.i3plus.pojo.platform.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.platform.bean.LogOperate; +import org.springframework.data.mongodb.repository.MongoRepository; /** - * @Description : 操作日志表 + * @Description : 操作日志表(使用Mongodb) * @Reference : * @Author : wei.peng * @Date : 2018-10-22 12:03:00.118 * @Modify : **/ -public interface LogOperateRepository extends BaseRepository { +public interface LogOperateRepository extends MongoRepository { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogSystemRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogSystemRepository.java index 6fdcb87..c608ab9 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogSystemRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogSystemRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.platform.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.platform.bean.LogSystem; +import org.springframework.data.mongodb.repository.MongoRepository; /** * @Description : 系统日志表 @@ -10,5 +11,5 @@ import cn.estsh.i3plus.pojo.platform.bean.LogSystem; * @Date : 2018-10-22 12:03:00.158 * @Modify : **/ -public interface LogSystemRepository extends BaseRepository { +public interface LogSystemRepository extends MongoRepository { } diff --git a/pom.xml b/pom.xml index 8eebdab..d6218ea 100644 --- a/pom.xml +++ b/pom.xml @@ -37,6 +37,11 @@ + + org.springframework.boot + spring-boot-starter-data-mongodb + + io.springfox