I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

读取托盘

Browse Source
yun-zuoyi
WYnneaoapc 6 years ago
parent 9b6887dd40
commit 7ee11674ab
2 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File

11
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
Unescape Escape View File

@ -1243,11 +1243,12 @@ public class MesEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WC_CHECK_TYPE {
PERSON(10, "person", "人"),
EQUIPMENT(20, "equipment", "机"),
MATERIAL(30, "material", "料"),
ROUTE(40, "route", "法"),
ONLINE_SIGNAL(50, "onlineSignal", "开线信号");
PERSON(10, "person", "人员"),
EQUIPMENT(20, "equipment", "设备"),
MATERIAL(30, "material", "物料"),
ROUTE(40, "route", "工艺"),
ONLINE_SIGNAL(50, "onlineSignal", "开线信号"),
MAKE_UP_SIGNAL(60, "makeUpSignal", "补偿信号");
private int value;
private String code;

60
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
Unescape Escape View File

@ -403,11 +403,13 @@ public class MesPcnEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WC_CHECK_TYPE {
PERSON(10, "people", "人"),
PERSON(10, "people", "人员"),
EQUIPMENT(20, "equipments", "设备"),
MATERIAL(30, "materials", "物料"),
ROUTE(40, "routes", "工艺"),
ONLINE_SIGNAL(50, "onlineSignal", "开线信号");
ONLINE_SIGNAL(50, "onlineSignal", "开线信号"),
MAKE_UP_SIGNAL(60, "makeUpSignal", "补偿信号");
private int value;
private String code;
@ -620,10 +622,10 @@ public class MesPcnEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_SOURCE_TYPE {
SOURCE_MARIA_DB(10, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null),
SOURCE_SQL_SERVER(20, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"),
SOURCE_ORACLE(30, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null),
SOURCE_POSTGRE_SQL(40, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public");
SOURCE_MARIA_DB(10, "MariaDB", "MariaDB 10.1", "com.mysql.jdbc.Driver", 3306, null),
SOURCE_SQL_SERVER(20, "SQL Server", "SQL Server 2017", "com.microsoft.sqlserver.jdbc.SQLServerDriver", 1433, "dbo"),
SOURCE_ORACLE(30, "Oracle", "Oralce 12C", "oracle.jdbc.driver.OracleDriver", 1521, null),
SOURCE_POSTGRE_SQL(40, "PostgreSql", "PostgreSql 10.5", "org.postgresql.Driver", 5432, "public");
private int value;
private String code;
@ -632,7 +634,7 @@ public class MesPcnEnumUtil {
private int defaultPort;
private String defaultSchemaPattern;
private DATA_SOURCE_TYPE (int value, String code, String description,String driverClassName,int port,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;
@ -715,47 +717,47 @@ public class MesPcnEnumUtil {
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);
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){
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){
} else if (databaseProductName.indexOf(":oracle:") != -1) {
return SOURCE_ORACLE;
}else if(databaseProductName.indexOf(":postgresql:") != -1){
} else if (databaseProductName.indexOf(":postgresql:") != -1) {
return SOURCE_POSTGRE_SQL;
}else if(databaseProductName.indexOf(":sqlserver:") != -1){
} 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 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 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 getJDBCUrlPostgreSQL(String database, String host, Integer port) {
return "jdbc:postgresql://" + host + ":" + port + "/" + database;
}
private String getJDBCUrlSQLServer(String database,String host,Integer port){
private String getJDBCUrlSQLServer(String database, String host, Integer port) {
return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database;
}
}

Write Preview
Loading…
Cancel
Save