From a9f2cf25015ddc58032e1a01240e0e54b4524cea Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 6 Jan 2020 19:12:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?task=201309=20=E5=A4=A7=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java | 10 ++++++---- .../annotation/{UseMongoDb.java => ElasticSearch.java} | 2 +- .../cn/estsh/i3plus/pojo/mes/annotation/Json4Es.java | 15 +++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesProductData.java | 17 ++++++++++------- 4 files changed, 32 insertions(+), 12 deletions(-) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/{UseMongoDb.java => ElasticSearch.java} (87%) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/Json4Es.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java index 532ec2a..5bd3895 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java @@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description :生产数据 @@ -102,4 +99,9 @@ public class MesProductData extends BaseBean { @ApiParam("数据组号") private String groupNo; + @Lob + @Column(name = "TEST_DATA") + @ApiParam("测试json数据") + private String testData; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/ElasticSearch.java similarity index 87% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/ElasticSearch.java index e4d90a6..93e0ba9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/ElasticSearch.java @@ -11,5 +11,5 @@ import java.lang.annotation.*; @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) @Documented -public @interface UseMongoDb { +public @interface ElasticSearch { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/Json4Es.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/Json4Es.java new file mode 100644 index 0000000..3921f97 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/Json4Es.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.annotation; + + +import java.lang.annotation.*; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/12/25 1:45 下午 + * @Description: + **/ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +@Documented +public @interface Json4Es { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index 602bb21..fc86e50 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -2,7 +2,8 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.mes.annotation.UseMongoDb; +import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch; +import cn.estsh.i3plus.pojo.mes.annotation.Json4Es; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -10,11 +11,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description :生产数据 @@ -34,7 +31,7 @@ import javax.persistence.Transient; @Index(columnList = "OBJECT_CODE"), @Index(columnList = "MODIFY_DATE_TIME") }) -//@UseMongoDb +@ElasticSearch @Api("生产数据") public class MesProductData extends BaseBean { @Column(name = "WORK_CENTER_CODE") @@ -109,6 +106,12 @@ public class MesProductData extends BaseBean { @ApiParam("数据组号") private String groupNo; + @Json4Es + @Column(name = "TEST_DATA") + @ApiParam("测试json数据") + private String testData; + + @Lob @Transient @ApiParam("字段总数") private Integer fieldNum; From b2edab4ef403dc6e7ec251dc4a69109f3ae1f5f6 Mon Sep 17 00:00:00 2001 From: e-jiawentao1 Date: Tue, 7 Jan 2020 11:38:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?2020-01-07=E5=88=9B=E5=BB=BA=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2=E4=B8=8E=E8=A1=A8=E5=8D=95dao?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/repository/WmsFieldInfoRepository.java | 16 ++++++++++++++++ .../wms/repository/WmsListElementFunctionRepository.java | 16 ++++++++++++++++ .../pojo/wms/repository/WmsListElementRepository.java | 16 ++++++++++++++++ .../repository/WmsSearchElementFunctionRepository.java | 16 ++++++++++++++++ .../pojo/wms/repository/WmsSearchElementRepository.java | 16 ++++++++++++++++ 5 files changed, 80 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java new file mode 100644 index 0000000..f1e59d0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo; +import org.springframework.stereotype.Repository; + +/** + * @Description : WMS字段信息表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 11:30 + * @Modify: + **/ +@Repository +public interface WmsFieldInfoRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java new file mode 100644 index 0000000..5b724e6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElementFunction; +import org.springframework.stereotype.Repository; + +/** + * @Description : WMS列表元素菜单关系表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 11:30 + * @Modify: + **/ +@Repository +public interface WmsListElementFunctionRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java new file mode 100644 index 0000000..9433e7d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElement; +import org.springframework.stereotype.Repository; + +/** + * @Description : WMS列表元素表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 11:30 + * @Modify: + **/ +@Repository +public interface WmsListElementRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java new file mode 100644 index 0000000..1746d7e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElementFunction; +import org.springframework.stereotype.Repository; + +/** + * @Description : WMS搜索元素菜单关系表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 11:30 + * @Modify: + **/ +@Repository +public interface WmsSearchElementFunctionRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java new file mode 100644 index 0000000..028586d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElement; +import org.springframework.stereotype.Repository; + +/** + * @Description : WMS搜索元素表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 11:30 + * @Modify: + **/ +@Repository +public interface WmsSearchElementRepository extends BaseRepository { +}