设备显示问题

WebService/src/main/resources/components/machinePackage/machine-manage/machineManage.html

@@ -5,35 +5,45 @@
                 <div class="ibox-title">
                     <h5>查询条件</h5>
                     <div class="ibox-tools" style="top:10px;">
-                        <button type="button"  class="btn btn-link btn-sm" style="margin-right:10px;"  v-on:click="_moreCondition()">{{machineManageInfo.moreCondition == true?'隐藏':'更多'}}</button>
+                        <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;" v-on:click="_moreCondition()">{{machineManageInfo.moreCondition == true?'隐藏':'更多'}}</button>
                     </div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
-<div class="col-sm-4" >
-<div class="form-group">
+                        <div class="col-sm-4">
+                            <div class="form-group">
                                 <input type="text" placeholder="请输入设备编码" v-model="machineManageInfo.conditions.machineCode" class=" form-control">
-                            </div>                        </div><div class="col-sm-4" >
-<select class="custom-select" v-model="machineManageInfo.conditions.machineTypeCd">
-         <option selected  value="">请选择设备类型</option>
-         <option  value="9999">锐目门禁</option>
-<option  value="9998">其他</option>
-  </select>                        </div><div class="col-sm-3" >
-<div class="form-group">
+                            </div>
+                        </div>
+                        <div class="col-sm-4">
+                            <select class="custom-select" v-model="machineManageInfo.conditions.machineTypeCd">
+                                <option selected value="">请选择设备类型</option>
+                                <option value="9999">锐目门禁</option>
+                                <option value="9998">其他</option>
+                            </select></div>
+                        <div class="col-sm-3">
+                            <div class="form-group">
                                 <input type="text" placeholder="请输入设备名称" v-model="machineManageInfo.conditions.machineName" class=" form-control">
-                            </div>                        </div><div class="col-sm-1">
+                            </div>
+                        </div>
+                        <div class="col-sm-1">
                             <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryMachineMethod()">
-                                    <i class="glyphicon glyphicon-search"></i> 查询
+                                <i class="glyphicon glyphicon-search"></i> 查询
                             </button>
-                        </div></div>
-<div class="row">
-<div class="col-sm-4" v-if="machineManageInfo.moreCondition == true">
-<div class="form-group">
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-sm-4" v-if="machineManageInfo.moreCondition == true">
+                            <div class="form-group">
                                 <input type="text" placeholder="请输入设备IP" v-model="machineManageInfo.conditions.machineIp" class=" form-control">
-                            </div>                        </div><div class="col-sm-4" v-if="machineManageInfo.moreCondition == true">
-<div class="form-group">
+                            </div>
+                        </div>
+                        <div class="col-sm-4" v-if="machineManageInfo.moreCondition == true">
+                            <div class="form-group">
                                 <input type="text" placeholder="请输入设备MAC" v-model="machineManageInfo.conditions.machineMac" class=" form-control">
-                            </div>                        </div></div>
+                            </div>
+                        </div>
+                    </div>
 
 
                 </div>
@@ -59,7 +69,7 @@
                     >
                         <thead>
                         <tr>
-                                                        <th class="text-center">设备ID</th>
+                            <th class="text-center">设备ID</th>
                             <th class="text-center">设备编码</th>
                             <th class="text-center">版本号</th>
                             <th class="text-center">设备名称</th>
@@ -73,19 +83,21 @@
                         </thead>
                         <tbody>
                         <tr v-for="machine in machineManageInfo.machines">
-                                                        <td class="text-center">{{machine.machineId}}</td>
+                            <td class="text-center">{{machine.machineId}}</td>
                             <td class="text-center">{{machine.machineCode}}</td>
                             <td class="text-center">{{machine.machineVersion}}</td>
                             <td class="text-center">{{machine.machineName}}</td>
-                            <td class="text-center">{{machine.machineTypeCd}}</td>
+                            <td class="text-center">{{machine.machineTypeCdName}}</td>
                             <td class="text-center">{{machine.machineIp}}</td>
                             <td class="text-center">{{machine.machineMac}}</td>
