From 4d2d13391de6c33d9f426e9c801e5ac0d02aced4 Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Wed, 6 Jan 2021 18:14:09 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E9=81=93=E5=8F=A3=E6=B3=8A=E4=BD=8D?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: andly.pan --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index bc9e9bd..4e0a969 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -557,11 +557,11 @@ public class WmsStockSn extends BaseBean { @Transient @ApiParam("道口") - private String dock; + private String remark1; @Transient @ApiParam("泊位") - private String zdoc; + private String remark2; public WmsStockSn(String sn, String vendorNo, Integer snStatus, Integer qcStatus, Double qty, String partNo, String partNameRdd, String locateNo, Integer x, Integer y, Integer z, String lotNo, String dateCode, String leftCode, String fixLotNo, String qualityDate) { From b2ff485591c084fd50d8b0b45b88fd864a2eb765 Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Fri, 26 Feb 2021 15:46:31 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: andly.pan --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 4e0a969..bc9e9bd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -557,11 +557,11 @@ public class WmsStockSn extends BaseBean { @Transient @ApiParam("道口") - private String remark1; + private String dock; @Transient @ApiParam("泊位") - private String remark2; + private String zdoc; public WmsStockSn(String sn, String vendorNo, Integer snStatus, Integer qcStatus, Double qty, String partNo, String partNameRdd, String locateNo, Integer x, Integer y, Integer z, String lotNo, String dateCode, String leftCode, String fixLotNo, String qualityDate) { From b7caa5836bf0b4c0a85f2702a88b18c4bf480a7e Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Fri, 26 Feb 2021 15:53:47 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: andly.pan --- .../cn/estsh/i3plus/pojo/aps/bean/ImportField.java | 80 ++++++++++++++++ .../estsh/i3plus/pojo/aps/bean/SafeStockOrder.java | 33 +++++++ .../i3plus/pojo/aps/holders/EImportField.java | 5 + .../i3plus/pojo/aps/model/ExportModelRequest.java | 21 +++++ .../pojo/aps/repository/ImportFieldRepository.java | 9 ++ .../aps/repository/SafeStockOrderRepository.java | 9 ++ .../src/main/resources/relations/ImportDetail.xml | 5 + .../i3plus/pojo/mes/bean/IfDeliverOrderData.java | 70 ++++++++++++++ .../i3plus/pojo/mes/bean/MesAnalysisRule.java | 44 +++++++++ .../estsh/i3plus/pojo/mes/bean/MesBpBusiness.java | 43 +++++++++ .../i3plus/pojo/mes/bean/MesDataMigrationCfg.java | 103 +++++++++++++++++++++ .../pojo/mes/bean/MesEquTaskDetailStandard.java | 50 ++++++++++ .../pojo/mes/bean/MesEquTaskPlanStandard.java | 50 ++++++++++ .../i3plus/pojo/mes/bean/MesPackageQueue.java | 76 +++++++++++++++ .../i3plus/pojo/mes/bean/MesPartAnalysisRule.java | 40 ++++++++ .../i3plus/pojo/mes/bean/MesStateMachineStep.java | 80 ++++++++++++++++ .../pojo/mes/model/BusiQueueDispatchModel.java | 36 +++++++ .../estsh/i3plus/pojo/mes/model/IfReportModel.java | 32 +++++++ .../i3plus/pojo/mes/model/LogisticsBiModel.java | 36 +++++++ .../i3plus/pojo/mes/model/RouteProcessModel.java | 43 +++++++++ .../mes/model/StateMachineRouteDesignModel.java | 47 ++++++++++ .../pojo/mes/model/StateMachineStatusModel.java | 31 +++++++ .../pojo/mes/model/StateMachineStepModel.java | 23 +++++ .../pojo/mes/model/StateMachineStepParamModel.java | 27 ++++++ .../i3plus/pojo/mes/model/TestStateModel.java | 20 ++++ .../mes/model/mgn/tj/AssemblyRealWorkModel.java | 30 ++++++ .../pojo/mes/model/report/ConditionQueryModel.java | 38 ++++++++ .../model/report/CosmaReportProductSnModel.java | 25 +++++ .../pojo/mes/model/report/ProdCustPartModel.java | 31 +++++++ .../model/report/ProduceDefectRatePlatoModel.java | 57 ++++++++++++ .../mes/model/report/ProductSnConditionModel.java | 62 +++++++++++++ .../repository/IfDeliverOrderDataRepository.java | 9 ++ .../mes/repository/MesAnalysisRuleRepository.java | 15 +++ .../mes/repository/MesBpBusinessRepository.java | 9 ++ .../repository/MesDataMigrationCfgRepository.java | 9 ++ .../MesEquTaskDetailStandardRepository.java | 13 +++ .../MesEquTaskPlanStandardRepository.java | 13 +++ .../mes/repository/MesPackageQueueRepository.java | 15 +++ .../repository/MesPartAnalysisRuleRepository.java | 15 +++ .../repository/MesStateMachineStepRepository.java | 15 +++ .../i3plus/pojo/model/platform/RoleRealmModel.java | 25 +++++ .../pojo/model/platform/SystemLoginModel.java | 40 ++++++++ .../pojo/wms/modelbean/JisReportDetailModel.java | 29 ++++++ .../i3plus/pojo/wms/modelbean/JisReportModel.java | 46 +++++++++ 44 files changed, 1509 insertions(+) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ExportModelRequest.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportFieldRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/SafeStockOrderRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/ImportDetail.xml create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAnalysisRule.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBpBusiness.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetailStandard.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanStandard.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageQueue.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartAnalysisRule.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStep.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BusiQueueDispatchModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfReportModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RouteProcessModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineRouteDesignModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStatusModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepParamModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TestStateModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AssemblyRealWorkModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ConditionQueryModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/CosmaReportProductSnModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProdCustPartModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnConditionModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDeliverOrderDataRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAnalysisRuleRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBpBusinessRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataMigrationCfgRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailStandardRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanStandardRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageQueueRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartAnalysisRuleRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineStepRepository.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RoleRealmModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SystemLoginModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportDetailModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportModel.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java new file mode 100644 index 0000000..24134ab --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java @@ -0,0 +1,80 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EImportDetail; +import cn.estsh.i3plus.pojo.aps.holders.EImportField; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description :数据导入明细 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-23 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_IMPORT_FIELD") +@Api("数据导入字段配置") +public class ImportField extends BaseAPS { + + private static final long serialVersionUID = 8848879008582197564L; + @Column(name="FIELD_NAME") + @ApiParam("字段名") + private String fieldName; + + @Column(name="LABEL_NAME") + @ApiParam("标签名称") + private String labelName; + + @Column(name="DEFAULT_VALUE") + @ApiParam("默认值") + private String defaultValue; + + /** + * 1-是，2-否 + */ + @Column(name="IS_REQUIRE") + @ApiParam(value = "是否必填", example = "0") + private Integer isRequire; + + @Column(name="MAX_LENGTH") + @ApiParam(value = "最大长度", example = "0") + private Integer maxLength; + + @Column(name="RELATION_TABLE") + @ApiParam("关联表名") + private String relationTable; + + @Column(name="RELATION_FIELD") + @ApiParam("关联字段") + private String relationField; + + @Transient + private transient boolean hasDeal = false; + + @Column(name="IMPORT_DETAIL_ID") + @ApiParam(value ="导入明细ID") + @FieldAnnotation(relation = "ImportDetail", notEmpty = true) + private Long importDetailId; + + public ImportDetail getImportDetail() { + return BeanRelation.get(this, EImportField.ImportDetail); + } + + public void setImportDetail(ImportDetail detail) { + this.importDetailId = detail != null ? detail.getId() : 0l; + BeanRelation.set(this, EImportField.ImportDetail, detail); + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java new file mode 100644 index 0000000..53a7d66 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.Api; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :安全库存订单 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-02-23 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_SAFE_STOCK_ORDER") +@Api("安全库存订单") +public class SafeStockOrder extends BaseOrder { + + private static final long serialVersionUID = 5944067344390531794L; + + @JsonIgnore + public Work getWork() { + return BeanRelation.get(this, EBaseOrder.Works); + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java new file mode 100644 index 0000000..eeff1ef --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EImportField { + ImportDetail +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ExportModelRequest.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ExportModelRequest.java new file mode 100644 index 0000000..9774f5e --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ExportModelRequest.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import io.swagger.annotations.Api; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 表格导出查询参数 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-02-25 + * @Modify: + **/ +@Data +@Api("表格导出查询参数") +public class ExportModelRequest { + private String filter; + private List sorts; + private String tableName; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportFieldRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportFieldRepository.java new file mode 100644 index 0000000..395975c --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportFieldRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.ImportField; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ImportFieldRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/SafeStockOrderRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/SafeStockOrderRepository.java new file mode 100644 index 0000000..ff0c5ee --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/SafeStockOrderRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.SafeStockOrder; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface SafeStockOrderRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ImportDetail.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ImportDetail.xml new file mode 100644 index 0000000..56372fd --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ImportDetail.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java new file mode 100644 index 0000000..7b8c9ff --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDeliverOrderData.java @@ -0,0 +1,70 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * @Description :IF_订单交付数据 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-11-06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "IF_DELIVER_ORDER_DATA") +@Api("IF_订单交付数据") +public class IfDeliverOrderData extends BaseBean implements Serializable { + private static final long serialVersionUID = 855289009053695347L; + + @Column(name = "RGANIZTION_CODE") + @ApiParam("工厂代码") + private String rganiztionCode; + + @Column(name = "YEAR") + @ApiParam("年") + private Integer year; + + @Column(name = "MONTH") + @ApiParam("月") + private Integer month; + + @Column(name = "QTY") + @ApiParam("发运数量") + private Integer qty = 0; + + @Column(name = "MOVE_TYPE") + @ApiParam("移动类型") + private Integer moveType; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAnalysisRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAnalysisRule.java new file mode 100644 index 0000000..4384878 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAnalysisRule.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ANALYSIS_RULE") +@Api("MES_解析规则") +public class MesAnalysisRule extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5274274774653791153L; + + @Column(name = "RULE_CODE") + @ApiParam("规则代码") + private String ruleCode; + + @Column(name = "ANALYSIS_RULE_CODE") + @ApiParam("解析规则") + private String analysisRuleCode; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBpBusiness.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBpBusiness.java new file mode 100644 index 0000000..5a1bed1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBpBusiness.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description :BP业务对比表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-11-06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_BP_BUSINESS") +@Api("BP业务对比表") +public class MesBpBusiness extends BaseBean implements Serializable { + private static final long serialVersionUID = 855289009053666347L; + + @Column(name = "YEAR") + @ApiParam("年") + private Integer year; + + @Column(name = "MONTH") + @ApiParam("月") + private Integer month; + + @Column(name = "QTY") + @ApiParam("预测数量") + private Double qty = 0d; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java new file mode 100644 index 0000000..14a5354 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java @@ -0,0 +1,103 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_DATA_MIGRATION_CFG") +@Api("MES数据迁移配置表") +public class MesDataMigrationCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6445732389643648643L; + + @Column(name = "PCN_CODE") + @ApiParam("PCN节点名称代码") + private String pcnCode; + + @Column(name = "MIG_NAME") + @ApiParam("名称") + private String migName; + + @Column(name = "REMARK") + @ApiParam("描述") + private String remark; + +// @Column(name = "MIGRATION_CYCLE") +// @ApiParam("迁移周期") +// private String migrationCycle; +// +// @Column(name = "NEXT_EXECUTION_TIME") +// @ApiParam("下次执行时间") +// private String nextExecutionTime; + + @Column(name = "SRC_TABLE_NAME") + @ApiParam("来源表名") + private String srcTableName; + + @Column(name = "SRC_QUERY_CONDITIONS") + @ApiParam("来源表查询条件") + private String srcQueryConditions; + + @Column(name = "PROCESS_QTY") + @ApiParam(value = "每次处理行数", example = "0") + private Integer processQty; + + @Column(name = "DEST_TABLE_NAME") + @ApiParam("目标表名") + private String destTableName; + + @Column(name = "IS_PHYSICAL_DELETE") + @ApiParam(value = "是否物理删除", example = "0") + private Integer isPhysicalDelete; + + @Column(name = "LAST_EXECUTION_TIME") + @ApiParam("末次迁移时间") + private String lastExecutionTime; + + @Column(name = "LAST_MIGRATION_QTY") + @ApiParam(value = "末次迁移记录数", example = "0") + private Integer lastMigrationQty; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("执行错误日志") + private String errorMessage; + + + @Transient + @ApiParam(value = "开始时间") + private String mcStartTime; + + @Transient + @ApiParam(value = "结束时间") + private String mcEndTime; + + /*public MesDataMigrationCfg(String migName, String remark, String migrationCycle, String nextExecutionTime, String srcTableName, String srcQueryConditions, Integer processQty, String destTableName, Integer isPhysicalDelete, String lastExecutionTime, Integer lastMigrationQty, String errorMessage, String mcStartTime, String mcEndTime) { + this.migName = migName; + this.remark = remark; + this.migrationCycle = migrationCycle; + this.nextExecutionTime = nextExecutionTime; + this.srcTableName = srcTableName; + this.srcQueryConditions = srcQueryConditions; + this.processQty = processQty; + this.destTableName = destTableName; + this.isPhysicalDelete = isPhysicalDelete; + this.lastExecutionTime = lastExecutionTime; + this.lastMigrationQty = lastMigrationQty; + this.errorMessage = errorMessage; + this.mcStartTime = mcStartTime; + this.mcEndTime = mcEndTime; + }*/ +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetailStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetailStandard.java new file mode 100644 index 0000000..97c9310 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetailStandard.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/1/25 10:47 AM + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_EQU_TASK_DETAIL_STANDARD") +@Api("设备作业任务要求") +public class MesEquTaskDetailStandard extends BaseBean implements Serializable { + private static final long serialVersionUID = 8033976649492744091L; + + @Column(name = "TASK_DETAIL_ID") + @ApiParam("任务明细ID") + private Long taskDetailId; + + @Column(name = "ACTION_ITEM") + @ApiParam("操作项") + private String actionItem; + + @Column(name = "ACTION_STANDARD") + @ApiParam("操作标准") + private String actionStandard; + + @Column(name = "ACTION_GUIDE") + @ApiParam("操作指导") + private String actionGuide; + + @Column(name = "ACTION_GUIDE_URL") + @ApiParam("指导文件路径") + private String actionGuideUrl; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanStandard.java new file mode 100644 index 0000000..71b4157 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanStandard.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description: 设备周期计划作业要求 + * @Author: jokelin + * @Date: 2021/1/25 10:43 AM + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_EQU_TASK_PLAN_STANDARD") +@Api("设备周期计划作业要求") +public class MesEquTaskPlanStandard extends BaseBean implements Serializable { + private static final long serialVersionUID = 8284644034068953809L; + + @Column(name = "PLAN_ID") + @ApiParam("计划ID") + private Long planId; + + @Column(name = "ACTION_ITEM") + @ApiParam("操作项") + private String actionItem; + + @Column(name = "ACTION_STANDARD") + @ApiParam("操作标准") + private String actionStandard; + + @Column(name = "ACTION_GUIDE") + @ApiParam("操作指导") + private String actionGuide; + + @Column(name = "ACTION_GUIDE_URL") + @ApiParam("指导文件路径") + private String actionGuideUrl; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageQueue.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageQueue.java new file mode 100644 index 0000000..d3dab83 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageQueue.java @@ -0,0 +1,76 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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 java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/12/10 5:39 PM + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PACKAGE_QUEUE", indexes = { + @Index(columnList = "PACKAGE_NO"), + @Index(columnList = "CT_NO") +}) +@Api("MES_包装队列") +public class MesPackageQueue extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7427832962272134299L; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装编码") + private String packageNo; + + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameAdd; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ApiParam("数量") + private Double qty; + + @Column(name = "LOT_NO") + @ApiParam("批号") + private String lotNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批号") + private String fixLotNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ApiParam("排序") + private Double seq; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartAnalysisRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartAnalysisRule.java new file mode 100644 index 0000000..83be007 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartAnalysisRule.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_ANALYSIS_RULE") +@Api("MES_物料解析规则配置") +public class MesPartAnalysisRule extends BaseBean implements Serializable { + + private static final long serialVersionUID = 7877300316848838443L; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "RULE_CODE") + @ApiParam("规则代码") + private String ruleCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStep.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStep.java new file mode 100644 index 0000000..613a5bd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStep.java @@ -0,0 +1,80 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :状态机工步参数配置表 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_STATE_MACHINE_STEP") +@Api("状态机工步参数配置表") +public class MesStateMachineStep extends BaseBean implements Serializable { + + @Column(name = "SM_CODE") + @ApiParam("状态机代码") + private String smCode; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; + + @Column(name = "AMG_ID") + @ApiParam("工步集代码") + private Long amgId; + + @Column(name = "STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name = "STEP_SEQ") + @ApiParam("工步顺序") + private Integer stepSeq; + + @Column(name = "PARAM_CODE") + @ApiParam("工步参数代码") + private String paramCode; + + @Column(name = "PARAM_TYPE") + @ApiParam("工步参数类型") + private Integer paramType; + + @Column(name = "PARAM_VALUE") + @ApiParam("工步参数值") + private String paramValue; + + @Column(name = "PARAM_ATTRIBUTE") + @ApiParam("参数属性") + private String paramAttribute; + + + public int getStepSeq() { + return this.stepSeq == null ? 0 : this.stepSeq; + } + + public void setStepSeq(int stepSeq) { + this.stepSeq = stepSeq; + } + + public int getParamTypeVal() { + return this.paramType == null ? 0 : this.paramType; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BusiQueueDispatchModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BusiQueueDispatchModel.java new file mode 100644 index 0000000..2883a02 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BusiQueueDispatchModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: 业务队列model + * @Reference: + * @Author: wangjie + * @CreateDate: 2020-06-28-11:44 + * @Modify: + **/ +@Data +public class BusiQueueDispatchModel { + + @ApiParam("实现类") + private Object busDispatchervice; + + @ApiParam("组织代码") + private String organizeCode; + + @ApiParam("key") + private String key; + + @ApiParam("数据") + private Object Obj; + + @ApiParam("信息") + private String info; + + @ApiParam("集合") + private List list; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfReportModel.java new file mode 100644 index 0000000..b2cc171 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfReportModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/2/19 2:58 PM + * @Modify: + */ +@Data +public class IfReportModel { + + @ApiParam("接口表代码") + private String ifTableCode; + + @ApiParam("接口表名称") + private String ifTableName; + + @ApiParam("总数") + private Integer total; + + @ApiParam("已同步数量") + private Integer alreadySync; + + @ApiParam("未同步数量") + private Integer noSync; + + @ApiParam("修改时间") + private String modifyDatetime; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java new file mode 100644 index 0000000..b3105ce --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/LogisticsBiModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/7/28 2:37 下午 + * @Modify: + */ +@Data +public class LogisticsBiModel implements Serializable { + + @ApiParam(value = "去年每月发运数量") + private double lastQty = 0; + + @ApiParam(value = "今年每月发运数量") + private double thisQty = 0; + + @ApiParam(value = "比例值") + private double annualRatio = 0; + + @ApiParam(value = "月份") + private Integer month; + + @ApiParam(value = "实际出库数量") + private double outQty = 0; + + @ApiParam(value = "BP总数") + private double bpQty= 0; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RouteProcessModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RouteProcessModel.java new file mode 100644 index 0000000..b0e5ec7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RouteProcessModel.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesPartProduceType; +import cn.estsh.i3plus.pojo.mes.bean.MesProcess; +import cn.estsh.i3plus.pojo.mes.bean.MesRoute; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 流程工序Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-09-27 15:39 + * @Modify: + **/ +@Data +@Api("流程工序Model") +public class RouteProcessModel { + + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("产线代码") + private String workCenterCode; + + @ApiParam("流程代码") + private String routeCode; + + @ApiParam("流程类型") + private Integer routeType; + + @ApiParam("流程集合") + private List routeList; + + @ApiParam("工序集合") + private List processList; + + @ApiParam("生产类型集合") + private List pptList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineRouteDesignModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineRouteDesignModel.java new file mode 100644 index 0000000..25a2d08 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineRouteDesignModel.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesRoute; +import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess; +import cn.estsh.i3plus.pojo.mes.bean.MesStateMachine; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description : 状态机流程工序设计Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-09-27 15:39 + * @Modify: + **/ +@Data +@Api("状态机流程工序设计Model") +public class StateMachineRouteDesignModel { + + @ApiParam("工厂") + private String organizeCode; + + @ApiParam("用户") + private String userInfo; + + @ApiParam("流程") + private MesRoute route; + + @ApiParam("流程工序(根据Seq分组)") + private Map routeProcessMap; + + @ApiParam("状态机") + private MesStateMachine stateMachine; + + @ApiParam("状态点") + private List stateMachineStatusList; + + @ApiParam("流程工序Id") + private Long routeProcessId; + + @ApiParam("产品流程Id") + private Long prodRouteCfgId; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStatusModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStatusModel.java new file mode 100644 index 0000000..295df7f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStatusModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesStateMachineStatus; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description : 状态点设计Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-09-27 15:39 + * @Modify: + **/ +@Data +@Api("状态点设计Model") +public class StateMachineStatusModel extends MesStateMachineStatus { + + @ApiParam("状态点顺序") + private Integer seq = 0; + + @ApiParam("状态点工步集Map") + private Map> stepGroupMap; + + @ApiParam("下个状态点MAP") + private Map> nextStatusGroupMap; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepModel.java new file mode 100644 index 0000000..bf16352 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesStep; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 状态机流程工步设计Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-09-27 15:39 + * @Modify: + **/ +@Data +@Api("状态机流程工步设计Model") +public class StateMachineStepModel extends MesStep { + + @ApiParam("工步参数集合") + private List stepParamList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepParamModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepParamModel.java new file mode 100644 index 0000000..4808522 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateMachineStepParamModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesStepParam; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description : 状态机流程工步参数设计Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-09-27 15:39 + * @Modify: + **/ +@Data +@Api("状态机流程工步参数设计Model") +public class StateMachineStepParamModel extends MesStepParam { + + @ApiParam("参数值") + private String paramValue; + + @ApiParam("可选值的数据") + private List> enumList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TestStateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TestStateModel.java new file mode 100644 index 0000000..0957f35 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TestStateModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @author wangjie + * @date 2020/4/14 15:18 + * @desc + */ +@Data +public class TestStateModel { + + @ApiParam("扫描信息") + private String scanInfo; + + @ApiParam("时间") + private String createDatetime; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AssemblyRealWorkModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AssemblyRealWorkModel.java new file mode 100644 index 0000000..ebb9bc8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AssemblyRealWorkModel.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.tj; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: 总装实际产量model + * @Author: wangjie + * @Date: 2020/10/28 2:56 PM + * @Modify: + */ +@Data +public class AssemblyRealWorkModel { + + @ApiParam("生产线代码") + private String workCenterCode; + + @ApiParam("实际产量") + private Double realProdQty; + + @ApiParam("实际目标") + private Double realPlanQty; + + @ApiParam("班产目标") + private Double shiftPlanQty; + + @ApiParam("本班达成率") + private Integer shiftPassPercent; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ConditionQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ConditionQueryModel.java new file mode 100644 index 0000000..22f0883 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ConditionQueryModel.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 产品工序过程查询-条件 + * @author yumingxing + * @version 1.0 + * @date 2021/1/10 11:02 + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("产品工序过程查询-条件") +public class ConditionQueryModel { + + @ApiParam("项目名称") + private String prodCfgTypeCode; + + @ApiParam("客户零件号") + private String customerPartNo; + + @ApiParam("开始时间") + private String modifyStartDate; + + @ApiParam("结束时间") + private String modifyEndDate; + + @ApiParam("零件二维码") + private String serialNumber; + + @ApiParam("质量状态") + private Integer qcStatus; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/CosmaReportProductSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/CosmaReportProductSnModel.java new file mode 100644 index 0000000..26dfa50 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/CosmaReportProductSnModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * 产品条码返回model + * @author xiangming.liao + * @version 1.0 + * @date 2021/01/06 10:43 + **/ +@Data +@ApiModel("产品条码返回model") +public class CosmaReportProductSnModel extends MesProduceSn implements Serializable { + + private static final long serialVersionUID = 5217363746963291483L; + @ApiParam("条码类型Name") + private String snTypeName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProdCustPartModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProdCustPartModel.java new file mode 100644 index 0000000..beecea1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProdCustPartModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @author yumingxing + * @version 1.0 + * @date 2021/1/9 14:29 + **/ +@ApiModel("项目号零件号") +@Data + +public class ProdCustPartModel { + + @ApiParam("项目号") + private String prodCfgTypeCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("客户零件号") + private String customerPartNo; + + public ProdCustPartModel(String prodCfgTypeCode, String partNo, String customerPartNo) { + this.prodCfgTypeCode = prodCfgTypeCode; + this.partNo = partNo; + this.customerPartNo = customerPartNo; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoModel.java new file mode 100644 index 0000000..0fef7e2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDefectRatePlatoModel.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.util.List; + +/** + * @Author: xiangming.liao + * @CreateDate: 2020/12/28 14:24 下午 + * @Description: 缺陷率占比柏拉图报表model + **/ +@Api("缺陷率占比柏拉图报表model") +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ProduceDefectRatePlatoModel { + + @ApiParam("项目号") + private String prodCfgTypeCode; + + @ApiParam("客户零件号") + private String customerPartNo; + + @ApiParam("缺陷代码") + private String defectCode; + + @ApiParam("缺陷名称") + private String defectName; + + @ApiParam("单项占比") + private Double singleRatio; + + @ApiParam("累计占比") + private Double cumulativeRatio; + + @ApiParam("数量") + private Long qty; + + public ProduceDefectRatePlatoModel(String prodCfgTypeCode, String customerPartNo, String defectCode, String defectName, Long qty) { + this.prodCfgTypeCode = prodCfgTypeCode; + this.customerPartNo = customerPartNo; + this.defectCode = defectCode; + this.defectName = defectName; + this.qty = qty; + } + + public ProduceDefectRatePlatoModel(String prodCfgTypeCode, String customerPartNo, Long qty) { + this.prodCfgTypeCode = prodCfgTypeCode; + this.customerPartNo = customerPartNo; + this.qty = qty; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnConditionModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnConditionModel.java new file mode 100644 index 0000000..2f9566d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnConditionModel.java @@ -0,0 +1,62 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * 产品履历报表-产品信息 + * @author yumingxing + * @version 1.0 + * @date 2020/12/18 15:16 + **/ +@Data +@ApiModel("产品工序过程查询-条件查询页面") +public class ProductSnConditionModel implements Serializable { + + private static final long serialVersionUID = 3154899794523800804L; + + @ApiParam("零件二维码") + private String serialNumber; + + @ApiParam("客户零件号") + private String customerPartNo; + + @ApiParam("CMS零件号") + private String partNo; + + @ApiParam("项目名称") + private String prodCfgTypeCode; + + @ApiParam("产线") + private String workCenterName; + + @ApiParam("工序名称") + private String processName; + + @ApiParam("工位名称") + private String workCellName; + + @ApiParam(value = "扫码时间") + public String createDatetime; + + @ApiParam("质量状态") + private Integer qcStatus; + + @ApiParam("质量状态Name") + private String qcStatusName; + + public ProductSnConditionModel(String serialNumber, String customerPartNo, String partNo, String prodCfgTypeCode, String workCenterName, String processName, String workCellName, String createDatetime, Integer qcStatus) { + this.serialNumber = serialNumber; + this.customerPartNo = customerPartNo; + this.partNo = partNo; + this.prodCfgTypeCode = prodCfgTypeCode; + this.workCenterName = workCenterName; + this.processName = processName; + this.workCellName = workCellName; + this.createDatetime = createDatetime; + this.qcStatus = qcStatus; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDeliverOrderDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDeliverOrderDataRepository.java new file mode 100644 index 0000000..69bc18f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDeliverOrderDataRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfDeliverOrderData; +import org.springframework.stereotype.Repository; + +@Repository +public interface IfDeliverOrderDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAnalysisRuleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAnalysisRuleRepository.java new file mode 100644 index 0000000..db27680 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAnalysisRuleRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesAnalysisRule; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Repository +public interface MesAnalysisRuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBpBusinessRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBpBusinessRepository.java new file mode 100644 index 0000000..743c8fb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBpBusinessRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBpBusiness; +import org.springframework.stereotype.Repository; + +@Repository +public interface MesBpBusinessRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataMigrationCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataMigrationCfgRepository.java new file mode 100644 index 0000000..caa29bb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDataMigrationCfgRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesDataMigrationCfg; +import org.springframework.stereotype.Repository; + +@Repository +public interface MesDataMigrationCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailStandardRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailStandardRepository.java new file mode 100644 index 0000000..38c311a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailStandardRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskDetailStandard; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/1/25 10:49 AM + * @Modify: + */ +public interface MesEquTaskDetailStandardRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanStandardRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanStandardRepository.java new file mode 100644 index 0000000..03b79f7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanStandardRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskPlanStandard; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/1/25 10:46 AM + * @Modify: + */ +public interface MesEquTaskPlanStandardRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageQueueRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageQueueRepository.java new file mode 100644 index 0000000..14d91be --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageQueueRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPackageQueue; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/12/10 5:40 PM + * @Modify: + */ +@Repository +public interface MesPackageQueueRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartAnalysisRuleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartAnalysisRuleRepository.java new file mode 100644 index 0000000..062e6b7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartAnalysisRuleRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPartAnalysisRule; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Repository +public interface MesPartAnalysisRuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineStepRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineStepRepository.java new file mode 100644 index 0000000..9acea36 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineStepRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesStateMachineStep; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019\10\9 + * @Modify: + **/ +public interface MesStateMachineStepRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RoleRealmModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RoleRealmModel.java new file mode 100644 index 0000000..5aae99e --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RoleRealmModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.apache.shiro.realm.Realm; + +/** + * @author Wynne.Lu + * @date 2021/1/19 下午1:29 + * @desc + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class RoleRealmModel { + + private Realm userRealm; + + private Realm saRealm; + + private Realm adminRealm; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SystemLoginModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SystemLoginModel.java new file mode 100644 index 0000000..32c8d93 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SystemLoginModel.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author Wynne.Lu + * @date 2021/1/18 上午10:56 + * @desc 系统登录模型 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Api("系统登录模型") +public class SystemLoginModel { + + @ApiParam(value = "登录名") + private String loginName; + + @ApiParam(value = "登录密码") + private String loginPwd; + + @ApiParam(value = "语言代码") + private String languageCode; + + @ApiParam(value = "设备id") + private String deviceId; + + @ApiParam(value = "单点登录策略") + private String loginStrategy; + + @ApiParam(value = "app Id") + private String appId; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportDetailModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportDetailModel.java new file mode 100644 index 0000000..3f50ac6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportDetailModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +@Api("JIS发运报表明细模型") +public class JisReportDetailModel extends BaseBean { + @ApiParam("客户工厂") + private String customerNo; + @ApiParam("计划发货数量") + private Integer planShipingCount; + @ApiParam("计划发货时间") + private String planLoadTime; + @ApiParam("料架号") + private String fixLotNo; + @ApiParam("排序单号") + private String queneGroupNo; + @ApiParam("JIS号") + private String jisNo; + @ApiParam("箱条码") + private String sn; + @ApiParam("实际发货时间") + private String actualLoadTime; + @ApiParam("实际上线时间") + private String custOnLineTime; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportModel.java new file mode 100644 index 0000000..827a1a7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/JisReportModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +@Api("JIS发运报表模型") +public class JisReportModel extends BaseBean { + + @ApiParam("客户工厂") + private String custOrganizeCode; + @ApiParam("计划装车时间") + private String planLoadTime; + @ApiParam("计划发货数量") + private Double planShipingCount; + @ApiParam("实际装车时间") + private String actualLoadTime; + @ApiParam("实际发货数量") + private Double actualShipingCount; + @ApiParam("状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.TIME_STATUS.class,refForeignKey = "value",value = "description") + private Integer shippingStatus; + @ApiParam("料架号1") + private String queueGroupNo_1; + @ApiParam("客户上线时间1") + private String custOnLineTime_1; + @ApiParam("料架号2") + private String queueGroupNo_2; + @ApiParam("客户上线时间2") + private String custOnLineTime_2; + @ApiParam("料架号3") + private String queueGroupNo_3; + @ApiParam("客户上线时间3") + private String custOnLineTime_3; + @ApiParam("料架号4") + private String queueGroupNo_4; + @ApiParam("客户上线时间4") + private String custOnLineTime_4; + @ApiParam("客户现场库存") + private Double qty; + +} From 6318ca6afcc2232589740f4558f5e33e3a5890b5 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 1 Mar 2021 10:09:25 +0800 Subject: [PATCH 04/20] =?UTF-8?q?feat(form):=20=E5=8A=A8=E6=80=81=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E6=96=B0=E5=A2=9E=E8=B7=B3=E8=BD=AC=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockFormEnumUtil.java | 199 ++++++++++++++------- .../pojo/form/bean/BfMethodDetailProperty.java | 51 +++--- .../pojo/form/bean/BfMethodDetailPropertyRef.java | 2 +- .../i3plus/pojo/model/platform/LogFieldModel.java | 39 ++++ .../i3plus/pojo/model/platform/SysLogModel.java | 57 ++++++ .../{SystemLoginModel.java => SysLoginModel.java} | 2 +- .../pojo/platform/platbean/SysLogOperate.java | 38 ++-- 7 files changed, 286 insertions(+), 102 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LogFieldModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysLogModel.java rename modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/{SystemLoginModel.java => SysLoginModel.java} (96%) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 602ffd8..b53e93c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -337,6 +337,7 @@ public class BlockFormEnumUtil { return tmp; } } + /** * 元素属性显示状态信息 */ @@ -988,7 +989,6 @@ public class BlockFormEnumUtil { } - /** * 元素组织隔离 */ @@ -1209,19 +1209,19 @@ public class BlockFormEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PROPERTY_VIRTUAL_OPERATE_TYPE { - STRING_SPLICE(10, "SPLICE", "字符串拼接",String.class), - NUM_ADD(20, "ADD", "加法计算",Double.class), - NUM_LESS(30, "MIN", "减法计算",Double.class), - NUM_MAKE(40, "MUL", "乘法计算",Double.class), - NUM_DIVISION(50, "DIVISION", "除法计算",Double.class), - JOIN_TABLE(60, "JOIN_TABLE", "连表查询",String.class); + STRING_SPLICE(10, "SPLICE", "字符串拼接", String.class), + NUM_ADD(20, "ADD", "加法计算", Double.class), + NUM_LESS(30, "MIN", "减法计算", Double.class), + NUM_MAKE(40, "MUL", "乘法计算", Double.class), + NUM_DIVISION(50, "DIVISION", "除法计算", Double.class), + JOIN_TABLE(60, "JOIN_TABLE", "连表查询", String.class); private int value; private String code; private String description; private Class clzFullName; - private PROPERTY_VIRTUAL_OPERATE_TYPE(int value, String code, String description,Class clzFullName) { + private PROPERTY_VIRTUAL_OPERATE_TYPE(int value, String code, String description, Class clzFullName) { this.value = value; this.code = code; this.description = description; @@ -1298,23 +1298,23 @@ public class BlockFormEnumUtil { return tmp; } - public Object getPropertyVirtual(Object ... objs){ - if(this.getValue() == STRING_SPLICE.getValue()){ + public Object getPropertyVirtual(Object... objs) { + if (this.getValue() == STRING_SPLICE.getValue()) { return getPropertyVirtualString(objs); - }else if(this.getValue() == NUM_ADD.getValue()){ + } else if (this.getValue() == NUM_ADD.getValue()) { return getPropertyVirtualDoubleAdd(objs); - }else if(this.getValue() == NUM_LESS.getValue()){ + } else if (this.getValue() == NUM_LESS.getValue()) { return getPropertyVirtualDoubleLess(objs); - }else if(this.getValue() == NUM_MAKE.getValue()){ + } else if (this.getValue() == NUM_MAKE.getValue()) { return getPropertyVirtualDoubleMake(objs); - }else if(this.getValue() == NUM_DIVISION.getValue()){ + } else if (this.getValue() == NUM_DIVISION.getValue()) { return getPropertyVirtualDoubleDivision(objs); } return objs; } - private String getPropertyVirtualString(Object ... objs){ - if(objs != null && objs.length > 0){ + private String getPropertyVirtualString(Object... objs) { + if (objs != null && objs.length > 0) { StringBuffer result = new StringBuffer(); for (Object o : objs) { result.append(o == null ? "" : o.toString()); @@ -1324,15 +1324,15 @@ public class BlockFormEnumUtil { return null; } - private Double getPropertyVirtualDoubleAdd(Object ... objs){ - if(objs != null && objs.length > 0){ + private Double getPropertyVirtualDoubleAdd(Object... objs) { + if (objs != null && objs.length > 0) { Double result = Double.valueOf(0); for (Object o : objs) { try { - if(o != null){ + if (o != null) { result += Double.parseDouble(o.toString()); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } @@ -1341,15 +1341,15 @@ public class BlockFormEnumUtil { return null; } - private Double getPropertyVirtualDoubleLess(Object ... objs){ - if(objs != null && objs.length > 0){ + private Double getPropertyVirtualDoubleLess(Object... objs) { + if (objs != null && objs.length > 0) { Double result = Double.valueOf(0); for (Object o : objs) { try { - if(o != null){ + if (o != null) { result -= Double.parseDouble(o.toString()); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } @@ -1358,15 +1358,15 @@ public class BlockFormEnumUtil { return null; } - private Double getPropertyVirtualDoubleMake(Object ... objs){ - if(objs != null && objs.length > 0){ + private Double getPropertyVirtualDoubleMake(Object... objs) { + if (objs != null && objs.length > 0) { Double result = Double.valueOf(0); for (Object o : objs) { try { - if(o != null){ + if (o != null) { result *= Double.parseDouble(o.toString()); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } @@ -1375,15 +1375,15 @@ public class BlockFormEnumUtil { return null; } - private Double getPropertyVirtualDoubleDivision(Object ... objs){ - if(objs != null && objs.length > 0){ + private Double getPropertyVirtualDoubleDivision(Object... objs) { + if (objs != null && objs.length > 0) { Double result = Double.valueOf(0); for (Object o : objs) { try { - if(o != null){ + if (o != null) { result /= Double.parseDouble(o.toString()); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } @@ -1394,7 +1394,6 @@ public class BlockFormEnumUtil { } - /** * 执行类型信息 */ @@ -1751,8 +1750,8 @@ public class BlockFormEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TRIGGER_EVENT { - CLICK(10, "CLICK", "单击"); -// DB_LCLICK(20, "DB_LCLICK", "双击"), + CLICK(10, "CLICK", "单击"), + DOUBLE_CLICK(20, "DOUBLE_CLICK", "双击"); // MOUSE_OUT(30, "MOUSE_OUT", "鼠标指针移出"), // MOUSE_OVER(40, "MOUSE_OVER", "鼠标指针移入"); @@ -1830,6 +1829,88 @@ public class BlockFormEnumUtil { } /** + * 触发反应枚举 + * 功能明细管理中，关联属性的操作， 可以通过事件刷新其他元素，或者通过事件打开另一个功能明细 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TRIGGER_ACTION { + REFRESH(10, "REFRESH", "刷新元素"), + SHOW_METHOD(20, "SHOW_METHOD", "展示其他功能明细"); + + private int value; + private String code; + private String description; + + private TRIGGER_ACTION(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static TRIGGER_ACTION valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * 表单功能明细 触发效果信息 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -1988,8 +2069,8 @@ public class BlockFormEnumUtil { /** * 数据状态 - * 1 启用 - * 2 禁用 + * 1 启用 + * 2 禁用 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_STATUS { @@ -2105,7 +2186,7 @@ public class BlockFormEnumUtil { private String code; private String description; - private ELEMENT_TREE_DIRECTION (int value, String code, String description) { + private ELEMENT_TREE_DIRECTION(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -2153,7 +2234,7 @@ public class BlockFormEnumUtil { return tmp; } - public static ELEMENT_TREE_DIRECTION valueOf(int val) { + public static ELEMENT_TREE_DIRECTION valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { @@ -2185,7 +2266,7 @@ public class BlockFormEnumUtil { private String code; private String description; - private DATA_SOURCE_STATUS (int value, String code, String description) { + private DATA_SOURCE_STATUS(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -2204,7 +2285,6 @@ public class BlockFormEnumUtil { } - public static String valueOfCode(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -2261,14 +2341,14 @@ public class BlockFormEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ELEMENT_CONSTRAINT_TYPE { - UNIQUE(10, "唯一约束"); + UNIQUE(10, "唯一约束"); // 后续扩展联合主键 // PRIMARY_KEY(20, "主键约束") private int value; private String description; - private ELEMENT_CONSTRAINT_TYPE (int value, String description) { + private ELEMENT_CONSTRAINT_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -2308,13 +2388,13 @@ public class BlockFormEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FORM_TRIGGER_SOURCE { - INTERCEPTOR(10, "拦截器"), - BUTTON(20, "按钮"); + INTERCEPTOR(10, "拦截器"), + BUTTON(20, "按钮"); private int value; private String description; - private FORM_TRIGGER_SOURCE (int value, String description) { + private FORM_TRIGGER_SOURCE(int value, String description) { this.value = value; this.description = description; } @@ -2354,16 +2434,16 @@ public class BlockFormEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PROCEDURE_COL_TYPE { - IN_PARAM(1, "入参"), - INOUT_PARAM(2, "出入参"), -// ?(3, "按钮"), - OUT_PARAM(4, "出参"), - RETURN_PARAM(5, "返回值"); + IN_PARAM(1, "入参"), + INOUT_PARAM(2, "出入参"), + // ?(3, "按钮"), + OUT_PARAM(4, "出参"), + RETURN_PARAM(5, "返回值"); private int value; private String description; - private PROCEDURE_COL_TYPE (int value, String description) { + private PROCEDURE_COL_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -2405,19 +2485,18 @@ public class BlockFormEnumUtil { * PROCEDURE_INOUT_PARAM（30）：入参-存储过程的出入参（sqlserver没有出参，都算出入参） * PROCEDURE_OUT_PARAM（40）：入参-存储过程，函数的出参 * PROCEDURE_RETURN（50）：入参-存储过程，函数的返回值（mysql存储过程没有返回值，sqlserver有） - * */ public enum ORIGIN_PROPERTY_TYPE { - NORMAL_PROPERTY(10, "正常属性"), - PROCEDURE_IN_PARAM(20, "入参"), - PROCEDURE_INOUT_PARAM(30, "出入参"), - PROCEDURE_OUT_PARAM(40, "出参"), - PROCEDURE_RETURN(50, "返回值"); + NORMAL_PROPERTY(10, "正常属性"), + PROCEDURE_IN_PARAM(20, "入参"), + PROCEDURE_INOUT_PARAM(30, "出入参"), + PROCEDURE_OUT_PARAM(40, "出参"), + PROCEDURE_RETURN(50, "返回值"); private final int value; private final String description; - private ORIGIN_PROPERTY_TYPE (int value, String description) { + private ORIGIN_PROPERTY_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -2452,7 +2531,7 @@ public class BlockFormEnumUtil { public static ORIGIN_PROPERTY_TYPE procColTypeValOf(int procColTypeVal) { ORIGIN_PROPERTY_TYPE result = NORMAL_PROPERTY; - switch (Objects.requireNonNull(PROCEDURE_COL_TYPE.valueOf(procColTypeVal))){ + switch (Objects.requireNonNull(PROCEDURE_COL_TYPE.valueOf(procColTypeVal))) { case IN_PARAM: result = PROCEDURE_IN_PARAM; break; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java index 06adc7a..bd5d622 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java @@ -28,59 +28,64 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="BF_METHOD_DETAIL_PROPERTY") -@Api(value="表单功能明细关联属性",description = "表单功能明细关联属性") +@Table(name = "BF_METHOD_DETAIL_PROPERTY") +@Api(value = "表单功能明细关联属性", description = "表单功能明细关联属性") public class BfMethodDetailProperty extends BaseBean { private static final long serialVersionUID = -7541677357317732343L; - @Column(name="METHOD_ID") - @ApiParam(value ="功能id") + @Column(name = "METHOD_ID") + @ApiParam(value = "功能id") @JsonSerialize(using = ToStringSerializer.class) private Long methodId; // 关联功能明细表id - @Column(name="PRI_METHOD_DETAIL_ID") - @ApiParam(value ="主功能明细id") + @Column(name = "PRI_METHOD_DETAIL_ID") + @ApiParam(value = "主功能明细id") @JsonSerialize(using = ToStringSerializer.class) private Long priMethodDetailId; - @Column(name="PRI_METHOD_DETAIL_NAME_RDD") - @ApiParam(value ="主功能明细名称") + @Column(name = "PRI_METHOD_DETAIL_NAME_RDD") + @ApiParam(value = "主功能明细名称") private String priMethodDetailNameRdd; - @Column(name="PRI_ELEMENT_ID") - @ApiParam(value ="主对象元素id") + @Column(name = "PRI_ELEMENT_ID") + @ApiParam(value = "主对象元素id") @JsonSerialize(using = ToStringSerializer.class) private Long priElementId; - @Column(name="PRI_ELEMENT_NAME_RDD") - @ApiParam(value ="主对象元素名称") + @Column(name = "PRI_ELEMENT_NAME_RDD") + @ApiParam(value = "主对象元素名称") private String priElementNameRdd; // 枚举:BlockFormEnumUtil.TRIGGER_EVENT - @Column(name="PRI_ELEMENT_EVENT") - @ApiParam(value ="主对象元素事件") + @Column(name = "PRI_ELEMENT_EVENT") + @ApiParam(value = "主对象元素事件") private Integer priElementEvent; - @Column(name="SEC_METHOD_DETAIL_ID") - @ApiParam(value ="关联功能明细id") + // 枚举:BlockFormEnumUtil.TRIGGER_ACTION + @Column(name = "PRI_ELEMENT_ACTION") + @ApiParam(value = "主对象元素动作") + private Integer priElementAction; + + @Column(name = "SEC_METHOD_DETAIL_ID") + @ApiParam(value = "关联功能明细id") @JsonSerialize(using = ToStringSerializer.class) private Long secMethodDetailId; - @Column(name="SEC_METHOD_DETAIL_NAME_RDD") - @ApiParam(value ="关联功能明细名称") + @Column(name = "SEC_METHOD_DETAIL_NAME_RDD") + @ApiParam(value = "关联功能明细名称") private String secMethodDetailNameRdd; - @Column(name="SEC_ELEMENT_ID") - @ApiParam(value ="关联对象元素id") + @Column(name = "SEC_ELEMENT_ID") + @ApiParam(value = "关联对象元素id") @JsonSerialize(using = ToStringSerializer.class) private Long secElementId; - @Column(name="SEC_ELEMENT_NAME_RDD") - @ApiParam(value ="关联对象元素名称") + @Column(name = "SEC_ELEMENT_NAME_RDD") + @ApiParam(value = "关联对象元素名称") private String secElementNameRdd; @Transient - @ApiParam(value ="表单功能明细关联属性") + @ApiParam(value = "表单功能明细关联属性") private List refList; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailPropertyRef.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailPropertyRef.java index 0a5e8be..6f48488 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailPropertyRef.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailPropertyRef.java @@ -26,7 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="BF_METHOD_DETAIL_PROPERTY") +@Table(name="BF_METHOD_DETAIL_PROPERTY_REF") @Api(value="表单功能明细关联属性",description = "表单功能明细关联属性") public class BfMethodDetailPropertyRef extends BaseBean { diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LogFieldModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LogFieldModel.java new file mode 100644 index 0000000..517507e --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LogFieldModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2021/2/20 下午4:39 + * @desc + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Api("日志字段模型") +public class LogFieldModel implements Serializable { + private static final long serialVersionUID = 6303989757683476327L; + + @ApiParam("日志时间") + private String time; + + @ApiParam("线程") + private String thread; + + @ApiParam("日志等级") + private String level; + + @ApiParam("执行堆栈") + private String stack; + + @ApiParam("日志信息") + private String message; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysLogModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysLogModel.java new file mode 100644 index 0000000..fd2b237 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysLogModel.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2021/2/20 下午12:55 + * @desc + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Api("系统日志模型") +public class SysLogModel implements Serializable { + private static final long serialVersionUID = -2982120258911167575L; + + @ApiParam("查询日期") + private String queryDate; + + @ApiParam("查询开始时间") + private String queryBeginTime; + + @ApiParam("查询结束时间") + private String queryEndTime; + + @ApiParam("索引名称") + private String indexName; + + @ApiParam("索引类型") + private Integer indexType; + + @ApiParam("聚合时间") + private Integer aggsDuration; + + @ApiParam("日志等级") + private Integer level; + + @ApiParam("执行线程") + private String thread; + + @ApiParam("服务器环境变量HostId") + private String hostId; + + @ApiParam("日志信息") + private List logs; + + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SystemLoginModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysLoginModel.java similarity index 96% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SystemLoginModel.java rename to modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysLoginModel.java index 32c8d93..965ae38 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SystemLoginModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysLoginModel.java @@ -17,7 +17,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Api("系统登录模型") -public class SystemLoginModel { +public class SysLoginModel { @ApiParam(value = "登录名") private String loginName; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java index 3558410..9c3dfc0 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java @@ -17,55 +17,59 @@ import javax.persistence.Table; /** * @Description : 用户操作日志表 - * @Reference : - * @Author : wei.peng - * @Date : 2018-10-22 16:58:42.720 - * @Modify : + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-22 16:58:42.720 + * @Modify : **/ @Data @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_LOG_OPERATE") -@Api(value="操作日志表",description = "操作日志表") +@Table(name = "SYS_LOG_OPERATE") +@Api(value = "操作日志表", description = "操作日志表") public class SysLogOperate extends BaseBean { private static final long serialVersionUID = 1515035521283176727L; - @ApiParam(value ="系统模块（枚举）", example = "1") - @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description") + @ApiParam(value = "系统模块（枚举）", example = "1") + @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class, refForeignKey = "value", value = "description") private Integer softType; + public String getSoftTypeTxt() { return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); } - @ApiParam(value ="操作类型" , example = "-1") - @AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class,refForeignKey = "value",value = "description") + @ApiParam(value = "操作类型", example = "-1") + @AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class, refForeignKey = "value", value = "description") private Integer operateType; - public String getOperateTypeTxt(){ + public String getOperateTypeTxt() { return operateType == null ? null : ImppEnumUtil.OPERATE_TYPE.valueOfDescription(operateType); } - @ApiParam(value ="操作信息" , access ="操作信息") + @ApiParam(value = "操作信息", access = "操作信息") private String operateMessage; - @ApiParam(value ="登录用户名称" , access ="登录用户名称") + @ApiParam(value = "登录用户名称", access = "登录用户名称") private String userLoginName; - @ApiParam(value ="请求IP" , access ="请求IP") + @ApiParam(value = "请求IP", access = "请求IP") private String remoteIp; - @ApiParam(value ="请求路径" , access ="请求路径") + @ApiParam(value = "本机名/Ip", access = "本机名/Ip") + private String serverHost; + + @ApiParam(value = "请求路径", access = "请求路径") private String requestUrl; // @Column(name="HTTP_METHOD") // @ApiParam(value ="http请求方法" , access ="http请求方法") // private String httpMethod; - @ApiParam(value ="方法入参" , access ="方法入参") + @ApiParam(value = "方法入参", access = "方法入参") private String logArgs; - @ApiParam(value ="执行耗时") + @ApiParam(value = "执行耗时") @JsonSerialize(using = ToStringSerializer.class) private Long executeTime; } From 24aa100dfe64d36821ac67ce2d915e9c9a71d810 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 4 Mar 2021 15:17:21 +0800 Subject: [PATCH 05/20] =?UTF-8?q?=E8=BF=BD=E6=BA=AF=E6=80=BB=E8=A7=88?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java index b7c05dc..08ba812 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java @@ -35,6 +35,9 @@ public class BypassModel { @ApiParam("状态") private String status; + @ApiParam("检测结果") + private Integer result; + @ApiParam("颜色") private String color; From 2e49522aecc01eba8d3b3e26e9b83edab15ea134 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 4 Mar 2021 16:43:46 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E3=80=9014115=2020063-BH=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=95=B0=E6=8D=AE=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=8F=8A=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD-20210305=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java index ab2f3a5..0d70135 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java @@ -1,8 +1,10 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -53,5 +55,6 @@ public class WmsBhChildDetectionItem extends BaseBean { @Column(name = "VALUE_TYPE") @ApiParam("值类型") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE") + @AnnoOutputColumn(refClass = WmsEnumUtil.BH_VALUE_TYPE.class) private Integer valueType; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java index 5db1046..c96e9a2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java @@ -1,8 +1,10 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -62,11 +64,13 @@ public class WmsPartItemCheck extends BaseBean { @Column(name = "VALUE_TYPE") @ApiParam("子检测箱值类型") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE") + @AnnoOutputColumn(refClass = WmsEnumUtil.BH_VALUE_TYPE.class) private Integer valueType; @Column(name = "STANDARD") @ApiParam("标准值") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BH_PART_CHECK_STD") + @AnnoOutputColumn(refClass = WmsEnumUtil.BH_PART_CHECK_STD.class) private Integer standard; @Column(name = "MAX") From 4d40686be82c8fa2369728e5f3039f9bf5974b25 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 4 Mar 2021 17:01:24 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E7=9A=84=E5=85=83=E7=B4=A0=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index 6fbc911..689edcb 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java @@ -160,14 +160,14 @@ public class BfElement extends BaseBean { @ApiParam(value ="默认排序规则") private Integer elementSortAttrType; - @Lob +// @Lob @Column(name="ELEMENT_CSS_STYLE") @ApiParam(value ="元素样式") private String elementCssStyle; - @Lob +// @Lob @Column(name="ELEMENT_FORMATTER") - @ApiParam(value ="元素样式") + @ApiParam(value ="元素格式") private String elementFormatter; @Column(name="ELEMENT_DESCRIPTION") From 2a63c05597313a58da83a04d11b54923bcedef7c Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 4 Mar 2021 17:02:09 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E7=9A=84=E5=85=83=E7=B4=A0=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index 689edcb..994e590 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java @@ -167,7 +167,7 @@ public class BfElement extends BaseBean { // @Lob @Column(name="ELEMENT_FORMATTER") - @ApiParam(value ="元素格式") + @ApiParam(value ="元素格式化") private String elementFormatter; @Column(name="ELEMENT_DESCRIPTION") From 6adc396aef75ce104f0950b638ee6d2d21743a43 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 4 Mar 2021 17:02:44 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E7=9A=84=E5=85=83=E7=B4=A0=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index 6fbc911..994e590 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java @@ -160,14 +160,14 @@ public class BfElement extends BaseBean { @ApiParam(value ="默认排序规则") private Integer elementSortAttrType; - @Lob +// @Lob @Column(name="ELEMENT_CSS_STYLE") @ApiParam(value ="元素样式") private String elementCssStyle; - @Lob +// @Lob @Column(name="ELEMENT_FORMATTER") - @ApiParam(value ="元素样式") + @ApiParam(value ="元素格式化") private String elementFormatter; @Column(name="ELEMENT_DESCRIPTION") From c6031a0fc4b675af7ca95fbdc0652ba547855d2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 4 Mar 2021 17:12:44 +0800 Subject: [PATCH 10/20] =?UTF-8?q?feat(softswitch):=E6=B7=BB=E5=8A=A0sap-rf?= =?UTF-8?q?c=E9=80=82=E9=85=8D=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 8 ++- .../pojo/model/softswitch/BsSuitCaseModel.java | 4 +- .../i3plus/pojo/softswitch/bean/BsSapConn.java | 69 ++++++++++++++++++++++ .../i3plus/pojo/softswitch/bean/BsSuitCaseSap.java | 60 +++++++++++++++++++ .../softswitch/repository/BsSapConnRepository.java | 16 +++++ .../repository/BsSuitCaseSapRepository.java | 16 +++++ .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 32 ++++++++++ 7 files changed, 202 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSapConn.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseSap.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSapConnRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseSapRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 19f713f..d42762b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -26,7 +26,8 @@ public class BlockSoftSwitchEnumUtil { WEB_SERVICE(40,"WebService套件"), MQ(50,"消息队列套件"), WEB_SOCKET(60,"WebSocket套件"), - FTP(70,"FTP套件"); + FTP(70,"FTP套件"), + SAP(80,"SAP套件"); private int value; private String description; @@ -145,7 +146,10 @@ public class BlockSoftSwitchEnumUtil { /* FTP */ CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,160001,"Client FTP客户端适配器"), - SERVER_FTP_IMPP(SUIT_MODE.SERVER,CASE_TYPE.FTP,260001,"Client FTP服务端适配器"); + SERVER_FTP_IMPP(SUIT_MODE.SERVER,CASE_TYPE.FTP,260001,"Client FTP服务端适配器"), + + /* SAP */ + CLIENT_SAP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.SAP,170001,"Client FTP客户端适配器"); private int value; private String description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java index 4c5ea4f..df0bd83 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.model.softswitch; import cn.estsh.i3plus.pojo.base.common.Pager; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.softswitch.bean.*; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiParam; @@ -46,6 +45,9 @@ public class BsSuitCaseModel implements Serializable { @ApiParam(value = "FTP 适配器") private BsSuitCaseFTP bsSuitCaseFTP; + @ApiParam(value = "Sap 适配器") + private BsSuitCaseSap bsSuitCaseSap; + @ApiParam(value = "分页数据") private Pager pager; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSapConn.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSapConn.java new file mode 100644 index 0000000..8da9d02 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSapConn.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-01-15 15:40 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SAP_CONN") +@Api(value = "SAP连接信息", description = "SAP连接信息") +public class BsSapConn extends BaseBean { + + private static final long serialVersionUID = -8590500564480743293L; + + @Column(name = "SAP_CONN_NAME") + @ApiParam(value = "sap连接名称") + private String sapConnName; + + @Column(name = "SAP_CONN_CODE") + @ApiParam(value = "sap连接代码") + private String sapConnCode; + + @Column(name = "SAP_HOST") + @ApiParam(value = "SAP 应用服务器") + private String sapHost; + + @Column(name = "SAP_ROUTER") + @ApiParam(value = "SAP 路由") + private String sapRouter; + + @Column(name = "SAP_SYS_NO") + @ApiParam(value = "sap系统编号") + private String sapSysNo; + + @Column(name = "SAP_CLIENT") + @ApiParam(value = "sap集团") + private String sapClient; + + @Column(name = "SAP_USER") + @ApiParam(value = "sap用户名") + private String sapUser; + + @Column(name = "SAP_PWD") + @ApiParam(value = "sap密码") + private String sapPwd; + + @Column(name = "SAP_LANG") + @ApiParam(value = "sap登录语言") + private String sapLang; + +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseSap.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseSap.java new file mode 100644 index 0000000..37c9b4b --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseSap.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-01-18 17:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_CASE_SAP") +@Api(value = "SAP适配器", description = "SAP适配器") +public class BsSuitCaseSap extends BaseBean { + + private static final long serialVersionUID = -2019771592688281243L; + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "套件id") + @JsonSerialize(using = ToStringSerializer.class) + private Long suitCaseId; + + @Column(name = "SAP_CONN_ID") + @ApiParam(value = "sap连接id") + @JsonSerialize(using = ToStringSerializer.class) + private Long sapConnId; + + @Column(name = "SAP_CONN_CODE") + @ApiParam(value = "sap连接代码") + private String sapConnCode; + + @Column(name = "SAP_CONN_NAME") + @ApiParam(value = "sap连接代码") + private String sapConnName; + + @Column(name = "BUSI_FUNC_NAME") + @ApiParam(value = "业务方法") + private String busiFuncName; + + @Column(name = "COMMIT_FUNC_NAME") + @ApiParam(value = "提交方法名") + private String commitFuncName; +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSapConnRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSapConnRepository.java new file mode 100644 index 0000000..a241382 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSapConnRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSapConn; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-01-19 13:50 + * @Modify: + **/ +@Repository +public interface BsSapConnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseSapRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseSapRepository.java new file mode 100644 index 0000000..8397e45 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseSapRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseSap; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-01-19 13:50 + * @Modify: + **/ +@Repository +public interface BsSuitCaseSapRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 2506bb2..021e734 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -442,4 +442,36 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getNumNOEqualPack(bsSuitFile.getId(),"id",ddlPackBean); return ddlPackBean; } + + /** + * sap连接查询条件封装 + * @param bsSapConn + * @return + */ + public static DdlPackBean packHqlBsSapConn(BsSapConn bsSapConn){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getStringLikerPack(bsSapConn.getSapConnName(), "sapConnName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSapConn.getSapConnCode(), "sapConnCode", ddlPackBean); + + ddlPackBean.setOrderByStr(bsSapConn.orderBy()); + + return ddlPackBean; + } + + /** + * sap连接查询条件封装 + * @param bsSapConn + * @return + */ + public static DdlPackBean packHqlCheckBsSapConnOnly(BsSapConn bsSapConn){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumNOEqualPack(bsSapConn.getId(), "id", ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsSapConn.getSapConnCode(), "sapConnCode", ddlPackBean); + + ddlPackBean.setOrderByStr(bsSapConn.orderBy()); + + return ddlPackBean; + } } From fbab36aad2527ff2569092c56d242fbb9cce7999 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 5 Mar 2021 14:40:25 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E9=9A=94=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesQuarantineRecord.java | 76 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/StepPrintSnModel.java | 12 +++- .../repository/MesQuarantineRecordRepository.java | 13 ++++ 3 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQuarantineRecordRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java new file mode 100644 index 0000000..25aa552 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java @@ -0,0 +1,76 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/3/4 7:16 PM + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_QUARANTINE_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PART_NO") +}) +@Api("隔离记录表") +public class MesQuarantineRecord extends BaseBean { + private static final long serialVersionUID = -4667731056014803186L; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("零件名称") + private String partName; + + @Column(name = "QTY") + @ApiParam("用量") + private Integer qty; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; + + @Column(name = "DC_CODE") + @ApiParam("缺陷原因代码") + private String dcCode; + + @Column(name = "REPAIR_CODE") + @ApiParam("维修代码") + private String repairCode; + + @Column(name = "QUARANTINE_NO") + @ApiParam("隔离单号") + private String quarantineNo; + + @Column(name = "SCRAP_No") + @ApiParam("报废单号") + private String scrapNo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index fbc457b..232a945 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import javax.persistence.Transient; /** @@ -24,7 +25,7 @@ public class StepPrintSnModel extends MesProduceSn { private String printTime; @ApiParam("条码") - private String barCode; + private String /**/barCode; @ApiParam("物料号") private String partNo; @@ -147,4 +148,13 @@ public class StepPrintSnModel extends MesProduceSn { private String tgPartDesc; @ApiParam("泰国过程条码截取前11位") private String snTop11; + + @ApiParam("缺陷代码") + private String defectCode; + @ApiParam("缺陷原因代码") + private String dcCode; + @ApiParam("维修代码") + private String repairCode; + @ApiParam("质量代码") + private String qcCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQuarantineRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQuarantineRecordRepository.java new file mode 100644 index 0000000..bf36ba5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQuarantineRecordRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQuarantineRecord; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/3/4 7:38 PM + * @Modify: + */ +public interface MesQuarantineRecordRepository extends BaseRepository { +} From 0c4e6359fc89c832578c4e415d003e51a876c920 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 5 Mar 2021 16:45:07 +0800 Subject: [PATCH 12/20] =?UTF-8?q?JISA=E5=AF=BC=E5=85=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 9742449..0b930bf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -180,5 +180,5 @@ public class MesPart extends BaseBean implements Serializable { @Transient @ApiParam("是否绑定关键件") - private Integer isBingKey; + private Integer isBindKey; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index 53f9f82..8dac34b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -190,6 +190,10 @@ public class MesProduceSnTravel extends BaseBean implements Serializable { @ApiParam("条码类型名称") private String snTypeName; + @Transient + @ApiParam("节拍时间") + private Integer cycleTime; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From 6b4ae7eb71059afacc76e8399940a0dfb6b9d6b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 5 Mar 2021 17:25:53 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E3=80=903254=20=E6=B3=B0=E5=9B=BD-?= =?UTF-8?q?=E4=B8=8A=E8=A3=85=E6=80=BB=E6=88=90=E5=A5=97=E8=86=9C=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=89=93=E5=8D=B0=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java index acf952a..8809df0 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java @@ -39,7 +39,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Api("去去去去去去去去去安灯记录") +@Api("安灯记录") public class AndonManageRecord extends BaseManageQueue implements Serializable { private static final long serialVersionUID = 4667499369694353351L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 232a945..6f6c792 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -157,4 +157,6 @@ public class StepPrintSnModel extends MesProduceSn { private String repairCode; @ApiParam("质量代码") private String qcCode; + @ApiParam("打印机名称") + private String printerName; } From 19872ba443fe92f839fa2d1514ddbd1d5c808eb9 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 5 Mar 2021 20:27:21 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E6=8A=A5=E5=BA=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 6f6c792..02668f4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -25,7 +25,7 @@ public class StepPrintSnModel extends MesProduceSn { private String printTime; @ApiParam("条码") - private String /**/barCode; + private String barCode; @ApiParam("物料号") private String partNo; From b8d254e55e2261f11c90ef8de171a95a99024adb Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 8 Mar 2021 14:49:31 +0800 Subject: [PATCH 15/20] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index bc39e95..d7b7966 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1082,7 +1082,8 @@ public class ImppEnumUtil { CONFIG(6, "系统配置"), LOG(7, "日志配置"), WORK_WECHAT(8, "企业微信配置"), - SMS(9, "短信配置"); + SMS(9, "短信配置"), + SSO(10, "单点登录配置"); private final int value; private final String description; From c60daac39956d9a45134fd30c7e494d885d34b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 9 Mar 2021 17:33:39 +0800 Subject: [PATCH 16/20] =?UTF-8?q?feat(mdm):mdmhql=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jpa/daoimpl/MdmBusiModelRepositoryImpl.java | 30 +- .../pojo/mdm/sqlpack/DdlMdmBusiPreparedPack.java | 499 +++++++++++++++++++++ .../pojo/mdm/sqlpack/DdlMdmMasterPreparedPack.java | 499 +++++++++++++++++++++ 3 files changed, 1013 insertions(+), 15 deletions(-) create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmBusiPreparedPack.java create mode 100644 modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmMasterPreparedPack.java diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/daoimpl/MdmBusiModelRepositoryImpl.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/daoimpl/MdmBusiModelRepositoryImpl.java index 76a4cd5..1e31ec2 100644 --- a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/daoimpl/MdmBusiModelRepositoryImpl.java +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/jpa/daoimpl/MdmBusiModelRepositoryImpl.java @@ -71,11 +71,11 @@ public class MdmBusiModelRepositoryImpl, M value = propValue[i]; if (value != null) { if ((value instanceof Object[])) { - query.setParameter(name.replace(".", ""), (Object[]) value); + query.setParameter(name.replace("_", ""), (Object[]) value); } else if ((value instanceof Collection)) { - query.setParameter(name.replace(".", ""), (Collection) value); + query.setParameter(name.replace("_", ""), (Collection) value); } else { - query.setParameter(name.replace(".", ""), value); + query.setParameter(name.replace("_", ""), value); } } } @@ -90,12 +90,12 @@ public class MdmBusiModelRepositoryImpl, M if (((value instanceof Object[])) || ((value instanceof Collection))) { Object[] arraySerializable = (Object[]) value; if ((arraySerializable != null) && (arraySerializable.length > 0)) { - sb.append(" and model." + name + " in (:" + name.replace(".", "") + ")"); + sb.append(" and model." + name + " in (:" + name.replace("_", "") + ")"); } } else if (value == null) { sb.append(" and model." + name + " is null "); } else { - sb.append(" and model." + name + "=:" + name.replace(".", "")); + sb.append(" and model." + name + "=:" + name.replace("_", "")); } } } @@ -148,7 +148,7 @@ public class MdmBusiModelRepositoryImpl, M for (int i = 0; i < packBean.getKeyList().size(); i++) { query.setParameter( - packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i), packBean.getValueList().get(i) ); } @@ -272,7 +272,7 @@ public class MdmBusiModelRepositoryImpl, M @Override public T getByProperty(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value) { String queryString = - selectAll + " where " + entityType.getAlias() + "." + propertyName + "= :" + entityType.getAlias() + "_" + propertyName; + selectAll + " where " + entityType.getAlias() + "_" + propertyName + "= :" + entityType.getAlias() + "_" + propertyName; try { List list = entityManager.createQuery(queryString) .setParameter(entityType.getAlias() + "_" + propertyName, value) @@ -345,7 +345,7 @@ public class MdmBusiModelRepositoryImpl, M @Override public int findByPropertyCount(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value) { try { - String queryString = selectCount + " where " + entityType.getAlias() + "." + propertyName + String queryString = selectCount + " where " + entityType.getAlias() + "_" + propertyName + "= :" + entityType.getAlias() + "_" + propertyName; Long count = entityManager.createQuery(queryString, Long.class) .setParameter(entityType.getAlias() + "_" + propertyName, value) @@ -400,7 +400,7 @@ public class MdmBusiModelRepositoryImpl, M @Override public List findByPropertyPage(MdmEnumUtil.HQL_ENTITY_TYPE entityType, String propertyName, Object value, String orderByStuff, Pager pager) { if (pager.getTotalRows() > 0) { - String queryString = selectAll + " where " + entityType.getAlias() + "." + propertyName + "= :" + entityType.getAlias() + "_" + propertyName + " " + orderByStuff; + String queryString = selectAll + " where " + entityType.getAlias() + "_" + propertyName + "= :" + entityType.getAlias() + "_" + propertyName + " " + orderByStuff; return entityManager.createQuery(queryString) .setParameter(entityType.getAlias() + "_" + propertyName, value) .getResultList(); @@ -592,7 +592,7 @@ public class MdmBusiModelRepositoryImpl, M for (int i = 0; i < packBean.getKeyList().size(); i++) { query.setParameter( - packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i), packBean.getValueList().get(i) ); } @@ -613,7 +613,7 @@ public class MdmBusiModelRepositoryImpl, M Query query = entityManager.createQuery(queryString.toString(), Long.class); for (int i = 0; i < packBean.getKeyList().size(); i++) { query.setParameter( - packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i), packBean.getValueList().get(i) ); } @@ -657,7 +657,7 @@ public class MdmBusiModelRepositoryImpl, M for (int i = 0; i < packBean.getKeyList().size(); i++) { query.setParameter( - packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i), packBean.getValueList().get(i) ); } @@ -695,7 +695,7 @@ public class MdmBusiModelRepositoryImpl, M for (int i = 0; i < packBean.getKeyList().size(); i++) { query.setParameter( - packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i), packBean.getValueList().get(i) ); } @@ -714,7 +714,7 @@ public class MdmBusiModelRepositoryImpl, M for (int i = 0; i < packBean.getKeyList().size(); i++) { query.setParameter( - packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i), packBean.getValueList().get(i) ); } @@ -731,7 +731,7 @@ public class MdmBusiModelRepositoryImpl, M for (int i = 0; i < packBean.getKeyList().size(); i++) { query.setParameter( - packBean.getEntityTypeList().get(i).getAlias() + "." + packBean.getKeyList().get(i), + packBean.getEntityTypeList().get(i).getAlias() + "_" + packBean.getKeyList().get(i), packBean.getValueList().get(i) ); } diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmBusiPreparedPack.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmBusiPreparedPack.java new file mode 100644 index 0000000..0d83dd8 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmBusiPreparedPack.java @@ -0,0 +1,499 @@ +package cn.estsh.i3plus.pojo.mdm.sqlpack; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import cn.estsh.i3plus.pojo.mdm.bean.base.DdlPackMdmModelBean; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-11-22 20:37 + * @Modify: + **/ +public final class DdlMdmBusiPreparedPack extends DdlMdmModelPreparedPack { + + protected static MdmEnumUtil.HQL_ENTITY_TYPE entityType = MdmEnumUtil.HQL_ENTITY_TYPE.BUSI; + + /** + * 封装日期 + * + * @param startDate 开始日期 + * @param endDate 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） + * @param columnName HQL里对应的时间字段 + * @param packBean 封装的HQL对象 + * @param isShowTime 是否包含时分秒 + */ + public static void timeBuilder(String startDate, String endDate, String columnName, DdlPackMdmModelBean packBean, boolean isShowTime) { + timeBuilder(entityType, startDate, endDate, columnName, packBean, isShowTime); + } + + /** + * 封装日期 + * + * @param startDate 开始日期 + * @param endDate 结束日期 + * @param columnName 列名 + * @param isLeftContain 左闭？ + * @param isRightContain 右闭？ + * @param packBean HQL对象 + */ + public static void timeBuilder(String startDate, String endDate, String columnName, boolean isLeftContain, boolean isRightContain, DdlPackMdmModelBean packBean) { + timeBuilder(entityType, startDate, endDate, columnName, isLeftContain, isRightContain, packBean); + } + + /** + * 封装日期 + * + * @param date 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） + * @param columnName HQL里对应的时间字段 + * @param packBean 封装的HQL + * @param showTaday 如果没有开始时间和结束时间，是否查询当天时间，还是查询所有时间。true:查询当天时间，false:查询所有 + * @param isShowTime 是否包含时分秒 + */ + public static void timeBuilder(String date, String columnName, DdlPackMdmModelBean packBean, Boolean showTaday, boolean isShowTime) { + timeBuilder(entityType, date, columnName, packBean, showTaday, isShowTime); + } + + /** + * 封装日期 + * + * @param date 日期，需要和时间字段的值格式相同 + * @param startColumnName HQL里对应的开始时间字段 + * @param endColumnName HQL里对应的结束时间字段 + * @param packBean 封装的HQL + * @param isShowTime 是否包含时分秒 + */ + public static void getTimeBetweenCol(String date, String startColumnName, String endColumnName, DdlPackMdmModelBean packBean, boolean isShowTime) { + getTimeBetweenCol(entityType, date, startColumnName, endColumnName, packBean, isShowTime); + } + + /** + * 封装String对象成order by排序 + *s + * @param order + * @param columnName 列名 + * @param packBean + */ + public static void getOrderByPack(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, Object[] order, String[] columnName, DdlPackMdmModelBean packBean) { + getOrderByPack(entityTypes, order, columnName, packBean); + } + + /** + * 对象默认排序 + * + * @param bean + */ + public static void getOrderDefault(BaseBean bean) { + getOrderDefault(bean); + } + + /** + * 封装String对象成like语句 + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikerPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringLikerPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成like语句 + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikerPackOr(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringLikerPackOr(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成like语句(右侧模糊) + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringRightLikerPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringRightLikerPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成like语句(左侧模糊) + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLeftLikerPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringLeftLikerPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param val + * @param columnName 列名 + * @param packBean + */ + public static void getStringEqualPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringEqualPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param val + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikePack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringLikePack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成不等于语句 + * + * @param val + * @param columnName 列名 + * @param packBean + */ + public static void getStringNoEqualPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringNoEqualPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNotNullPack(String columnName, DdlPackMdmModelBean packBean) { + getStringNotNullPack(entityType, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNotBlanklPack(String columnName, DdlPackMdmModelBean packBean) { + getStringNotBlanklPack(entityType, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param val + * @param columnName 列名 + * @param packBean + */ + public static void getStringEqualPackOr(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringEqualPackOr(entityType, val, columnName, packBean); + } + + /** + * 封装long或者int的正整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumEqualPack(entityType, data, columnName, packBean); + } + + /** + * 两个字段不相等 + * + * @param firstColumnName 列名 + * @param twoColumnName + * @param packBean + */ + public static void getNotEqueals(String firstColumnName, String twoColumnName, DdlPackMdmModelBean packBean) { + getNotEqueals(entityType, firstColumnName, twoColumnName, packBean); + } + + /** + * 封装long或者int的负整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNegativeNumEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNegativeNumEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPackOr(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumEqualPackOr(entityType, data, columnName, packBean); + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPackOverZero(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumEqualPackOverZero(entityType, data, columnName, packBean); + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumWithZeroEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumWithZeroEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装String对象成大于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getStringBiggerPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getStringBiggerPack(entityType, data, columnName, packBean); + } + + /** + * 封装String对象成大于不等于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getStringBiggerNotEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getStringBiggerNotEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装String对象成小于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getStringSmallerPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getStringSmallerPack(entityType, data, columnName, packBean); + } + + /** + * 封装String对象成小于不等于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getStringSmallerNotEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getStringSmallerNotEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成大于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberBiggerPack(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成大于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerPackContainsZero(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberBiggerPackContainsZero(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成大于等于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberBiggerEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成小于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberSmallerPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberSmallerPack(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成小于等于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberSmallerEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberSmallerEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装long或者int的整数对象成equal语句(不等于) + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumNOEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumNOEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getInPack(entityType, data, columnName, packBean); + } + + /** + * 两个提交用or拼接 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotOrIsNull(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNotOrIsNull(entityType, data, columnName, packBean); + } + + /** + * 封装in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getOrInPack(String data, String columnName, DdlPackMdmModelBean packBean) { + getOrInPack(entityType, data, columnName, packBean); + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPackArray(Object[] data, String columnName, DdlPackMdmModelBean packBean) { + getInPackArray(entityType, data, columnName, packBean); + } + + /** + * 封装not in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackArray(Object[] data, String columnName, DdlPackMdmModelBean packBean) { + getNotInPackArray(entityType, data, columnName, packBean); + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPackList(List data, String columnName, DdlPackMdmModelBean packBean) { + getInPackList(entityType, data, columnName, packBean); + } + + /** + * 封装not in List查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackList(List data, String columnName, DdlPackMdmModelBean packBean) { + getNotInPackList(entityType, data, columnName, packBean); + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInOrPackString(String data, String columnName, DdlPackMdmModelBean packBean) { + getInOrPackString(entityType, data, columnName, packBean); + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackString(String data, String columnName, DdlPackMdmModelBean packBean) { + getNotInPackString(entityType, data, columnName, packBean); + } + + /** + * 封装not in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNotInPack(entityType, data, columnName, packBean); + } + + /** + * 转换排序列 + * + * @param columnName 列名 + * @param basisType 基本类型 + * @return + * @see CommonEnumUtil.BASIS_TYPE + */ + public static String getOrderColConvertType(String columnName, int basisType) { + return getOrderColConvertType(entityType, columnName, basisType); + } + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmMasterPreparedPack.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmMasterPreparedPack.java new file mode 100644 index 0000000..eea8a90 --- /dev/null +++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/DdlMdmMasterPreparedPack.java @@ -0,0 +1,499 @@ +package cn.estsh.i3plus.pojo.mdm.sqlpack; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; +import cn.estsh.i3plus.pojo.mdm.bean.base.DdlPackMdmModelBean; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-11-22 20:37 + * @Modify: + **/ +public final class DdlMdmMasterPreparedPack extends DdlMdmModelPreparedPack { + + protected static MdmEnumUtil.HQL_ENTITY_TYPE entityType = MdmEnumUtil.HQL_ENTITY_TYPE.MASTER; + + /** + * 封装日期 + * + * @param startDate 开始日期 + * @param endDate 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） + * @param columnName HQL里对应的时间字段 + * @param packBean 封装的HQL对象 + * @param isShowTime 是否包含时分秒 + */ + public static void timeBuilder(String startDate, String endDate, String columnName, DdlPackMdmModelBean packBean, boolean isShowTime) { + timeBuilder(entityType, startDate, endDate, columnName, packBean, isShowTime); + } + + /** + * 封装日期 + * + * @param startDate 开始日期 + * @param endDate 结束日期 + * @param columnName 列名 + * @param isLeftContain 左闭？ + * @param isRightContain 右闭？ + * @param packBean HQL对象 + */ + public static void timeBuilder(String startDate, String endDate, String columnName, boolean isLeftContain, boolean isRightContain, DdlPackMdmModelBean packBean) { + timeBuilder(entityType, startDate, endDate, columnName, isLeftContain, isRightContain, packBean); + } + + /** + * 封装日期 + * + * @param date 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） + * @param columnName HQL里对应的时间字段 + * @param packBean 封装的HQL + * @param showTaday 如果没有开始时间和结束时间，是否查询当天时间，还是查询所有时间。true:查询当天时间，false:查询所有 + * @param isShowTime 是否包含时分秒 + */ + public static void timeBuilder(String date, String columnName, DdlPackMdmModelBean packBean, Boolean showTaday, boolean isShowTime) { + timeBuilder(entityType, date, columnName, packBean, showTaday, isShowTime); + } + + /** + * 封装日期 + * + * @param date 日期，需要和时间字段的值格式相同 + * @param startColumnName HQL里对应的开始时间字段 + * @param endColumnName HQL里对应的结束时间字段 + * @param packBean 封装的HQL + * @param isShowTime 是否包含时分秒 + */ + public static void getTimeBetweenCol(String date, String startColumnName, String endColumnName, DdlPackMdmModelBean packBean, boolean isShowTime) { + getTimeBetweenCol(entityType, date, startColumnName, endColumnName, packBean, isShowTime); + } + + /** + * 封装String对象成order by排序 + *s + * @param order + * @param columnName 列名 + * @param packBean + */ + public static void getOrderByPack(MdmEnumUtil.HQL_ENTITY_TYPE[] entityTypes, Object[] order, String[] columnName, DdlPackMdmModelBean packBean) { + getOrderByPack(entityTypes, order, columnName, packBean); + } + + /** + * 对象默认排序 + * + * @param bean + */ + public static void getOrderDefault(BaseBean bean) { + getOrderDefault(bean); + } + + /** + * 封装String对象成like语句 + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikerPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringLikerPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成like语句 + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikerPackOr(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringLikerPackOr(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成like语句(右侧模糊) + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringRightLikerPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringRightLikerPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成like语句(左侧模糊) + * + * @param val 对象值 + * @param columnName 列名 + * @param packBean + */ + public static void getStringLeftLikerPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringLeftLikerPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param val + * @param columnName 列名 + * @param packBean + */ + public static void getStringEqualPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringEqualPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param val + * @param columnName 列名 + * @param packBean + */ + public static void getStringLikePack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringLikePack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成不等于语句 + * + * @param val + * @param columnName 列名 + * @param packBean + */ + public static void getStringNoEqualPack(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringNoEqualPack(entityType, val, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNotNullPack(String columnName, DdlPackMdmModelBean packBean) { + getStringNotNullPack(entityType, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNotBlanklPack(String columnName, DdlPackMdmModelBean packBean) { + getStringNotBlanklPack(entityType, columnName, packBean); + } + + /** + * 封装String对象成equal语句 + * + * @param val + * @param columnName 列名 + * @param packBean + */ + public static void getStringEqualPackOr(String val, String columnName, DdlPackMdmModelBean packBean) { + getStringEqualPackOr(entityType, val, columnName, packBean); + } + + /** + * 封装long或者int的正整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumEqualPack(entityType, data, columnName, packBean); + } + + /** + * 两个字段不相等 + * + * @param firstColumnName 列名 + * @param twoColumnName + * @param packBean + */ + public static void getNotEqueals(String firstColumnName, String twoColumnName, DdlPackMdmModelBean packBean) { + getNotEqueals(entityType, firstColumnName, twoColumnName, packBean); + } + + /** + * 封装long或者int的负整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNegativeNumEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNegativeNumEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPackOr(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumEqualPackOr(entityType, data, columnName, packBean); + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumEqualPackOverZero(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumEqualPackOverZero(entityType, data, columnName, packBean); + } + + /** + * 封装long或者int的整数对象成equal语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumWithZeroEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumWithZeroEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装String对象成大于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getStringBiggerPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getStringBiggerPack(entityType, data, columnName, packBean); + } + + /** + * 封装String对象成大于不等于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getStringBiggerNotEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getStringBiggerNotEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装String对象成小于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getStringSmallerPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getStringSmallerPack(entityType, data, columnName, packBean); + } + + /** + * 封装String对象成小于不等于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getStringSmallerNotEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getStringSmallerNotEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成大于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberBiggerPack(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成大于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerPackContainsZero(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberBiggerPackContainsZero(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成大于等于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberBiggerEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberBiggerEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成小于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberSmallerPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberSmallerPack(entityType, data, columnName, packBean); + } + + /** + * 封装double对象成小于等于语句 + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumberSmallerEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumberSmallerEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装long或者int的整数对象成equal语句(不等于) + * + * @param data + * @param columnName 列名 + * @param packBean + */ + public static void getNumNOEqualPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNumNOEqualPack(entityType, data, columnName, packBean); + } + + /** + * 封装in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getInPack(entityType, data, columnName, packBean); + } + + /** + * 两个提交用or拼接 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotOrIsNull(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNotOrIsNull(entityType, data, columnName, packBean); + } + + /** + * 封装in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getOrInPack(String data, String columnName, DdlPackMdmModelBean packBean) { + getOrInPack(entityType, data, columnName, packBean); + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPackArray(Object[] data, String columnName, DdlPackMdmModelBean packBean) { + getInPackArray(entityType, data, columnName, packBean); + } + + /** + * 封装not in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackArray(Object[] data, String columnName, DdlPackMdmModelBean packBean) { + getNotInPackArray(entityType, data, columnName, packBean); + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPackList(List data, String columnName, DdlPackMdmModelBean packBean) { + getInPackList(entityType, data, columnName, packBean); + } + + /** + * 封装not in List查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackList(List data, String columnName, DdlPackMdmModelBean packBean) { + getNotInPackList(entityType, data, columnName, packBean); + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInOrPackString(String data, String columnName, DdlPackMdmModelBean packBean) { + getInOrPackString(entityType, data, columnName, packBean); + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackString(String data, String columnName, DdlPackMdmModelBean packBean) { + getNotInPackString(entityType, data, columnName, packBean); + } + + /** + * 封装not in查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPack(Object data, String columnName, DdlPackMdmModelBean packBean) { + getNotInPack(entityType, data, columnName, packBean); + } + + /** + * 转换排序列 + * + * @param columnName 列名 + * @param basisType 基本类型 + * @return + * @see CommonEnumUtil.BASIS_TYPE + */ + public static String getOrderColConvertType(String columnName, int basisType) { + return getOrderColConvertType(entityType, columnName, basisType); + } +} From faeef7b5117c85de22d95ab3ec45a14fd8a93794 Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Wed, 10 Mar 2021 09:39:37 +0800 Subject: [PATCH 17/20] =?UTF-8?q?swebplanOrder=E5=A2=9E=E5=8A=A0=E8=BF=87?= =?UTF-8?q?=E6=9C=9F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: andly.pan --- .../estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java index dcbe79e..4cf4124 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java @@ -77,4 +77,15 @@ public class SwebProcurementPlanOrder extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") private Integer consignment=2; + @Column(name = "EXP_DATE") + @ApiParam(value = "过期日期") + private String expDate; + + @Column(name = "ITEM") + @ApiParam("行号") + private Integer item; + + @Column(name = "START_DATE") + @ApiParam(value = "起始日期") + private String startDate; } From 29ee22da5d513d7a930dba3b96f71d996cb19ec6 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 10 Mar 2021 11:41:26 +0800 Subject: [PATCH 18/20] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java index 5a6f7f2..ad7f16b 100755 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java @@ -28,6 +28,8 @@ public class WmsJobParamModel implements Serializable { private Integer erpSyncFlag;//查询SHIPPING表的条件 private String filterZoneNos;//过滤存储区 private String zoneNos;//存储区 + private String id;//id + private String groupName;//组名称 public int getMinuteDiffVal() { From 62d96793081896f90099b1f2e70fdb30ab169f0e Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 10 Mar 2021 14:54:35 +0800 Subject: [PATCH 19/20] =?UTF-8?q?=E5=88=A0=E9=99=A4mongo=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-base-mongo/pom.xml | 30 - .../pojo/base/jpa/dao/BaseMongoRepository.java | 52 -- .../base/jpa/daoimpl/BaseMongoRepositoryImpl.java | 352 --------- .../factory/BaseMongoRepositoryFactoryBean.java | 69 -- .../estsh/i3plus/pojo/base/tool/BsonPackTool.java | 816 --------------------- .../SysLogExceptionRepository.java | 14 - .../SysLogOperateRepository.java | 14 - .../SysLogSystemRepository.java | 14 - .../SysLogTaskTimeRepository.java | 14 - pom.xml | 1 - 10 files changed, 1376 deletions(-) delete mode 100644 modules/i3plus-pojo-base-mongo/pom.xml delete mode 100644 modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java delete mode 100644 modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java delete mode 100644 modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/factory/BaseMongoRepositoryFactoryBean.java delete mode 100644 modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java delete mode 100644 modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogExceptionRepository.java delete mode 100644 modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogOperateRepository.java delete mode 100644 modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogSystemRepository.java delete mode 100644 modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml deleted file mode 100644 index 15ad445..0000000 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - i3plus-pojo - i3plus.pojo - 1.0-DEV-SNAPSHOT - ../../pom.xml - - 4.0.0 - - i3plus-pojo-base-mongo - - - - org.springframework.boot - spring-boot-starter-data-mongodb - - - i3plus.pojo - i3plus-pojo-base - - - i3plus.pojo - i3plus-pojo-platform - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java deleted file mode 100644 index a399769..0000000 --- a/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java +++ /dev/null @@ -1,52 +0,0 @@ -package cn.estsh.i3plus.pojo.base.jpa.dao; - -import cn.estsh.i3plus.pojo.base.common.Pager; -import org.bson.conversions.Bson; -import org.springframework.data.mongodb.repository.MongoRepository; -import org.springframework.data.repository.NoRepositoryBean; - -import java.io.Serializable; -import java.util.List; - -/** - * @Description : 自定义Repository的方法接口 - * @Reference : MongoRepository - * @Author : alwaysfrin - * @CreateDate : 2018-09-13 10:34 - * @Modify: - **/ -@NoRepositoryBean -public interface BaseMongoRepository extends MongoRepository { - - T getById(long id); - - List findByProperty(String propertyName, Object value); - - List findByProperty(String propertyName, Object value,String orderByParam, int ascOrDesc); - - List findByPropertyLike(String propertyName, Object value); - - List findByPropertyLike(String propertyName, Object value,String orderByParam, int ascOrDesc); - - T getByProperty(String propertyName, Object value); - - List findByBson(Bson bson); - - List findByBson(Bson bson,String orderByParam, int ascOrDesc); - - int findByBsonCount(Bson bson); - - List findByBsonPager(Bson bson,Pager pager); - - List findByBsonPager(Bson bson,Pager pager,String orderByParam, int ascOrDesc); - - int listCount(); - - List listPager(Pager pager); - - List listPager(Pager pager,String orderByParam, int ascOrDesc); - - long deleteByProperty(Bson bson); - long deleteByPropertyIn(String propName, Object[] propValues); - long deleteByIds(ID[] ids); -} diff --git a/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java deleted file mode 100644 index ef58910..0000000 --- a/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java +++ /dev/null @@ -1,352 +0,0 @@ -package cn.estsh.i3plus.pojo.base.jpa.daoimpl; - -import cn.estsh.i3plus.pojo.base.common.Pager; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; -import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker; -import com.alibaba.fastjson.JSONObject; -import com.mongodb.BasicDBObject; -import com.mongodb.Block; -import com.mongodb.client.FindIterable; -import com.mongodb.client.model.CountOptions; -import com.mongodb.client.model.Filters; -import com.mongodb.client.model.Sorts; -import org.apache.commons.lang3.StringUtils; -import org.bson.Document; -import org.bson.conversions.Bson; -import org.bson.json.JsonMode; -import org.bson.json.JsonWriterSettings; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.dao.DuplicateKeyException; -import org.springframework.data.mapping.context.MappingContext; -import org.springframework.data.mongodb.core.MongoOperations; -import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity; -import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty; -import org.springframework.data.mongodb.core.query.Query; -import org.springframework.data.mongodb.repository.query.MongoEntityInformation; -import org.springframework.data.mongodb.repository.support.SimpleMongoRepository; - -import javax.persistence.Id; -import java.io.Serializable; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.UUID; - -/** - * @Description : 自定义mongodb持久化接口实现 - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-13 11:24 - * @Modify: - **/ -public class BaseMongoRepositoryImpl extends SimpleMongoRepository - implements BaseMongoRepository { - public static final Logger LOGGER = LoggerFactory.getLogger(BaseMongoRepositoryImpl.class); - - /** - * 持久化上下文 - */ - private final MongoOperations mongoOperations; - private final MongoEntityInformation entityInformation; - private final MappingContext, MongoPersistentProperty> mongoContext; - private final Class entityClass; - private SnowflakeIdMaker snowflakeIdMaker; - - public BaseMongoRepositoryImpl(MongoEntityInformation metadata, MongoOperations mongoOperations,SnowflakeIdMaker snowflakeIdMaker) { - super(metadata, mongoOperations); - this.entityInformation = metadata; - this.mongoOperations = mongoOperations; - this.entityClass = this.entityInformation.getJavaType(); - mongoContext = mongoOperations.getConverter().getMappingContext(); - this.snowflakeIdMaker = snowflakeIdMaker; - } - - /** - * 重写新增方法 - * @param entity - * @param - * @return - */ - @Override - public S insert(S entity) { - innerSave(entity); - return entity; - } - - /** - * 保存对象 - * @param item 保存对象 - * @return - */ - private T innerSave(T item) { - try { - if(item==null)return null; - Class clazz = item.getClass(); - - //获取主键 - Field idField = clazz.getField("id"); - if(idField == null){ - idField = clazz.getField("primaryKey"); - } - if(idField == null){ - // 遍历所有属性，以@Id声明确认主键 - Field[] fields = clazz.getFields(); - for(Field f : fields){ - if(f.getAnnotation(Id.class) != null){ - idField = f; - break; - } - } - } - - if(idField != null){ - Class type = idField.getType(); - Object val = idField.get(item); - if((type == long.class || type == Long.class) && (val == null || Long.parseLong(val.toString()) == 0)){ - // long类型主键，以snowflake为主键 - idField.set(item, snowflakeIdMaker.nextId() + System.currentTimeMillis()); - } else if(type == String.class && (val==null || "".equals(val))){ - // String类型主键，以UUID为主键 - idField.set(item, UUID.randomUUID().toString().replace("-", "").toLowerCase()); - } - } - -// try { - this.mongoOperations.insert(item, this.entityInformation.getCollectionName()); -// }catch (DuplicateKeyException dke){ -// LOGGER.error("【出现重复主键】"); -// //出现重复主键，再次插入 -// if(idField != null){ -// Class type = idField.getType(); -// Object val = idField.get(item); -// if((type == long.class || type == Long.class) && (val == null || Long.parseLong(val.toString()) == 0)){ -// // long类型主键，以snowflake为主键 -// idField.set(item, snowflakeIdMaker.nextId()); -// } else if(type == String.class && (val==null || "".equals(val))){ -// // String类型主键，以UUID为主键 -// idField.set(item, UUID.randomUUID().toString().replace("-", "").toLowerCase()); -// } -// } -// -// this.mongoOperations.insert(item, this.entityInformation.getCollectionName()); -// } - if(idField != null){ - return item; - }else { - return null; - } - } catch (Exception e) { - e.printStackTrace(); - throw new RuntimeException(e); - } - } - - @Override - public Optional findById(ID id) { - T entity = this.mongoOperations.findById(id, this.entityInformation.getJavaType(), this.entityInformation.getCollectionName()); - - if(entity != null) { - return Optional.of(entity); - }else{ - return null; - } - } - - @Override - public T getById(long id) { - return this.mongoOperations.findById(id, this.entityInformation.getJavaType(), this.entityInformation.getCollectionName()); - } - - @Override - public List findByProperty(String propertyName, Object value) { - return findByProperty(propertyName,value,null,0); - } - - @Override - public List findByProperty(String propertyName, Object value, String orderByParam, int ascOrDesc) { - Bson bson = Filters.and( - Filters.eq(propertyName, value) - ); - - return findByBson(bson,orderByParam,ascOrDesc); - } - - @Override - public List findByPropertyLike(String propertyName, Object value) { - return findByPropertyLike(propertyName,value,null,0); - } - - @Override - public List findByPropertyLike(String propertyName, Object value, String orderByParam, int ascOrDesc) { - Bson bson = Filters.and( - Filters.regex(propertyName, value.toString()) - ); - - return findByBson(bson,orderByParam,ascOrDesc); - } - - @Override - public T getByProperty(String propertyName, Object value) { - List tList = this.findByProperty(propertyName,value); - if(tList.size() > 0){ - return tList.iterator().next(); - }else{ - return null; - } - } - - /** - * 根据bson查询 - * @param bson - * @return - */ - public List findByBson(Bson bson) { - return findByBson(bson,null,0); - } - - @Override - public List findByBson(Bson bson, String orderByParam, int ascOrDesc) { - List dList = new ArrayList<>(); - Block saveBlock = new Block() { - @Override - public void apply(final Document document) { - dList.add(document); - } - }; - - FindIterable findIter = null; - if(bson != null) { - findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(bson); - }else{ - findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(); - } - if(StringUtils.isNotBlank(orderByParam) && ascOrDesc != 0){ - //排序 - if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()){ - findIter.sort(Sorts.ascending(orderByParam)); - }else{ - findIter.sort(Sorts.descending(orderByParam)); - } - } - findIter.forEach(saveBlock); - - return packObjectListFromDocument(dList); - } - - @Override - public int findByBsonCount(Bson bson) { - if(bson == null){ - return (int) mongoOperations.getCollection(this.entityInformation.getCollectionName()).count(); - }else { - return (int) mongoOperations.getCollection(this.entityInformation.getCollectionName()).count(bson); - } - } - - private List packObjectListFromDocument(List dList) { - //将获取的document转为对象 - List resultList = new ArrayList<>(); - // 设置为宽松模式 - JsonWriterSettings jsonWriterSettings = JsonWriterSettings.builder().outputMode(JsonMode.RELAXED).build(); - for(Document d : dList){ - resultList.add(JSONObject.parseObject(d.toJson(jsonWriterSettings), entityClass)); - } - - return resultList; - } - - @Override - public List findByBsonPager(Bson bson, Pager pager) { - return findByBsonPager(bson,pager,null,0); - } - - @Override - public List findByBsonPager(Bson bson, Pager pager, String orderByParam, int ascOrDesc) { - List dList = new ArrayList<>(); - Block saveBlock = new Block() { - @Override - public void apply(final Document document) { - dList.add(document); - } - }; - - FindIterable findIter = null; - if(bson == null) { - findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(); - }else{ - findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(bson); - } - if(StringUtils.isNotBlank(orderByParam) && ascOrDesc != 0){ - //排序 - if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()){ - findIter.sort(Sorts.ascending(orderByParam)); - }else{ - findIter.sort(Sorts.descending(orderByParam)); - } - }else{ - //根据id排序 - findIter.sort(new BasicDBObject("_id", 1)); - } - findIter.skip(pager.getStartRow()).limit(pager.getPageSize()); - findIter.forEach(saveBlock); - - return packObjectListFromDocument(dList); - } - - @Override - public int listCount() { - return (int) mongoOperations.getCollection(this.entityInformation.getCollectionName()).count(); - } - - @Override - public List listPager(Pager pager) { - return listPager(pager,null,0); - } - - @Override - public List listPager(Pager pager, String orderByParam, int ascOrDesc) { - List dList = new ArrayList<>(); - Block saveBlock = new Block() { - @Override - public void apply(final Document document) { - dList.add(document); - } - }; - FindIterable findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(); - if(StringUtils.isNotBlank(orderByParam) && ascOrDesc != 0){ - //排序 - if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()){ - findIter.sort(Sorts.ascending(orderByParam)); - }else{ - findIter.sort(Sorts.descending(orderByParam)); - } - }else{ - //根据id排序 - findIter.sort(new BasicDBObject("_id", 1)); - } - findIter.skip(pager.getStartRow()).limit(pager.getPageSize()); - findIter.forEach(saveBlock); - return packObjectListFromDocument(dList); - } - - @Override - public long deleteByProperty(Bson bson) { - return mongoOperations.getCollection(this.entityInformation.getCollectionName()).deleteMany(bson).getDeletedCount(); - } - - @Override - public long deleteByPropertyIn(String propName, Object[] propValues) { - Bson bson = Filters.and( - Filters.in(propName, propValues) - ); - return deleteByProperty(bson); - } - - @Override - public long deleteByIds(ID[] ids) { - return deleteByPropertyIn("_id",ids); - } - -} diff --git a/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/factory/BaseMongoRepositoryFactoryBean.java b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/factory/BaseMongoRepositoryFactoryBean.java deleted file mode 100644 index f864c1e..0000000 --- a/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/jpa/factory/BaseMongoRepositoryFactoryBean.java +++ /dev/null @@ -1,69 +0,0 @@ -package cn.estsh.i3plus.pojo.base.jpa.factory; - -import cn.estsh.i3plus.pojo.base.jpa.daoimpl.BaseMongoRepositoryImpl; -import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.mongodb.core.MongoOperations; -import org.springframework.data.mongodb.repository.MongoRepository; -import org.springframework.data.mongodb.repository.query.MongoEntityInformation; -import org.springframework.data.mongodb.repository.support.MongoRepositoryFactory; -import org.springframework.data.mongodb.repository.support.MongoRepositoryFactoryBean; -import org.springframework.data.repository.core.RepositoryInformation; -import org.springframework.data.repository.core.RepositoryMetadata; -import org.springframework.data.repository.core.support.RepositoryFactorySupport; - -import java.io.Serializable; - -/** - * @Description : 自定义mongodb持久化工厂类 - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-09-13 14:55 - * @Modify: - **/ -public class BaseMongoRepositoryFactoryBean, T, I extends Serializable> extends MongoRepositoryFactoryBean { - public static final Logger LOGGER = LoggerFactory.getLogger(BaseMongoRepositoryFactoryBean.class); - - @Autowired - public SnowflakeIdMaker snowflakeIdMaker; - - public BaseMongoRepositoryFactoryBean(Class repositoryInterface) { - super(repositoryInterface); - } - - @Override - protected RepositoryFactorySupport getFactoryInstance(MongoOperations operations) { - //LOGGER.info("【初始mongo持久仓】"); - //生成持久mongo仓库实例 - return new BaseMongoRepositoryFactory(operations,snowflakeIdMaker); - } - - //创建一个内部类，该类不用在外部访问 - private static class BaseMongoRepositoryFactory extends MongoRepositoryFactory { - private final MongoOperations mongoOperations; - //private final MappingContext, MongoPersistentProperty> mappingContext; - private final SnowflakeIdMaker snowflakeIdMaker; - - public BaseMongoRepositoryFactory(MongoOperations mongoOperations,SnowflakeIdMaker snowflakeIdMaker) { - super(mongoOperations); - this.mongoOperations = mongoOperations; - this.snowflakeIdMaker = snowflakeIdMaker; - //this.mappingContext = mongoOperations.getConverter().getMappingContext(); - } - - //设置具体的实现类是BaseRepositoryImpl - @Override - protected Object getTargetRepository(RepositoryInformation information) { - MongoEntityInformation entityInformation = getEntityInformation(information.getDomainType()); - return new BaseMongoRepositoryImpl(entityInformation, mongoOperations,snowflakeIdMaker); - } - - //设置具体的实现类的class - @Override - protected Class getRepositoryBaseClass(RepositoryMetadata metadata) { - return BaseMongoRepositoryImpl.class; - } - } -} diff --git a/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java deleted file mode 100644 index f355b4b..0000000 --- a/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java +++ /dev/null @@ -1,816 +0,0 @@ -package cn.estsh.i3plus.pojo.base.tool; - -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import com.alibaba.fastjson.JSONObject; -import com.mongodb.Block; -import com.mongodb.client.MongoCollection; -import com.mongodb.client.model.Filters; -import com.mongodb.client.model.Sorts; -import org.apache.commons.lang3.StringUtils; -import org.bson.Document; -import org.bson.conversions.Bson; -import org.springframework.data.mongodb.core.MongoOperations; - -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Objects; -import java.util.regex.Pattern; - -/** - * @Description : - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-11-01 16:26 - * @Modify: - * - * (>) 大于 - $gt - * (<) 小于 - $lt - * (>=) 大于等于 - $gte - * (<= ) 小于等于 - $lte - * $ne ----------- not equal != - * $eq -------- equal = - * - * 查询 title 包含"库"字的文档： - * db.col.find({title:/库/}) - * - * 查询 title 字段以"教"字开头的文档： - * db.col.find({title:/^库/}) - * - * 查询 titl e字段以"教"字结尾的文档： - * db.col.find({title:/库$/}) - **/ -public class BsonPackTool { - - /** - * 防止sql注入 - * @param data - * @return - */ - public static String getSafeParam(Object data){ - return data.toString().replaceAll(";","") - .replaceAll("'","") - .replaceAll("\"","") - .replaceAll("/","") - .replaceAll("\\\\","") - .replaceAll("delete","") - .replaceAll("update","") - .replaceAll("insert",""); - } - - /** - * 单页查询，获取查询document结果集合 - * @param mongoOperations - * @param tableName 查询的表名 - * @param bson 查询条件 - * @param skip 忽略的条数 - * @param limit 查询的条数 - * @return document结果集合 - */ - public static List query(MongoOperations mongoOperations, String tableName, Bson bson, int skip, int limit) { - List newLins = new ArrayList<>(); - Block saveBlock = new Block() { - @Override - public void apply(final Document document) { - newLins.add(document); - } - }; - - //查询 - MongoCollection collection = mongoOperations.getCollection(tableName); - if(bson == null) { - collection.count(); - collection.find().skip(skip).limit(limit).forEach(saveBlock); - }else { - collection.count(bson); - collection.find(bson).skip(skip).limit(limit).forEach(saveBlock); - } - - return newLins; - } - - /** - * 分页查询 - * @param mongoOperations - * @param tableName 表名 - * @param bson 查询条件 - * @param pageSize 单页查询条数 - * @return 查询结果集合 - */ - public static List queryPages(MongoOperations mongoOperations, String tableName, Bson bson, int pageSize) { - //分页查询 - List list = new ArrayList<>(); - long count = mongoOperations.getCollection(tableName).count(bson); - int loops = (int)((count + pageSize - 1) / pageSize); - List newFinds = null; - for(int i = 0; i < loops; i++) { - newFinds = query(mongoOperations, tableName, bson, i * pageSize, pageSize); - list.addAll(newFinds); - } - return list; - } - - /** - * 封装日期 - * @param startDate 开始日期 - * @param endDate 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） - * @param columnName HQL里对应的时间字段 - * @param bson 封装的bson - * @param isShowTime 是否包含时分秒 - */ - public static Bson timeBuilder( String startDate,String endDate, String columnName, Bson bson, boolean isShowTime) { - if (startDate == null || startDate.trim().length() == 0) { - startDate = "1900-01-01"; - } else { - startDate = getSafeParam(startDate); - startDate = startDate.trim(); - } - if (isShowTime && startDate.trim().length()<=11) { - startDate+= " 00:00:00"; - } - if (endDate == null || endDate.trim().length() == 0) { - endDate = "2100-01-01"; - } else { - endDate = getSafeParam(endDate); - endDate = endDate.trim(); - } - if (isShowTime&& endDate.trim().length()<=11) { - endDate+= " 23:59:59"; - } - if(bson == null) { - bson = Filters.and( - Filters.gte(columnName, startDate), //大于等于开始日期 - Filters.lte(columnName, endDate) //小于等于结束日期 - ); - }else{ - bson = Filters.and( - bson, - Filters.gte(columnName, startDate), //大于等于开始日期 - Filters.lte(columnName, endDate) //小于等于结束日期 - ); - } - - return bson; - } - - /** - * 封装日期 - * @param date 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） - * @param columnName HQL里对应的时间字段 - * @param bson 封装的bson - * @param showToday 如果没有开始时间和结束时间，是否查询当天时间，还是查询所有时间。true:查询当天时间，false:查询所有 - * @param isShowTime 是否包含时分秒 - */ - public static Bson timeBuilder( String date, String columnName, Bson bson, boolean showToday,boolean isShowTime) { - if(date != null && !"null".equals(date) && date.trim().length() > 0){ - date = getSafeParam(date); - - String today = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date()); - if(date.length() == 1 || ",".equals(date)){ - //只有一个逗号 - date = ""; - } - - String[] time = date.split(","); - if(time.length == 1){ - //只有开始日期，没有结束日期 - if(bson == null){ - bson = Filters.and( - Filters.regex(columnName, "^" + time[0]) //like 日期%^ - ); - }else { - bson = Filters.and( - bson, - Filters.regex(columnName, "^" + time[0]) //like 日期%^ - ); - } - }else if (time.length == 2 && ((time[0] != null && time[0].trim().length() > 0) || (time[1] != null & time[1].trim().length() > 0))) { - if (time[0] == null || time[0].trim().length() == 0) { - time[0] = "1900-01-01"; - } else { - time[0] = time[0].trim(); - } - if (isShowTime && time[0].trim().length()<=11) { - time[0]+= " 00:00:00"; - } - if (time[1] == null || time[1].trim().length() == 0) { - time[1] = "2100-01-01"; - } else { - time[1] = time[1].trim(); - } - if (isShowTime&& time[1].trim().length()<=11) { - time[1]+= " 23:59:59"; - } - if(bson == null) { - bson = Filters.and( - Filters.gte(columnName, time[0]), //大于等于开始日期 - Filters.lte(columnName, time[1]) //小于等于结束日期 - ); - }else{ - bson = Filters.and( - bson, - Filters.gte(columnName, time[0]), //大于等于开始日期 - Filters.lte(columnName, time[1]) //小于等于结束日期 - ); - } - } else { - if (showToday) { - if (isShowTime) { - if(bson == null) { - bson = Filters.and( - Filters.gte(columnName, time[0] + " 00:00:00"), //大于等于开始日期 - Filters.lte(columnName, time[1] + " 23:59:59") //小于等于结束日期 - ); - }else{ - bson = Filters.and( - bson, - Filters.gte(columnName, time[0] + " 00:00:00"), //大于等于开始日期 - Filters.lte(columnName, time[1] + " 23:59:59") //小于等于结束日期 - ); - } - }else{ - if(bson == null) { - bson = Filters.and( - Filters.gte(columnName, time[0]), //大于等于开始日期 - Filters.lte(columnName, time[1]) //小于等于结束日期 - ); - }else{ - bson = Filters.and( - bson, - Filters.gte(columnName, time[0]), //大于等于开始日期 - Filters.lte(columnName, time[1]) //小于等于结束日期 - ); - } - } - } - } - } - return bson; - } - - /** - * 查询方位分装 - * @param columnName 列名称 - * @param bson - * @param startTime 开始值 - * @param endTime 结束之 - * @return - */ - public static Bson timeBuilder(String columnName, Bson bson, String startTime,String endTime) { - if( Objects.nonNull(bson) && StringUtils.isNotBlank(columnName) &&StringUtils.isNotBlank(startTime)&& StringUtils.isNotBlank(endTime)){ - bson = Filters.and( - bson, - Filters.gte(columnName, startTime), //大于等于开始日期 - Filters.lte(columnName, endTime) //小于等于结束日期 - ); - } - return bson; - } - - /** - * 大于日期 - * @param dateTime 日期 - * @param columnName HQL里对应的时间字段 - * @param bson 封装的bson - * @param isShowTime 是否包含时分秒 - */ - public static Bson timeMore( String dateTime, String columnName, Bson bson, boolean isShowTime) { - if (dateTime == null || dateTime.trim().length() == 0) { - dateTime = "1900-01-01"; - } else { - dateTime = getSafeParam(dateTime); - dateTime = dateTime.trim(); - } - if (isShowTime && dateTime.trim().length()<=11) { - dateTime+= " 00:00:00"; - } - if(bson == null) { - bson = Filters.and( - Filters.gte(columnName, dateTime) //大于等于开始日期 - ); - }else{ - bson = Filters.and( - bson, - Filters.gte(columnName, dateTime) //大于等于开始日期 - ); - } - - return bson; - } - - /** - * 小于日期 - * @param dateTime 日期 - * @param columnName HQL里对应的时间字段 - * @param bson 封装的bson - * @param isShowTime 是否包含时分秒 - */ - public static Bson timeLess( String dateTime, String columnName, Bson bson, boolean isShowTime) { - if (dateTime == null || dateTime.trim().length() == 0) { - dateTime = "2100-01-01"; - } else { - dateTime = getSafeParam(dateTime); - dateTime = dateTime.trim(); - } - if (isShowTime&& dateTime.trim().length()<=11) { - dateTime+= " 23:59:59"; - } - if(bson == null) { - bson = Filters.and( - Filters.lte(columnName, dateTime) //小于等于结束日期 - ); - }else{ - bson = Filters.and( - bson, - Filters.lte(columnName, dateTime) //小于等于结束日期 - ); - } - - return bson; - } - - /** - * 封装String对象成like语句 - * @param str 对象值 - * @param columnName 列名 - * @param bson - */ - public static Bson getStringLikerPack(String str,String columnName, Bson bson) { - if (str != null && str.trim().length() > 0) { - str = getSafeParam(str); - - if(bson == null) { - bson = Filters.and( - Filters.regex(columnName, str) //like - ); - }else{ - bson = Filters.and( - bson, - Filters.regex(columnName, str)//like - ); - } - } - - return bson; - } - - /** - * 封装String对象成like语句 - * @param str 对象值 - * @param columnName 列名 - * @param bson - */ - public static Bson getStringLikerPackOr(String str,String columnName, Bson bson) { - if (str != null && str.trim().length() > 0) { - str = getSafeParam(str); - - if(bson == null) { - bson = Filters.or( - Filters.regex(columnName, str) //like - ); - }else { - bson = Filters.and( - bson, - Filters.or( - Filters.regex(columnName, str) //like - ) - ); - } - } - return bson; - } - - /** - * 封装String对象成like语句(右侧模糊) - * @param str 对象值 - * @param columnName 列名 - * @param bson - */ - public static Bson getStringRightLikerPack(String str,String columnName, Bson bson) { - if (str != null && str.trim().length() > 0) { - str = getSafeParam(str); - if(bson == null) { - bson = Filters.and( - Filters.regex(columnName, str + "^") //like - ); - }else{ - bson = Filters.and( - bson, - Filters.regex(columnName, str + "^") //like - ); - } - } - return bson; - } - - /** - * 封装String对象成like语句(左侧模糊) - * @param str 对象值 - * @param columnName 列名 - * @param bson - */ - public static Bson getStringLeftLikerPack(String str,String columnName, Bson bson) { - if (str != null && str.trim().length() > 0) { - str = getSafeParam(str); - if(bson == null) { - bson = Filters.and( - Filters.regex(columnName, "^" + str) //like - ); - }else{ - bson = Filters.and( - bson, - Filters.regex(columnName, "^" + str) //like - ); - } - } - return bson; - } - - /** - * 封装String对象成equal语句 - * @param columnName 列名 - * @param bson - */ - public static Bson getStringEqualPack(String data,String columnName, Bson bson) { - if(data != null && data.trim().length() > 0){ - data = getSafeParam(data); - if(bson == null) { - bson = Filters.and( - Filters.eq(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.eq(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装long或者int的整数对象成equal语句 - * @param columnName 列名 - * @param bson - */ - public static Bson getNumEqualPack(Object data,String columnName, Bson bson) { - if(data!=null&&Long.parseLong(data.toString()) > 0){ - if(bson == null) { - bson = Filters.and( - Filters.eq(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.eq(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装long或者int的整数对象成equal语句 - * @param columnName 列名 - * @param bson - */ - public static Bson getNumEqualPackForZero(Object data,String columnName, Bson bson) { - if(data!=null&&Long.parseLong(data.toString()) >= 0){ - if(bson == null) { - bson = Filters.and( - Filters.eq(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.eq(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装long或者int的整数对象成equal语句 - * @param columnName 列名 - * @param bson - */ - public static Bson getNumWithZeroEqualPack(Object data,String columnName, Bson bson) { - if(data!=null&&Long.parseLong(data.toString()) >= 0){ - if(bson == null) { - bson = Filters.and( - Filters.eq(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.eq(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装long或者int的整数对象成大于语句 - * @param columnName 列名 - * @param bson - */ - public static Bson getNumBiggerPack(Object data,String columnName, Bson bson) { - if(data!=null&&Long.parseLong(data.toString()) > 0){ - if(bson == null) { - bson = Filters.and( - Filters.gt(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.gt(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装long或者int的整数对象成小于语句 - * @param columnName 列名 - * @param bson - */ - public static Bson getNumSmallerPack(Object data,String columnName, Bson bson) { - if(data!=null&&Long.parseLong(data.toString()) > 0){ - if(bson == null) { - bson = Filters.and( - Filters.lt(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.lt(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装double对象成大于语句 - * @param columnName 列名 - * @param bson - */ - public static Bson getDoubleBiggerPack(Object data,String columnName, Bson bson) { - if(data!=null&&Double.parseDouble(data.toString()) > 0){ - if(bson == null) { - bson = Filters.and( - Filters.gt(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.gt(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装double对象成小于语句 - * @param columnName 列名 - * @param bson - */ - public static Bson getDoubleSmallerPack(Object data,String columnName, Bson bson) { - if(data!=null&&Double.parseDouble(data.toString()) > 0){ - if(bson == null) { - bson = Filters.and( - Filters.lt(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.lt(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装long或者int的整数对象成equal语句 - * @param columnName 列名 - * @param bson - */ - public static Bson getNumEqualPack(Object data,String columnName, Bson bson,Integer expvalue) { - if(data!=null&&Long.parseLong(data.toString()) > (long)expvalue){ - if(bson == null) { - bson = Filters.and( - Filters.eq(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.eq(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装double对象成equal语句 - * @param columnName 列名 - * @param bson - */ - public static Bson getNumEqualPackDouble(Object data,String columnName, Bson bson) { - if(data!=null&&Double.parseDouble(data.toString()) > 0){ - if(bson == null) { - bson = Filters.and( - Filters.eq(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.eq(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装long或者int的整数对象成equal语句 - * @param columnName 列名 - * @param bson - */ - public static Bson getNumEqualPackDouble(Object data,String columnName, Bson bson,Integer expvalue) { - if(data!=null&&Double.parseDouble(data.toString()) > (double)expvalue){ - if(bson == null) { - bson = Filters.and( - Filters.eq(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.eq(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装long或者int的整数对象成equal语句(不等于) - * @param columnName 列名 - * @param bson - */ - public static Bson getNumNOEqualPack(Object data,String columnName, Bson bson) { - if(data!=null){ - if(bson == null) { - bson = Filters.and( - Filters.ne(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.ne(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装in查询语句 - * @param data - * @param columnName - * @param bson - */ - public static Bson getInPack(String data,String columnName, Bson bson){ - if (data!=null&&data.trim().length()>0) { - data = getSafeParam(data); - if(bson == null) { - bson = Filters.and( - Filters.in(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.in(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装in String查询语句 - * @param data - * @param columnName - * @param bson - */ - public static Bson getInPackString(String data,String columnName, Bson bson){ - if (data != null && data.trim().length()>0) { - data = getSafeParam(data); - //判断最后一位是不是逗号 - if(data.lastIndexOf(",") != (data.length()-1)){ - data += ","; - } - String[] dataArray = data.substring(0, data.length()-1).split(","); - data = ""; - for (int i = 0 ; i < dataArray.length ;i++) { - if(i == dataArray.length -1){ - data += "'" + dataArray[i] + "'"; - }else{ - data += "'" + dataArray[i] + "',"; - } - } - if(bson == null) { - bson = Filters.and( - Filters.in(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.in(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装in String查询语句 - * @param data - * @param columnName - * @param bson - */ - public static Bson getNotInPackString(String data,String columnName, Bson bson){ - if (data != null && data.trim().length()>0) { - data = getSafeParam(data); - //判断最后一位是不是逗号 - if(data.lastIndexOf(",") != (data.length()-1)){ - data += ","; - } - String[] dataArray = data.substring(0, data.length()-1).split(","); - data = ""; - for (int i = 0 ; i < dataArray.length ;i++) { - if(i == dataArray.length -1){ - data += "'" + dataArray[i] + "'"; - }else{ - data += "'" + dataArray[i] + "',"; - } - } - if(bson == null) { - bson = Filters.and( - Filters.nin(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.nin(columnName, data) - ); - } - } - return bson; - } - - /** - * 封装not in查询语句 - * @param data - * @param columnName - * @param bson - */ - public static Bson getNotInPack(String data,String columnName, Bson bson){ - if (data!=null&&data.trim().length()>0) { - data = getSafeParam(data); - if(bson == null) { - bson = Filters.and( - Filters.nin(columnName, data) - ); - }else{ - bson = Filters.and( - bson, - Filters.nin(columnName, data) - ); - } - } - return bson; - } - - /** - * 将MONGODB的BSON转成对象 - * @param dList - * @param entityClass - * @return - */ - public List packDocumentToObjectList(List dList,Class entityClass){ - //将获取的document转为对象 - List resultList = new ArrayList(); - for(Document d : dList){ - resultList.add(JSONObject.parseObject(d.toJson(), entityClass)); - } - - return resultList; - } -} diff --git a/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogExceptionRepository.java b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogExceptionRepository.java deleted file mode 100644 index 6fe78cc..0000000 --- a/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogExceptionRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.platform.platrepositorymongo; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogException; - -/** - * @Description : 异常记录表(使用Mongodb) - * @Reference : - * @Author : frin - * @Date : 2018-11-8 12:03:00 - * @Modify : - **/ -public interface SysLogExceptionRepository extends BaseMongoRepository { -} diff --git a/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogOperateRepository.java b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogOperateRepository.java deleted file mode 100644 index e33b7c7..0000000 --- a/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogOperateRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.platform.platrepositorymongo; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; - -/** - * @Description : 操作日志表(使用Mongodb) - * @Reference : - * @Author : wei.peng - * @Date : 2018-10-22 12:03:00.118 - * @Modify : - **/ -public interface SysLogOperateRepository extends BaseMongoRepository { -} diff --git a/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogSystemRepository.java b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogSystemRepository.java deleted file mode 100644 index eddc176..0000000 --- a/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogSystemRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.platform.platrepositorymongo; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; - -/** - * @Description : 系统日志表 - * @Reference : - * @Author : wei.peng - * @Date : 2018-10-22 12:03:00.158 - * @Modify : - **/ -public interface SysLogSystemRepository extends BaseMongoRepository { -} diff --git a/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java b/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java deleted file mode 100644 index 1ce1eef..0000000 --- a/modules/i3plus-pojo-base-mongo/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.platform.platrepositorymongo; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; - -/** - * @Description : - * @Reference : - * @Author : yunhao - * @CreateDate : 2018-12-20 22:35 - * @Modify: - **/ -public interface SysLogTaskTimeRepository extends BaseMongoRepository { -} diff --git a/pom.xml b/pom.xml index e57acaf..4c81d9d 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,6 @@ modules/i3plus-pojo-ptl modules/i3plus-pojo-ics modules/i3plus-pojo-mdm - modules/i3plus-pojo-base-mongo From 5e98df411e726e57d955d904c5092e4aa9425e44 Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Thu, 11 Mar 2021 17:10:49 +0800 Subject: [PATCH 20/20] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: andly.pan --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java index f105ce9..d60c70e 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java @@ -159,6 +159,6 @@ public class WmsActionResponseBean implements Serializable { } public int getIsResetVal() { - return this.isReset == null ? 0 : this.isReset; + return this.isReset == null ? 2 : this.isReset; } }