From 8a4974f3693f6823e41c5f06e4beb5bf0f9d3bf7 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 16 Jan 2020 13:37:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=20=E8=B0=83=E7=94=A8=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockFormEnumUtil.java | 145 ------------------ .../base/enumutil/BlockSoftSwitchEnumUtil.java | 1 + .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 168 +++++++++++++++++++-- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 + .../i3plus/pojo/model/common/ClassFieldModel.java | 3 + .../estsh/i3plus/pojo/model/common/ClassModel.java | 3 + .../pojo/model/report/BrDataSourceModel.java | 4 +- .../i3plus/pojo/model/report/TemplateModel.java | 17 ++- .../cn/estsh/i3plus/pojo/report/bean/BrPojo.java | 42 +++--- .../estsh/i3plus/pojo/report/bean/BrPojoAttr.java | 12 +- .../i3plus/pojo/report/bean/BrPojoFilterAttr.java | 22 +-- .../i3plus/pojo/report/bean/BrPojoViewAttr.java | 23 +-- .../i3plus/pojo/report/sqlpack/ReportHqlPack.java | 4 +- 13 files changed, 235 insertions(+), 212 deletions(-) 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 7fdc930..ef96546 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 @@ -1843,151 +1843,6 @@ public class BlockFormEnumUtil { } } - /** - * 数据库连接方式 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum DATA_SOURCE_TYPE { - SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null), - SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"), - SOURCE_ORACLE(300, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null), - SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public"); - - private int value; - private String code; - private String description; - private String driverClassName; - private int defaultPort; - private String defaultSchemaPattern; - - private DATA_SOURCE_TYPE (int value, String code, String description,String driverClassName,int port,String defaultSchemaPattern) { - this.value = value; - this.code = code; - this.description = description; - this.driverClassName = driverClassName; - this.defaultPort = port; - this.defaultSchemaPattern = defaultSchemaPattern; - } - - public int getValue() { - return value; - } - - public String getCode() { - return code; - } - - public String getDescription() { - return description; - } - - public String getDriverClassName() { - return driverClassName; - } - - public int getDefaultPort() { - return defaultPort; - } - - public String getDefaultSchemaPattern() { - return defaultSchemaPattern; - } - - 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 DATA_SOURCE_TYPE 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; - } - - public String getJDBCUrl(String database,String host,Integer port){ - if(this.getValue() == SOURCE_MARIA_DB.getValue()){ - return getJDBCUrlMySQL(database,host,port); - }else if(this.getValue() == SOURCE_ORACLE.getValue()){ - return getJDBCUrlOracle(database,host,port); - }else if(this.getValue() == SOURCE_POSTGRE_SQL.getValue()){ - return getJDBCUrlPostgreSQL(database,host,port); - }else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){ - return getJDBCUrlSQLServer(database,host,port); - } - return null; - } - - public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ - if(StringUtils.isNotBlank(databaseProductName)){ - if(databaseProductName.indexOf(":mysql:") != -1){ - return SOURCE_MARIA_DB; - }else if(databaseProductName.indexOf(":oracle:") != -1){ - return SOURCE_ORACLE; - }else if(databaseProductName.indexOf(":postgresql:") != -1){ - return SOURCE_POSTGRE_SQL; - }else if(databaseProductName.indexOf(":sqlserver:") != -1){ - return SOURCE_SQL_SERVER; - } - } - return null; - } - - private String getJDBCUrlMySQL(String database,String host,Integer port){ - return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8"; - } - - private String getJDBCUrlOracle(String database,String host,Integer port){ - return "jdbc:oracle:thin:@"+host+":"+port+":"+database; - } - - private String getJDBCUrlPostgreSQL(String database,String host,Integer port){ - return "jdbc:postgresql://"+host+":"+port+"/"+database; - } - - private String getJDBCUrlSQLServer(String database,String host,Integer port){ - return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true"; - } - } - @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_SOURCE_STATUS { CONN_SUCCESS(10, "连接成功", "连接成功"), 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 e1d4eae..da17aec 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 @@ -331,6 +331,7 @@ public class BlockSoftSwitchEnumUtil { /** * 数据库连接方式 */ + @Deprecated // 不建议使用 推荐使用 CommonEnumUtil.DATA_SOURCE_TYPE @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_SOURCE_TYPE { SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null), diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 33d75d9..1f12228 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -1397,17 +1397,17 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SQL_WHERE { - EQUAL(1, " = ", "等于"), - NOT_EQUAL(2, " <> ", "不等于"), - MORE(3, " > ", "大于"), - LESS(4, " < ", "小于"), - MORE_OR_EQUAL(5, " >= ", "大于等于"), - LESS_OR_EQUAL (6, " <= ", "小于等于"), - LIKE(7, " LIKE ", "全模糊"), - START_LIKE(7, " LIKE ", "前模糊"), - END_LIKE(7, " LIKE ", "后模糊"), - IN(8, " IN ", " in "), - BETWEEN(9, " BETWEEN ", "区间查询(逗号区分)"),; + EQUAL(10, " = ", "等于"), + NOT_EQUAL(11, " <> ", "不等于"), + MORE(20, " > ", "大于"), + LESS(30, " < ", "小于"), + MORE_OR_EQUAL(21, " >= ", "大于等于"), + LESS_OR_EQUAL (31, " <= ", "小于等于"), + LIKE(40, " LIKE ", "全模糊"), + START_LIKE(41, " LIKE ", "前模糊"), + END_LIKE(52, " LIKE ", "后模糊"), + IN(50, " IN ", " in "), + BETWEEN(60, " BETWEEN ", "区间查询(逗号区分)"),; private int value; private String code; @@ -1724,4 +1724,150 @@ public class CommonEnumUtil { } } + + /** + * 数据库连接方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DATA_SOURCE_TYPE { + SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null), + SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"), + SOURCE_ORACLE(300, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null), + SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public"); + + private int value; + private String code; + private String description; + private String driverClassName; + private int defaultPort; + private String defaultSchemaPattern; + + private DATA_SOURCE_TYPE (int value, String code, String description,String driverClassName,int port,String defaultSchemaPattern) { + this.value = value; + this.code = code; + this.description = description; + this.driverClassName = driverClassName; + this.defaultPort = port; + this.defaultSchemaPattern = defaultSchemaPattern; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public String getDriverClassName() { + return driverClassName; + } + + public int getDefaultPort() { + return defaultPort; + } + + public String getDefaultSchemaPattern() { + return defaultSchemaPattern; + } + + 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 DATA_SOURCE_TYPE 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; + } + + public String getJDBCUrl(String database,String host,Integer port){ + if(this.getValue() == SOURCE_MARIA_DB.getValue()){ + return getJDBCUrlMySQL(database,host,port); + }else if(this.getValue() == SOURCE_ORACLE.getValue()){ + return getJDBCUrlOracle(database,host,port); + }else if(this.getValue() == SOURCE_POSTGRE_SQL.getValue()){ + return getJDBCUrlPostgreSQL(database,host,port); + }else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){ + return getJDBCUrlSQLServer(database,host,port); + } + return null; + } + + public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ + if(StringUtils.isNotBlank(databaseProductName)){ + if(databaseProductName.indexOf(":mysql:") != -1){ + return SOURCE_MARIA_DB; + }else if(databaseProductName.indexOf(":oracle:") != -1){ + return SOURCE_ORACLE; + }else if(databaseProductName.indexOf(":postgresql:") != -1){ + return SOURCE_POSTGRE_SQL; + }else if(databaseProductName.indexOf(":sqlserver:") != -1){ + return SOURCE_SQL_SERVER; + } + } + return null; + } + + private String getJDBCUrlMySQL(String database,String host,Integer port){ + return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8"; + } + + private String getJDBCUrlOracle(String database,String host,Integer port){ + return "jdbc:oracle:thin:@"+host+":"+port+":"+database; + } + + private String getJDBCUrlPostgreSQL(String database,String host,Integer port){ + return "jdbc:postgresql://"+host+":"+port+"/"+database; + } + + private String getJDBCUrlSQLServer(String database,String host,Integer port){ + return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true"; + } + } + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index a17cee1..8715022 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -1530,7 +1530,10 @@ public class MesPcnEnumUtil { /** * 数据库连接方式 + * wei.peng + * Copy 代码禁止修改枚举内容,整合枚举会产生兼容性问题 ; */ + @Deprecated // 不推荐使用 ， 推荐使用 CommonEnumUtil.DATA_SOURCE_TYPE @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_SOURCE_TYPE { SOURCE_MARIA_DB(10, "MariaDB", "MariaDB 10.1", "com.mysql.jdbc.Driver", 3306, null), diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java index f03e4f7..907b15a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java @@ -30,6 +30,9 @@ public class ClassFieldModel implements Serializable { @ApiParam(value ="属性名") private String fieldName; + @ApiParam(value ="字段名称") + private String fieldColumnName; + @ApiParam(value ="属性类型名称") private String fieldTypeName; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java index 73d61dd..e601f37 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java @@ -40,6 +40,9 @@ public class ClassModel implements Serializable { @ApiParam(value ="类名") private String clzSimpleName; + @ApiParam(value ="表名称名") + private String clzTableName; + @ApiParam(value ="类全名") private String clzFullName; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java index e3dc2fc..e23b1ad 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.report; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -17,7 +18,8 @@ public class BrDataSourceModel { /** * 默认数据源信息 */ - public static final BrDataSourceModel DEFAULT_DATA_SOURCE = new BrDataSourceModel("默认数据源", "DEFAULT", null, null, "使用默认数据源"); + public static final BrDataSourceModel DEFAULT_DATA_SOURCE = new BrDataSourceModel("默认数据源", "DEFAULT", + CommonEnumUtil.DATA_SOURCE_TYPE.SOURCE_MARIA_DB.getValue(), null, "使用默认数据源"); @ApiParam(value ="数据源名称") private String sourceName; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java index 67bd9b5..2a28c0f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.model.report; import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.report.bean.*; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -71,18 +72,18 @@ public class TemplateModel implements Serializable { @ApiParam(value = "跨服务调用解析后数据") private Object option; + @ApiParam(value = "分页参数") + private Pager pager; + @ApiParam(value = "页面查询条件") private Map findParam; @ApiParam("执行 HQL ") - private String selectHql; + private String selectSql; + + @ApiParam("执行 HQL 返回数量") + private String countSql; @ApiParam("执行 HQL 返回数量") - private String countHql; -// -// @ApiParam("执行 HQL 参数名称 ") -// private String[] paramName; -// -// @ApiParam("执行 HQL 参数值 ") -// private Object[] paramValue; + private String querySql; } diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java index c84d42e..b114e73 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojo.java @@ -55,21 +55,21 @@ public class BrPojo extends BaseBean { @ApiParam(value ="数据源编码") private String sourceCode; + @Column(name="SOURCE_TYPE") + @ApiParam(value ="数据源类型") + private Integer sourceType; + @Column(name="SOURCE_NAME") @ApiParam(value ="数据源名称") private String sourceName; - @Column(name="POJO_PACKAGE_CODE") - @ApiParam(value ="对象全路径") - private String pojoPackageCode; - - @Column(name="POJO_CODE") - @ApiParam(value ="对象代码") - private String pojoCode; + @Column(name="POJO_TABLE_NAME") + @ApiParam(value ="对象表名称") + private String pojoTableName; - @Column(name="POJO_CODE_ALIAS") - @ApiParam(value ="对象别名") - private String pojoCodeAlias; + @Column(name="POJO_TABLE_NAME_ALIAS") + @ApiParam(value ="对象表别名") + private String pojoTableNameAlias; @Column(name="pojo_name") @ApiParam(value ="对象名称") @@ -79,9 +79,9 @@ public class BrPojo extends BaseBean { @ApiParam(value ="对象排序") private Integer pojoSort; - @Column(name="POJO_ATTR") + @Column(name="POJO_COLUMN_NAME") @ApiParam(value ="连接属性") - private String pojoAttr; + private String pojoColumnName; @Column(name="JOIN_TYPE") @ApiParam(value ="连接关系") @@ -107,20 +107,20 @@ public class BrPojo extends BaseBean { private String joinPojoNameRdd; @Column(name="JOIN_POJO_CODE_RDD") - @ApiParam(value ="连接对象代码") - private String joinPojoCodeRdd; + @ApiParam(value ="连接对象名称") + private String joinTableNameRdd; @Column(name="JOIN_POJO_CODE_ALIAS_RDD") - @ApiParam(value ="连接对象别名") - private String joinPojoCodeAliasRdd; + @ApiParam(value ="连接对象表别名") + private String joinTableNameAliasRdd; - @Column(name="JOIN_POJO_ATTR") - @ApiParam(value ="连接对象属性") - private String joinPojoAttr; + @Column(name="JOIN_COLUMN_NAME") + @ApiParam(value ="连接字段名称") + private String joinColumnName; - @Column(name="POJO_HQL") + @Column(name="POJO_SQL") @ApiParam(value ="对象名称") - private String pojoHql; + private String pojoSql; @Column(name="POJO_DESCRIPTION") @ApiParam(value ="对象描述") diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java index 49b0c09..9a055dd 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java @@ -52,17 +52,17 @@ public class BrPojoAttr extends BaseBean { @ApiParam(value ="主服务对象包名称" , access ="服务对象包名称") private String packageNameRdd; - @Column(name="POJO_NAME_ALIAS") + @Column(name="POJO_TABLE_NAME_ALIAS") @ApiParam(value ="对象别名") - private String pojoNameAlias; + private String pojoTableNameAlias; - @Column(name="ATTR_NAME") + @Column(name="ATTR_COLUMN_NAME") @ApiParam(value ="属性别名") - private String attrName; + private String attrColumnName; - @Column(name="ATTR_NAME_ALIAS") + @Column(name="ATTR_COLUMN_NAME_ALIAS") @ApiParam(value ="属性别名") - private String attrNameAlias; + private String attrColumnNameAlias; @Column(name="PARENT_ID") @ApiParam(value ="上级ID",example = "-1") diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java index 20d9181..cec0847 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java @@ -53,21 +53,25 @@ public class BrPojoFilterAttr extends BaseBean { @ApiParam(value ="对象名称") private String pojoNameRdd; - @Column(name="POJO_CODE_RDD") - @ApiParam(value ="对象代码") - private String pojoCodeRdd; + @Column(name="POJO_TABLE_NAME_RDD") + @ApiParam(value ="对象表名称") + private String pojoTableNameRdd; - @Column(name="POJO_CODE_ALIAS_RDD") + @Column(name="POJO_TABLE_NAME_ALIAS_RDD") @ApiParam(value ="对象别名") - private String pojoCodeAliasRdd; + private String pojoTableNameAliasRdd; - @Column(name="POJO_ATTR") + @Column(name="POJO_COLUMN_NAME") @ApiParam(value ="对象属性") - private String pojoAttr; + private String pojoColumnName; - @Column(name="PACKAGE_POJO_ATTR") +// @Column(name="POJO_CODE_NAME") +// @ApiParam(value ="对象属性") +// private String pojoCodeName; +// + @Column(name="POJO_TABLE_COLUMN_NAME") @ApiParam(value ="对象属性全路径") - private String packagePojoAttr; + private String pojoTableColumnName; /************************************** 属性信息 **************************************/ diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java index e4cbcd3..2b6ccaa 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoViewAttr.java @@ -48,21 +48,26 @@ public class BrPojoViewAttr extends BaseBean { @ApiParam(value = "对象名称") private String pojoNameRdd; - @Column(name = "POJO_CODE_RDD") + @Column(name = "POJO_TABLE_NAME_RDD") @ApiParam(value = "对象代码") - private String pojoCodeRdd; + private String pojoTableNameRdd; - @Column(name = "POJO_CODE_ALIAS_RDD") + @Column(name = "POJO_TABLE_NAME_ALIAS_RDD") @ApiParam(value = "对象别名") - private String pojoCodeAliasRdd; + private String pojoTableNameAliasRdd; - @Column(name="POJO_ATTR") + @Column(name="POJO_COLUMN_NAME") @ApiParam(value ="对象属性") - private String pojoAttr; + private String pojoColumnName; - @Column(name="PACKAGE_POJO_ATTR") - @ApiParam(value ="对象属性全路径") - private String packagePojoAttr; + +// @Column(name="POJO_CODE_NAME") +// @ApiParam(value ="对象属性") +// private String pojoCodeName; +// +// @Column(name="PACKAGE_POJO_ATTR") +// @ApiParam(value ="对象属性全路径") +// private String packagePojoAttr; @Column(name="VIEW_ATTR_ALIAS") @ApiParam(value ="视图属性别名") diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java index 025e496..5d5ce2b 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java @@ -192,9 +192,9 @@ public class ReportHqlPack { DdlPreparedPack.getNumEqualPack(pojo.getJoinType(),"joinType",result); DdlPreparedPack.getNumEqualPack(pojo.getPojoType(),"pojoType",result); DdlPreparedPack.getNumEqualPack(pojo.getWhereType(),"whereType",result); - DdlPreparedPack.getStringEqualPack(pojo.getPojoCodeAlias(),"pojoCodeAlias",result); + DdlPreparedPack.getStringEqualPack(pojo.getPojoTableNameAlias(),"pojoTableNameAlias",result); DdlPreparedPack.getStringLikerPack(pojo.getPojoName(),"pojoName",result); - DdlPreparedPack.getStringLikerPack(pojo.getPojoCode(),"pojoCode",result); + DdlPreparedPack.getStringLikerPack(pojo.getPojoTableName(),"pojoTableName",result); return result; } From 88d1e39578254f62fd8a93ebd4610894a0c34720 Mon Sep 17 00:00:00 2001 From: luweihao Date: Thu, 16 Jan 2020 15:46:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=8B=E6=B5=8B=E8=AE=A1=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java | 38 ++++++++++++++++++++++ .../pojo/mes/pcn/repository/MesTimeRepository.java | 10 ++++++ 2 files changed, 48 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java new file mode 100644 index 0000000..37dd09d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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; + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_TIME") +@Api("工步参数") +public class MesTime extends BaseBean { + + @Column(name = "MODULE") + @ApiParam("组件") + private String module; + + @Column(name = "ELAPSE") + @ApiParam("耗时") + private Long elapse; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java new file mode 100644 index 0000000..6489cec --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java @@ -0,0 +1,10 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesTime; +import org.springframework.stereotype.Repository; + +@Repository +public interface MesTimeRepository extends BaseRepository { +}