-                            <td class="text-center"><div class="btn-group">
+                            <td class="text-center">
+                                <div class="btn-group">
                                     <button class="btn-white btn btn-xs" v-on:click="_openEditMachineModel(machine)">修改</button>
                                 </div>
                                 <div class="btn-group">
                                     <button class="btn-white btn btn-xs" v-on:click="_openDeleteMachineModel(machine)">删除</button>
-                                </div></td>
+                                </div>
+                            </td>
 
                         </tr>
                         </tbody>
@@ -104,7 +116,6 @@
         </div>
     </div>
 
-    
 
     <vc:create name="addMachine"
                callBackListener=""

WebService/src/main/resources/components/machinePackage/machineTranslate-manage/machineTranslateManage.html

@@ -90,21 +90,21 @@
                             <td class="text-center">{{machineTranslate.machineTranslateId}}</td>
                             <td class="text-center">{{machineTranslate.machineCode}}</td>
                             <td class="text-center">{{machineTranslate.machineId}}</td>
-                            <td class="text-center">{{machineTranslate.typeCd}}</td>
+                            <td class="text-center">{{machineTranslate.typeCdName}}</td>
                             <td class="text-center">{{machineTranslate.objName}}</td>
                             <td class="text-center">{{machineTranslate.objId}}</td>
-                            <td class="text-center">{{machineTranslate.state}}</td>
+                            <td class="text-center">{{machineTranslate.stateName}}</td>
                             <td class="text-center">
                                 <div class="btn-group">
                                     <button class="btn-white btn btn-xs"
                                             v-on:click="_openEditMachineTranslateModel(machineTranslate)">修改
                                     </button>
                                 </div>
-                               <!-- <div class="btn-group">
-                                    <button class="btn-white btn btn-xs"
-                                            v-on:click="_openDeleteMachineTranslateModel(machineTranslate)">删除
-                                    </button>
-                                </div>-->
+                                <!-- <div class="btn-group">
+                                     <button class="btn-white btn btn-xs"
+                                             v-on:click="_openDeleteMachineTranslateModel(machineTranslate)">删除
+                                     </button>
+                                 </div>-->
                             </td>
 
                         </tr>
@@ -130,6 +130,6 @@
                callBackFunction=""
     ></vc:create>
     <vc:create name="editMachineTranslate"></vc:create>
-   <!-- <vc:create name="deleteMachineTranslate"></vc:create>-->
+    <!-- <vc:create name="deleteMachineTranslate"></vc:create>-->
 
 </div>

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

