智能仓房添加查询条件-1

src/main/java/com/chinaitop/depot/intelligent/grainsituation/controller/TemperatureRecordController.java

@@ -289,29 +289,19 @@ public class TemperatureRecordController {
             @ApiImplicitParam(name = "storeCode", defaultValue = "001", value = "仓库编号", paramType = "query"),
             @ApiImplicitParam(name = "tType", value = "检测类型0测温，1粮油,2测水分", paramType = "query")
     })
-    public ResponseEntity sendOnlyStoreDetection(String storeCode, String tType) {
-        String result = "";
-        try {
-            if (StringUtils.isNotBlank(storeCode) && StringUtils.isNotBlank(tType)) {
-                // 0X02粮情数据采集,仓房号,设备编号若为0则控全部
-                String type = "";
-                if (tType.equals("0")) {
-                    type = constUtils.GRAIN_TYPE;
-                } else {
-                    type = constUtils.DEW_TYPE;
-                }
-                String dir = constUtils.directiveJoint(constUtils.F_EXTENT, constUtils.F_SUB_P, type, storeCode, "");
-                // 16进制字符串转byte数组
-                byte[] bytes = HexConvertUtils.hexStringToByte(dir);
-                // 发送指令
-                String s = socketClient.startClient(bytes);
-                result = TypeEnum.resultDispose(s);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ResponseEntity.ok("设备连接异常！");
-        }
-        return ResponseEntity.ok(result);
+    public ResponseEntity sendOnlyStoreDetection(String storeCode, String tType, @NotNull String orgId) {
+        // 1.获取库端url
+        String url = temperatureRecordService.getRemoteUrl(orgId);
+        if (StringUtils.isBlank(url))
+            return ResponseEntity.failed("库端硬件地址未配置!");
+        // 2.封装请求数据
+        MultiValueMap<String, String> requestEntity = new LinkedMultiValueMap<>();
+        requestEntity.add("storeCode", storeCode);
+        requestEntity.add("tType", tType);
+        return remoteControlUtil.remoteScan(
+                String.format("%s%s", url, remoteControlUtil.foodOnly),
+                requestEntity, "POST", null
+        );
     }
 
     @RequestMapping(value = "/findById", method = RequestMethod.GET)