diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Terminals.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Terminals.java index 11f2fcd..0a67901 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Terminals.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Terminals.java @@ -98,7 +98,7 @@ public class Terminals implements Serializable { private Integer status; - private Integer devType; + private String devType; private Integer protocol; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalsExample.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalsExample.java index 8bf50f1..7533774 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalsExample.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalsExample.java @@ -512,52 +512,62 @@ public class TerminalsExample { return (Criteria) this; } - public Criteria andDevTypeEqualTo(Byte value) { + public Criteria andDevTypeEqualTo(String value) { addCriterion("dev_type =", value, "devType"); return (Criteria) this; } - public Criteria andDevTypeNotEqualTo(Byte value) { + public Criteria andDevTypeNotEqualTo(String value) { addCriterion("dev_type <>", value, "devType"); return (Criteria) this; } - public Criteria andDevTypeGreaterThan(Byte value) { + public Criteria andDevTypeGreaterThan(String value) { addCriterion("dev_type >", value, "devType"); return (Criteria) this; } - public Criteria andDevTypeGreaterThanOrEqualTo(Byte value) { + public Criteria andDevTypeGreaterThanOrEqualTo(String value) { addCriterion("dev_type >=", value, "devType"); return (Criteria) this; } - public Criteria andDevTypeLessThan(Byte value) { + public Criteria andDevTypeLessThan(String value) { addCriterion("dev_type <", value, "devType"); return (Criteria) this; } - public Criteria andDevTypeLessThanOrEqualTo(Byte value) { + public Criteria andDevTypeLessThanOrEqualTo(String value) { addCriterion("dev_type <=", value, "devType"); return (Criteria) this; } - public Criteria andDevTypeIn(List values) { + public Criteria andDevTypeLike(String value) { + addCriterion("dev_type like", value, "devType"); + return (Criteria) this; + } + + public Criteria andDevTypeNotLike(String value) { + addCriterion("dev_type not like", value, "devType"); + return (Criteria) this; + } + + public Criteria andDevTypeIn(List values) { addCriterion("dev_type in", values, "devType"); return (Criteria) this; } - public Criteria andDevTypeNotIn(List values) { + public Criteria andDevTypeNotIn(List values) { addCriterion("dev_type not in", values, "devType"); return (Criteria) this; } - public Criteria andDevTypeBetween(Byte value1, Byte value2) { + public Criteria andDevTypeBetween(String value1, String value2) { addCriterion("dev_type between", value1, value2, "devType"); return (Criteria) this; } - public Criteria andDevTypeNotBetween(Byte value1, Byte value2) { + public Criteria andDevTypeNotBetween(String value1, String value2) { addCriterion("dev_type not between", value1, value2, "devType"); return (Criteria) this; } diff --git a/xymanager_dao/src/main/resources/generatorConfig.xml b/xymanager_dao/src/main/resources/generatorConfig.xml index c0e090a..1e1eee3 100644 --- a/xymanager_dao/src/main/resources/generatorConfig.xml +++ b/xymanager_dao/src/main/resources/generatorConfig.xml @@ -53,12 +53,12 @@ - - - - - - + + +
@@ -122,12 +122,12 @@ - - -
+ + + + + + @@ -195,19 +195,19 @@ - - -
+ + + + + + - - -
+ + + + + + diff --git a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml index e950fb7..f120f50 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml @@ -8,7 +8,7 @@ - + @@ -179,7 +179,7 @@ isfavor) values (#{id,jdbcType=INTEGER}, #{lineId,jdbcType=INTEGER}, #{towerId,jdbcType=INTEGER}, #{cmdid,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{onlineStatus,jdbcType=TINYINT}, - #{devType,jdbcType=TINYINT}, #{orgId,jdbcType=SMALLINT}, #{sn,jdbcType=VARCHAR}, + #{devType,jdbcType=VARCHAR}, #{orgId,jdbcType=SMALLINT}, #{sn,jdbcType=VARCHAR}, #{iccid,jdbcType=VARCHAR}, #{protocol,jdbcType=INTEGER}, #{phase,jdbcType=VARCHAR}, #{equipmentType,jdbcType=VARCHAR}, #{cellphone,jdbcType=VARCHAR}, #{equipName,jdbcType=VARCHAR}, #{displayName,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, #{essentialInfoVersion,jdbcType=VARCHAR}, @@ -189,7 +189,7 @@ #{workingDate,jdbcType=DATE}, #{netType,jdbcType=TINYINT}, #{password,jdbcType=VARCHAR}, #{isfavor,jdbcType=INTEGER}) - + insert into terminals @@ -410,7 +410,7 @@ online_status = #{record.onlineStatus,jdbcType=TINYINT}, - dev_type = #{record.devType,jdbcType=TINYINT}, + dev_type = #{record.devType,jdbcType=VARCHAR}, org_id = #{record.orgId,jdbcType=SMALLINT}, @@ -497,7 +497,7 @@ cmdid = #{record.cmdid,jdbcType=VARCHAR}, status = #{record.status,jdbcType=INTEGER}, online_status = #{record.onlineStatus,jdbcType=TINYINT}, - dev_type = #{record.devType,jdbcType=TINYINT}, + dev_type = #{record.devType,jdbcType=VARCHAR}, org_id = #{record.orgId,jdbcType=SMALLINT}, sn = #{record.sn,jdbcType=VARCHAR}, iccid = #{record.iccid,jdbcType=VARCHAR}, @@ -545,7 +545,7 @@ online_status = #{onlineStatus,jdbcType=TINYINT}, - dev_type = #{devType,jdbcType=TINYINT}, + dev_type = #{devType,jdbcType=VARCHAR}, org_id = #{orgId,jdbcType=SMALLINT}, @@ -629,7 +629,7 @@ cmdid = #{cmdid,jdbcType=VARCHAR}, status = #{status,jdbcType=INTEGER}, online_status = #{onlineStatus,jdbcType=TINYINT}, - dev_type = #{devType,jdbcType=TINYINT}, + dev_type = #{devType,jdbcType=VARCHAR}, org_id = #{orgId,jdbcType=SMALLINT}, sn = #{sn,jdbcType=VARCHAR}, iccid = #{iccid,jdbcType=VARCHAR},