@@ -23,6 +23,7 @@ public class MachineDto extends PageDto implements Serializable {
     private String communityId;
     private String machineName;
     private String machineTypeCd;
+    private String machineTypeCdName;
     private String machineIp;
     private String bId;
 
@@ -127,4 +128,12 @@ public class MachineDto extends PageDto implements Serializable {
     public void setbId(String bId) {
         this.bId = bId;
     }
+
+    public String getMachineTypeCdName() {
+        return machineTypeCdName;
+    }
+
+    public void setMachineTypeCdName(String machineTypeCdName) {
+        this.machineTypeCdName = machineTypeCdName;
+    }
 }

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

@@ -18,10 +18,12 @@ public class MachineTranslateDto extends PageDto implements Serializable {
     private String machineId;
     private String machineCode;
     private String typeCd;
+    private String typeCdName;
     private String machineTranslateId;
     private String objId;
     private String objName;
     private String state;
+    private String stateName;
     private String communityId;
 
 
@@ -110,4 +112,20 @@ public class MachineTranslateDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getTypeCdName() {
+        return typeCdName;
+    }
+
+    public void setTypeCdName(String typeCdName) {
+        this.typeCdName = typeCdName;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }

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

@@ -6,62 +6,84 @@ import java.util.Date;
 public class ApiMachineDataVo implements Serializable {
 
     private String machineId;
-private String machineCode;
-private String machineVersion;
-private String machineName;
-private String machineTypeCd;
-private String authCode;
-private String machineIp;
-private String machineMac;
-public String getMachineId() {
+    private String machineCode;
+    private String machineVersion;
+    private String machineName;
+    private String machineTypeCd;
+    private String machineTypeCdName;
+    private String authCode;
+    private String machineIp;
+    private String machineMac;
+
+    public String getMachineId() {
         return machineId;
     }
-public void setMachineId(String machineId) {
+
+    public void setMachineId(String machineId) {
         this.machineId = machineId;
     }
-public String getMachineCode() {
+
+    public String getMachineCode() {
         return machineCode;
     }
-public void setMachineCode(String machineCode) {
+
+    public void setMachineCode(String machineCode) {
         this.machineCode = machineCode;
     }
-public String getMachineVersion() {
+
+    public String getMachineVersion() {
         return machineVersion;
     }
-public void setMachineVersion(String machineVersion) {
+
+    public void setMachineVersion(String machineVersion) {
         this.machineVersion = machineVersion;
     }
-public String getMachineName() {
+
+    public String getMachineName() {
         return machineName;
     }
-public void setMachineName(String machineName) {
+
+    public void setMachineName(String machineName) {
         this.machineName = machineName;
     }
-public String getMachineTypeCd() {
+
+    public String getMachineTypeCd() {
         return machineTypeCd;
     }
-public void setMachineTypeCd(String machineTypeCd) {
+
+    public void setMachineTypeCd(String machineTypeCd) {
         this.machineTypeCd = machineTypeCd;
     }
-public String getAuthCode() {
+
+    public String getAuthCode() {
         return authCode;
     }
-public void setAuthCode(String authCode) {
+
+    public void setAuthCode(String authCode) {
         this.authCode = authCode;
     }
-public String getMachineIp() {
+
+    public String getMachineIp() {
         return machineIp;
     }
-public void setMachineIp(String machineIp) {
+
+    public void setMachineIp(String machineIp) {
         this.machineIp = machineIp;
     }
-public String getMachineMac() {
+
+    public String getMachineMac() {
         return machineMac;
     }
-public void setMachineMac(String machineMac) {
+
+    public void setMachineMac(String machineMac) {
         this.machineMac = machineMac;
     }
 
+    public String getMachineTypeCdName() {
+        return machineTypeCdName;
+    }
 
-
+    public void setMachineTypeCdName(String machineTypeCdName) {
+        this.machineTypeCdName = machineTypeCdName;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/machineTranslate/ApiMachineTranslateDataVo.java

@@ -6,55 +6,84 @@ import java.util.Date;
 public class ApiMachineTranslateDataVo implements Serializable {
 
     private String machineTranslateId;
-private String machineCode;
-private String machineId;
-private String typeCd;
-private String objName;
-private String objId;
-private String state;
-public String getMachineTranslateId() {
+    private String machineCode;
+    private String machineId;
+    private String typeCd;
+    private String typeCdName;
+    private String objName;
+    private String objId;
+    private String state;
+    private String stateName;
+
+    public String getMachineTranslateId() {
         return machineTranslateId;
     }
-public void setMachineTranslateId(String machineTranslateId) {
+
+    public void setMachineTranslateId(String machineTranslateId) {
         this.machineTranslateId = machineTranslateId;
     }
-public String getMachineCode() {
+
+    public String getMachineCode() {
         return machineCode;
     }
-public void setMachineCode(String machineCode) {
+
+    public void setMachineCode(String machineCode) {
         this.machineCode = machineCode;
     }
-public String getMachineId() {
+
+    public String getMachineId() {
         return machineId;
     }
-public void setMachineId(String machineId) {
+
+    public void setMachineId(String machineId) {
         this.machineId = machineId;
     }
-public String getTypeCd() {
+
+    public String getTypeCd() {
         return typeCd;
     }
-public void setTypeCd(String typeCd) {
+
+    public void setTypeCd(String typeCd) {
         this.typeCd = typeCd;
     }
-public String getObjName() {
+
+    public String getObjName() {
         return objName;
     }
-public void setObjName(String objName) {
+
+    public void setObjName(String objName) {
         this.objName = objName;
     }
-public String getObjId() {
+
+    public String getObjId() {
         return objId;
     }
-public void setObjId(String objId) {
+
+    public void setObjId(String objId) {
         this.objId = objId;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
 
+    public String getTypeCdName() {
+        return typeCdName;
+    }
 
+    public void setTypeCdName(String typeCdName) {
+        this.typeCdName = typeCdName;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
 
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }

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

@@ -107,9 +107,12 @@ machine_mac,machine_id,machine_code,auth_code,operate,machine_version,community_
         machineCode,t.auth_code,t.auth_code authCode,t.machine_version,t.machine_version
         machineVersion,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.b_id,t.b_id
         bId,t.machine_name,t.machine_name machineName,t.machine_type_cd,t.machine_type_cd
-        machineTypeCd,t.machine_ip,t.machine_ip machineIp
-        from machine t
+        machineTypeCd,t.machine_ip,t.machine_ip machineIp,td.name machineTypeCdName
+        from machine t,t_dict td
         where 1 =1
+        and t.machine_type_cd=td.status_cd
+        and td.table_name='machine'
+        and td.table_columns='machine_type_cd'
         <if test="machineMac !=null and machineMac != ''">
             and t.machine_mac= #{machineMac}
         </if>
@@ -193,8 +196,11 @@ machine_mac,machine_id,machine_code,auth_code,operate,machine_version,community_
     <!-- 查询设备数量 add by wuxw 2018-07-03 -->
     <select id="queryMachinesCount" parameterType="Map" resultType="Map">
         select count(1) count
-        from machine t
+        from machine t,t_dict td
         where 1 =1
+        and t.machine_type_cd=td.status_cd
+        and td.table_name='machine'
+        and td.table_columns='machine_type_cd'
         <if test="machineMac !=null and machineMac != ''">
             and t.machine_mac= #{machineMac}
         </if>

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

@@ -128,9 +128,15 @@ machine_id,machine_code,operate,type_cd,machine_translate_id,obj_id,obj_name,sta
         select t.machine_id,t.machine_id machineId,t.machine_code,t.machine_code machineCode,t.type_cd,t.type_cd
         typeCd,t.machine_translate_id,t.machine_translate_id machineTranslateId,t.obj_id,t.obj_id
         objId,t.status_cd,t.status_cd statusCd,t.obj_name,t.obj_name objName,t.state,t.community_id,t.community_id
-        communityId,t.b_id,t.b_id bId
-        from machine_translate t
+        communityId,t.b_id,t.b_id bId,td.name typeCdName,td1.name stateName
+        from machine_translate t,t_dict td,t_dict td1
         where 1 =1
+        and t.machine_type_cd=td.status_cd
+        and td.table_name='machine_translate'
+        and td.table_columns='type_cd'
+        and t.state=td1.status_cd
+        and td1.table_name='machine_translate'
+        and td1.table_columns='state'
         <if test="machineId !=null and machineId != ''">
             and t.machine_id= #{machineId}
         </if>
@@ -208,8 +214,14 @@ machine_id,machine_code,operate,type_cd,machine_translate_id,obj_id,obj_name,sta
     <!-- 查询设备同步数量 add by wuxw 2018-07-03 -->
     <select id="queryMachineTranslatesCount" parameterType="Map" resultType="Map">
         select count(1) count
-        from machine_translate t
+        from machine_translate t,t_dict td,t_dict td1
         where 1 =1
+        and t.machine_type_cd=td.status_cd
+        and td.table_name='machine_translate'
+        and td.table_columns='type_cd'
+        and t.state=td1.status_cd
+        and td1.table_name='machine_translate'
+        and td1.table_columns='state'
         <if test="machineId !=null and machineId != ''">
             and t.machine_id= #{machineId}
         </if>