修改devtype

xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsWithHeart.java

@@ -1,63 +0,0 @@
-package com.shxy.xymanager_common.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigInteger;
-import java.util.Date;
-
-@Data
-public class TerminalsWithHeart implements Serializable {
-    private Integer id;
-
-    private Integer lineid;
-
-    private Integer towerid;
-
-    private String name;
-
-    private String address;
-
-    private String cmdid;
-
-    private Short orgId;
-
-    private String equipname;
-
-    private String displayname;
-
-    private String model;
-
-    private String essentialInfoVersion;
-
-    private Integer hasPan;
-
-    private String bsManufacturer;
-
-    private Date bsProductionDate;
-
-    private String bsIdentifier;
-
-    private Double latitude;
-
-    private Double longitude;
-
-    private Date createTime;
-
-    private Date updateTime;
-
-    private BigInteger lastheartbeat;
-
-    private Integer protocol;
-
-    private String phase;
-
-    private String equipmentType;
-
-    private Integer devType;
-
-    private Integer isfavor;
-
-    private static final long serialVersionUID = 1L;
-
-}

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

@@ -100,7 +100,7 @@ public class Towers implements Serializable {
 
     private Integer status;
 
-    private Integer devType;
+    private String devType;
 
     private Integer protocol;
 

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

@@ -90,7 +90,7 @@ public class View_Dy_Line_Tower_Terminals implements Serializable {
 
 
     @ApiModelProperty(value = "网络类型", example = "1")
-    private Integer devType;
+    private String devType;
 
     @ApiModelProperty(value = "设备名称", example = "123456")
     private String devName;

xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalStatusDao.java

@@ -1,6 +1,5 @@
 package com.shxy.xymanager_dao.dao;
 
-import com.shxy.xymanager_common.dto.TerminalsWithHeart;
 import com.shxy.xymanager_common.entity.TerminalStatus;
 import com.shxy.xymanager_common.entity.TerminalStatusExample;
 import org.apache.ibatis.annotations.Param;
@@ -9,8 +8,6 @@ import java.util.List;
 
 public interface TerminalStatusDao {
 
-    TerminalsWithHeart selectByCmdId(@Param("cmdid") String cmdid);
-
     TerminalStatus selectByPrimaryKey(Integer termId);
 
     long countByExample(TerminalStatusExample example);

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

@@ -30,7 +30,7 @@
                 <result column="display_name" jdbcType="VARCHAR" property="displayName"/>
                 <result column="model" jdbcType="VARCHAR" property="model"/>
                 <result column="has_pan" jdbcType="INTEGER" property="hasPan"/>
-                <result column="dev_type" jdbcType="INTEGER" property="devType"/>
+                <result column="dev_type" jdbcType="VARCHAR" property="devType"/>
                 <result column="last_heartbeat" jdbcType="BIGINT" property="lastheartbeat"/>
             </collection>
         </collection>

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

@@ -26,16 +26,6 @@
     <result column="gps_status" jdbcType="INTEGER" property="gpsStatus" />
   </resultMap>
 
-  <resultMap id="heartResultMap" type="com.shxy.xymanager_common.dto.TerminalsWithHeart">
-    <result column="term_id" jdbcType="INTEGER" property="id" />
-    <result column="tower_id" jdbcType="INTEGER" property="towerid" />
-    <result column="cmdid" jdbcType="VARCHAR" property="cmdid" />
-    <result column="equip_name" jdbcType="VARCHAR" property="equipname" />
-    <result column="display_name" jdbcType="VARCHAR" property="displayname" />
-    <result column="model" jdbcType="VARCHAR" property="model" />
-    <result column="protocol" jdbcType="INTEGER" property="protocol" />
-    <result column="last_heartbeat" jdbcType="BIGINT" property="lastheartbeat" />
-  </resultMap>
   <sql id="Example_Where_Clause">
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -102,20 +92,6 @@
   </sql>
 
 
-  <select id="selectByCmdId" resultMap="heartResultMap">
-        select
-        b.id as term_id,
-        b.tower_id as tower_id,
-        b.cmdid as cmdid,
-        b.equip_name as equip_name,
-        b.display_name as display_name,
-        b.model as model,
-        b.protocol as protocol,
-        a.last_heartbeat as last_heartbeat
-        from terminal_status a,
-        terminals b
-        where a.term_id = b.id and b.cmdid = #{cmdid}
-    </select>
   <select id="selectByExample" parameterType="com.shxy.xymanager_common.entity.TerminalStatusExample" resultMap="BaseResultMap">
     select
     <if test="distinct">

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

@@ -31,7 +31,7 @@
         <result column="sim" jdbcType="VARCHAR" property="sim"/>
         <result column="working_date" jdbcType="DATE" property="workingDate"/>
         <result column="net_type" jdbcType="TINYINT" property="netType"/>
-        <result column="dev_type" jdbcType="TINYINT" property="devType"/>
+        <result column="dev_type" jdbcType="VARCHAR" property="devType"/>
         <result column="phase" jdbcType="VARCHAR" property="phase"/>
         <result column="equipment_type" jdbcType="VARCHAR" property="equipmentType"/>
         <result column="last_heartbeat" jdbcType="BIGINT" property="lastHeartbeat"/>
@@ -150,7 +150,7 @@
               #{hasPan,jdbcType=TINYINT}, #{bsManufacturer,jdbcType=VARCHAR}, #{bsProductionDate,jdbcType=DATE},
               #{bsIdentifier,jdbcType=VARCHAR}, #{latitude,jdbcType=DOUBLE}, #{longitude,jdbcType=DOUBLE},
               #{status,jdbcType=INTEGER}, #{protocol,jdbcType=INTEGER}, #{sim,jdbcType=VARCHAR},
-              #{workingDate,jdbcType=DATE}, #{netType,jdbcType=TINYINT}, #{devType,jdbcType=TINYINT},
+              #{workingDate,jdbcType=DATE}, #{netType,jdbcType=TINYINT}, #{devType,jdbcType=VARCHAR},
               #{phase,jdbcType=VARCHAR}, #{equipmentType,jdbcType=VARCHAR}, #{lastHeartbeat,jdbcType=BIGINT}
               )