修改view中devtye

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/View_Dy_Line_Tower_TerminalsExample.java

@@ -7,7 +7,6 @@ import java.util.List;
 
 public class View_Dy_Line_Tower_TerminalsExample {
     protected String orderByClause;
-    protected String groupByClause;
 
     protected boolean distinct;
 
@@ -17,14 +16,6 @@ public class View_Dy_Line_Tower_TerminalsExample {
         oredCriteria = new ArrayList<Criteria>();
     }
 
-    public String getGroupByClause() {
-        return groupByClause;
-    }
-
-    public void setGroupByClause(String groupByClause) {
-        this.groupByClause = groupByClause;
-    }
-
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
     }
@@ -2021,52 +2012,62 @@ public class View_Dy_Line_Tower_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<Byte> 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<String> values) {
             addCriterion("dev_type in", values, "devType");
             return (Criteria) this;
         }
 
-        public Criteria andDevTypeNotIn(List<Byte> values) {
+        public Criteria andDevTypeNotIn(List<String> 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;
         }
@@ -2270,11 +2271,6 @@ public class View_Dy_Line_Tower_TerminalsExample {
             addCriterion("last_heartbeat not between", value1, value2, "lastHeartbeat");
             return (Criteria) this;
         }
-
-        public Criteria andOptionsLikeOr(String str) {
-            addCriterion(str);
-            return (Criteria) this;
-        }
     }
 
     public static class Criteria extends GeneratedCriteria {

xymanager_dao/src/main/resources/generatorConfig.xml

@@ -17,7 +17,7 @@
         <!-- 数据库链接URL、用户名、密码 -->
         <!--        driverClass="com.mysql.jdbc.Driver"-->
         <jdbcConnection driverClass="com.mysql.cj.jdbc.Driver"
-                        connectionURL="jdbc:mysql://192.168.1.190:3306/xymp?userUnicode=true&amp;characterEncoding=utf8"
+                        connectionURL="jdbc:mysql://127.0.0.1:3306/xymp?userUnicode=true&amp;characterEncoding=utf8"
                         userId="root"
                         password="123456">
         </jdbcConnection>
@@ -53,12 +53,12 @@
         </javaClientGenerator>
 
         <!--        &lt;!&ndash; 列出要生成代码的所有表，这里配置的是不生成Example文件 &ndash;&gt;-->
-                <table tableName="terminals"
-                       domainObjectName="Terminals"
-                       mapperName="TerminalsDao"
-                       >
-                    <!--            <property name="useActualColumnNames" value="false"/>-->
-                </table>
+<!--                <table tableName="terminals"-->
+<!--                       domainObjectName="Terminals"-->
+<!--                       mapperName="TerminalsDao"-->
+<!--                       >-->
+<!--                    &lt;!&ndash;            <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
+<!--                </table>-->
 
 <!--        <table tableName="terminal_faults"-->
 <!--                       domainObjectName="TerminalFaults"-->
@@ -122,12 +122,12 @@
 <!--                    &lt;!&ndash;            <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
 <!--                </table>-->
 
-<!--        <table tableName="v_dy_line_tower_terminals"-->
-<!--               domainObjectName="View_Dy_Line_Tower_Terminals"-->
-<!--               mapperName="View_Dy_Line_Tower_TerminalsDao"-->
-<!--        >-->
-<!--            &lt;!&ndash;            <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
-<!--        </table>-->
+        <table tableName="v_dy_line_tower_terminals"
+               domainObjectName="View_Dy_Line_Tower_Terminals"
+               mapperName="View_Dy_Line_Tower_TerminalsDao"
+        >
+            <!--            <property name="useActualColumnNames" value="false"/>-->
+        </table>
 
 
 <!--        <table tableName="terminal_channel_mapper"-->

xymanager_dao/src/main/resources/mappers/View_Dy_Line_Tower_TerminalsDao.xml

@@ -35,7 +35,7 @@
         <result column="phase" jdbcType="VARCHAR" property="phase"/>
         <result column="equipment_type" jdbcType="VARCHAR" property="equipmentType"/>
         <result column="last_heartbeat" jdbcType="BIGINT" property="lastHeartbeat"/>
-        <result column="termcount" jdbcType="INTEGER" property="termcount" />
+        <result column="termcount" jdbcType="INTEGER" property="termcount"/>
     </resultMap>
     <sql id="Example_Where_Clause">
         <where>
@@ -99,12 +99,14 @@
     </sql>
     <sql id="Base_Column_List">
 
+
                     id, dy_id, dy_name, dy_create_time, dy_update_time, line_id, line_name, line_bs_manufacturer,
                     tower_id, tower_name, address, `order`, cmdid, org_id, equip_name, display_name, model,
                     essential_info_version, has_pan, bs_manufacturer, bs_production_date, bs_identifier,
                     latitude, longitude, status, protocol, sim, working_date, net_type, dev_type, phase,
                     equipment_type, last_heartbeat
 
+
     </sql>
     <select id="selectByExample" parameterType="com.shxy.xymanager_common.entity.View_Dy_Line_Tower_TerminalsExample"
             resultMap="BaseResultMap">
@@ -129,6 +131,7 @@
     </delete>
     <insert id="insert" parameterType="com.shxy.xymanager_common.entity.View_Dy_Line_Tower_Terminals">
 
+
                     insert into v_dy_line_tower_terminals (id, dy_id, dy_name,
                       dy_create_time, dy_update_time, line_id,
                       line_name, line_bs_manufacturer, tower_id,
@@ -154,6 +157,7 @@
                       #{phase,jdbcType=VARCHAR}, #{equipmentType,jdbcType=VARCHAR}, #{lastHeartbeat,jdbcType=BIGINT}
                       )
 
+
     </insert>
     <insert id="insertSelective" parameterType="com.shxy.xymanager_common.entity.View_Dy_Line_Tower_Terminals">
         insert into v_dy_line_tower_terminals