优化设备显示

java110-bean/src/main/java/com/java110/dto/hardwareAdapation/MachineDto.java

@@ -42,7 +42,7 @@ public class MachineDto extends PageDto implements Serializable {
 
 
 
-    private Date createTime;
+    private String createTime;
 
     private String statusCd = "0";
 
@@ -119,12 +119,11 @@ public class MachineDto extends PageDto implements Serializable {
         this.machineIp = machineIp;
     }
 
-
-    public Date getCreateTime() {
+    public String getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(Date createTime) {
+    public void setCreateTime(String createTime) {
         this.createTime = createTime;
     }
 

java110-bean/src/main/java/com/java110/vo/api/machine/ApiMachineDataVo.java

@@ -28,6 +28,8 @@ public class ApiMachineDataVo implements Serializable {
     private String roomNum;
     private String locationObjName;
 
+    private String createTime;
+
     public String getMachineId() {
         return machineId;
     }
@@ -187,4 +189,12 @@ public class ApiMachineDataVo implements Serializable {
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
 }

java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml

@@ -138,7 +138,7 @@ machine_name,machine_type_cd,machine_ip,location_type_cd,location_obj_id,state
         machineTypeCd,t.machine_ip,t.machine_ip machineIp,td.name machineTypeCdName,
         t.state,t.location_type_cd locationTypeCd,t.location_obj_id locationObjId,
         t.location_type_cd,t.location_obj_id,
-        td1.name stateName,td2.name locationTypeName
+        td1.name stateName,td2.name locationTypeName,t.create_time createTime
         from machine t,t_dict td,t_dict td1,t_dict td2
         where 1 =1
         and t.machine_type_cd=td.status_cd
@@ -198,6 +198,7 @@ machine_name,machine_type_cd,machine_ip,location_type_cd,location_obj_id,state
         <if test="state !=null and state != ''">
             and t.state = #{state}
         </if>
+        order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>