From 529f604297a47253a7d6c02e1180662123197892 Mon Sep 17 00:00:00 2001 From: xia Date: Fri, 9 Sep 2022 17:31:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=A6=BB=E7=BA=BF=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=88=97=E8=A1=A8=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/controller/DeviceController.java | 2 + .../device/service/impl/DeviceImpl.java | 81 ++++++++++++++++++- 2 files changed, 79 insertions(+), 4 deletions(-) diff --git a/storeroom/src/main/java/com/storeroom/modules/device/controller/DeviceController.java b/storeroom/src/main/java/com/storeroom/modules/device/controller/DeviceController.java index b4ed59c..bb0d898 100644 --- a/storeroom/src/main/java/com/storeroom/modules/device/controller/DeviceController.java +++ b/storeroom/src/main/java/com/storeroom/modules/device/controller/DeviceController.java @@ -135,6 +135,8 @@ public class DeviceController { count += deviceService.getDeviceTypeNum("65D1886B0F864291766421"); count += deviceService.getDeviceTypeNum("7305DE3D273B0CAC079538"); + + count += deviceService.getDeviceTypeNum("E2767FEACA9CE0E3B16B89"); if (!StringUtils.isEmpty(token)) { count += deviceService.getDeviceTypeNum("7882487E0C15304A3758AF"); count += deviceService.getDeviceTypeNum("250AE644EC43E4EC954A81"); diff --git a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java index 5ff1c93..a97f751 100644 --- a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java +++ b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java @@ -15,7 +15,12 @@ import com.storeroom.modules.storeroom3d.service.impl.AlarmInfoServiceImpl; import com.storeroom.modules.storeroom3d.service.impl.ThirdApiServiceImpl; import com.storeroom.utils.*; import lombok.RequiredArgsConstructor; +import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -24,6 +29,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; +import java.io.BufferedReader; +import java.io.InputStreamReader; import java.util.*; import java.util.stream.Collectors; @@ -491,6 +498,43 @@ public class DeviceImpl implements DeviceService { @Override public Integer getDeviceTypeNum(String deviceTypeId) { + //桌面式RFID读写器 + if("E2767FEACA9CE0E3B16B89".equals(deviceTypeId)){ + Integer count = 0; + List deviceInfos = deviceInfoRepository.findByDeviceTypeId(deviceTypeId); + for(DeviceInfo deviceInfo:deviceInfos){ + try { + HttpClient client = HttpClients.createDefault(); + String url2 = "http://" + deviceInfo.getDeviceIp() + ":" + deviceInfo.getDevicePort() + "/RFIDInterface.aspx?op=RFID_CheckStatus&sDevID=" + deviceInfo.getDeviceId(); + HttpGet httpGet = new HttpGet(url2); + httpGet.setHeader("Content-Type", "application/x-www-form-urlencoded"); + //httpClient实例化 + CloseableHttpClient httpClient = HttpClients.createDefault(); + // 执行请求并获取返回 + HttpResponse response = httpClient.execute(httpGet); + HttpEntity entity = response.getEntity(); + // 显示结果 + BufferedReader reader = new BufferedReader(new InputStreamReader(entity.getContent(), "UTF-8")); + String line = null; + StringBuffer responseSB = new StringBuffer(); + while ((line = reader.readLine()) != null) { + if (line.contains("