admin/src/views/business/device.vue
@@ -35,7 +35,8 @@ :data="tableData.list" stripe > <el-table-column prop="name" label="设备名称"></el-table-column> <el-table-column label="序号" width="55" fixed><template slot-scope="scope" >{{scope.$index+1}}</template></el-table-column> <el-table-column prop="name" label="设备名称"></el-table-column> <el-table-column prop="doorName" label="门禁点名称"></el-table-column> <el-table-column prop="regionPathName" label="区域名称"></el-table-column> <el-table-column prop="doorNo" label="门禁点编号"></el-table-column> admin/src/views/business/deviceBroadcast.vue
@@ -20,32 +20,13 @@ :data="tableData.list" stripe > <el-table-column prop="name" label="设备名称"></el-table-column> <el-table-column prop="doorName" label="门禁点名称"></el-table-column> <el-table-column prop="regionPathName" label="区域名称"></el-table-column> <el-table-column prop="doorNo" label="门禁点编号"></el-table-column> <el-table-column prop="manufature" label="厂商"></el-table-column> <el-table-column prop="online" label="在线状态"> <template slot-scope="{row}"> <span v-if="row.online == 0">离线</span> <span v-if="row.online == 1">在线</span> </template> </el-table-column> <el-table-column prop="ip" label="设备ip"></el-table-column> <el-table-column prop="port" label="设备端口"></el-table-column> <el-table-column label="是否园区入口"> <template slot-scope="{row}"> <el-switch @change="changeManufature($event, row)" v-model="row.isEntrance" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0"> </el-switch> </template> </el-table-column> <el-table-column prop="no" label="设备号"></el-table-column> <el-table-column label="序号" width="55" fixed><template slot-scope="scope" >{{scope.$index+1}}</template></el-table-column> <el-table-column prop="name" label="名称"></el-table-column> <el-table-column prop="hkId" label="广播点唯一标识"></el-table-column> <el-table-column prop="channelInfo" label="广播点类型"></el-table-column> <el-table-column prop="channelNo" label="通道号"></el-table-column> <el-table-column prop="regionName" label="区域名称"></el-table-column> <el-table-column prop="hkDate" label="同步时间"></el-table-column> </el-table> <pagination @size-change="handleSizeChange" admin/src/views/business/deviceLed.vue
@@ -20,11 +20,10 @@ :data="tableData.list" stripe > <el-table-column prop="name" label="设备名称"></el-table-column> <el-table-column prop="doorName" label="门禁点名称"></el-table-column> <el-table-column prop="regionPathName" label="区域名称"></el-table-column> <el-table-column prop="doorNo" label="门禁点编号"></el-table-column> <el-table-column label="序号" width="55" fixed><template slot-scope="scope" >{{scope.$index+1}}</template></el-table-column> <el-table-column prop="name" label="设备名称"></el-table-column> <el-table-column prop="manufature" label="厂商"></el-table-column> <el-table-column prop="no" label="设备编号"></el-table-column> <el-table-column prop="online" label="在线状态"> <template slot-scope="{row}"> <span v-if="row.online == 0">离线</span> @@ -33,19 +32,6 @@ </el-table-column> <el-table-column prop="ip" label="设备ip"></el-table-column> <el-table-column prop="port" label="设备端口"></el-table-column> <el-table-column label="是否园区入口"> <template slot-scope="{row}"> <el-switch @change="changeManufature($event, row)" v-model="row.isEntrance" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0"> </el-switch> </template> </el-table-column> <el-table-column prop="no" label="设备号"></el-table-column> </el-table> <pagination @size-change="handleSizeChange" server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/LedRecordsInfoResponse.java
@@ -7,5 +7,26 @@ @Data public class LedRecordsInfoResponse { private String indexCode; private String region_id;// String false 区域编码 private String device_config_attr ;//String false 设备属性值设置 private String model_data_id ;//String false 数据唯一标识 private String index_code;// String false 设备编号 private String device_index_code;// String false 主动设备编号 private String device_category;// String false 设备一级分类 private String device_type;// String false 设备类型 private String port;// Number false 端口号 private String manufacturer ;//String false 设备厂商 private String net_zone_id;// Number false 网域id private String resource_id;// String false ldap资源id private String screen_width;// Number false Led屏宽度 private String treaty_type;// String false 接入协议 private String addr_type;// String false 接入地址类型 private String addr ;//String false ip地址 private String screen_name;// String false led名称 private String device_key_version ;//String false 驱动版本号 private String create_time ;//String false 创建时间 private String update_time;// String false 更新时间 private String screen_height ;//Number false led屏高度 private String device_key;// String false 驱动唯一标识 } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java
@@ -444,12 +444,17 @@ private Device initLedDataByHkData(Device model, LedRecordsInfoResponse door, Date date) { model.setIsdeleted(Constants.ZERO); model.setHkId(door.getIndexCode()); model.setHkId(door.getModel_data_id()); model.setHkDate(date); model.setHkStatus(Constants.ONE); model.setNo(door.getIndex_code()); model.setType(Constants.TWO); model.setManufature(door.getManufacturer()); model.setPort(door.getPort()); model.setIp(door.getAddr()); model.setResourceType(door.getDevice_type()); model.setName(door.getScreen_name()); model.setRemark(JSONObject.toJSONString(door)); model.setDoorId(door.getIndexCode()); return model; } private Device initBroadcastDataByHkData(Device model, FetchAudioChannelInfoResponse device, Date date) { @@ -596,7 +601,7 @@ private Device getExistedLed(LedRecordsInfoResponse device, List<Device> allList) { if(allList.size()>0){ for(Device r : allList){ if(StringUtils.equals(r.getHkId(), device.getIndexCode())){ if(StringUtils.equals(r.getHkId(), device.getModel_data_id())){ //表示未删除 return r; } @@ -687,7 +692,7 @@ private boolean isDeletedLedDevice(Device device, List<LedRecordsInfoResponse> allHkList) { if(allHkList.size()>0){ for(LedRecordsInfoResponse r : allHkList){ if(StringUtils.equals(device.getDoorId(), r.getIndexCode())){ if(StringUtils.equals(device.getDoorId(), r.getModel_data_id())){ //表示未删除 return false; }
