智能仓房气象跳转

src/main/java/com/chinaitop/depot/intelligent/weather/controller/WertherinfoController.java

@@ -1,7 +1,6 @@
 package com.chinaitop.depot.intelligent.weather.controller;
 
 import com.chinaitop.depot.intelligent.grainsituation.service.TemperatureRecordService;
-import com.chinaitop.depot.intelligent.socket.SocketClient;
 import com.chinaitop.depot.intelligent.utils.RemoteControlUtil;
 import com.chinaitop.depot.intelligent.weather.model.TWertherinfo;
 import com.chinaitop.depot.intelligent.weather.service.WertherinfoService;
@@ -16,7 +15,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -24,7 +22,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping(value = "/intelligents/wertherinfo")
@@ -36,8 +36,6 @@ public class WertherinfoController {
     private WertherinfoService wertherinfoService;
     @Resource
     private RemoteControlUtil remoteControlUtil;
-    @Autowired
-    private SocketClient socketClient;
 
     @RequestMapping(value = "/getList", method = RequestMethod.GET)
     @ApiOperation(value = "查询 气象站设备 信息列表", notes = "查询 气象站设备 信息列表")
@@ -55,7 +53,7 @@ public class WertherinfoController {
             if (null != pageNum && null != pageSize) {
                 PageHelper.startPage(pageNum, pageSize);
             }
-            list = wertherinfoService.getList(vqxzname,searchStartDate,searchEndDate,orgId);
+            list = wertherinfoService.getList(vqxzname, searchStartDate, searchEndDate, orgId);
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseEntity.failed("查询气象站列表失败");
@@ -100,9 +98,9 @@ public class WertherinfoController {
             @ApiImplicitParam(name = "id", value = "气体象站数据id", paramType = "query"),
             @ApiImplicitParam(name = "wertherinfojson", value = "气体象站数据json", paramType = "form")
     })
-    public ResponseEntity deleteById(String id,String wertherinfojson) {
+    public ResponseEntity deleteById(String id, String wertherinfojson) {
         if (StringUtils.isNotBlank(id)) {
-            int count = wertherinfoService.deleteById(id,wertherinfojson);
+            int count = wertherinfoService.deleteById(id, wertherinfojson);
             if (count > 0) {
                 ResponseEntity.ok();
                 return ResponseEntity.ok();
@@ -112,6 +110,7 @@ public class WertherinfoController {
         }
         return ResponseEntity.failed("ID数据有误!");
     }
+
     @RequestMapping(value = "/getBycfCode", method = RequestMethod.GET)
     @ApiOperation(value = "校验是否重复", notes = "校验是否重复")
     @ApiImplicitParams({
@@ -119,8 +118,8 @@ public class WertherinfoController {
             @ApiImplicitParam(name = "vdevname", value = "设备名称", paramType = "query"),
             @ApiImplicitParam(name = "orgId", value = "库id", paramType = "query")
     })
-    public ResponseEntity getBycfCode(String vdevcode,String vdevname,String orgId) {
-        boolean bycfCode = wertherinfoService.getBycfCode(vdevcode, vdevname,orgId);
+    public ResponseEntity getBycfCode(String vdevcode, String vdevname, String orgId) {
+        boolean bycfCode = wertherinfoService.getBycfCode(vdevcode, vdevname, orgId);
         return ResponseEntity.ok(bycfCode);
     }
 
@@ -129,76 +128,29 @@ public class WertherinfoController {
     public ResponseEntity sendNowWeatherDetection(@RequestParam @NotNull String orgId) {
         // 1.获取库端url
         String url = temperatureRecordService.getRemoteUrl(orgId);
-        if (org.apache.commons.lang.StringUtils.isBlank(url))
+        if (StringUtils.isBlank(url))
             return ResponseEntity.failed("库端硬件地址未配置!");
-        // 2.封装请求数据
-        MultiValueMap<String, String> requestEntity = new LinkedMultiValueMap<>();
-        //requestEntity.add("storeCode", storeCode);
         return remoteControlUtil.remoteScan(
-                String.format("%s%s", url, remoteControlUtil.wertherinfo),
-                requestEntity, "POST", null
+                String.format("%s%s", url, RemoteControlUtil.wertherinfo),
+                new LinkedMultiValueMap<>()
         );
-       //7E 0005 06 0101 0000000000
-//        byte[] b = new byte[11];
-//        b[0] = 0x7E;
-//        b[1] = 0x00;
-//        b[2] = 0x05;
-//        b[3] = 0X06;
-//        b[4] = 0x01;
-//        b[5] = 0x01;
-//        b[6] = 0x00;
-//        b[7] = 0x00;
-//        b[8] = 0x00;
-//        b[9] = 0x00;
-//        b[10] = 0x00;
-//        String result = "";
-//        // 发送指令
-//        try {
-//            String s = socketClient.startClient(b);
-//            // 0：失败；1：成功；2：设备通讯异常；3：设备故障；4：未知原因; 5: 本地模式(有的设备有本地模式，即无法远程控制)
-//            result = TypeEnum.resultDispose(s);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            return ResponseEntity.ok("设备连接异常!");
-//        }
-//        return ResponseEntity.ok(result);
     }
 
     @RequestMapping(value = "/synchronizationAll", method = RequestMethod.GET)
     @ApiOperation(value = "与智远同步气象站信息基础数据", notes = "与智远同步气象站信息基础数据")
     @ApiImplicitParam(name = "orgId", value = "库房编码", paramType = "query")
     public ResponseEntity synchronizationAll(String orgId) {
-        //wertherzhiyuan
         // 1.获取库端url
         String url = temperatureRecordService.getRemoteUrl(orgId);
-        if (org.apache.commons.lang.StringUtils.isBlank(url))
+        if (StringUtils.isBlank(url))
             return ResponseEntity.failed("库端硬件地址未配置!");
         // 2.封装请求数据
-        MultiValueMap<String, String> requestEntity = new LinkedMultiValueMap<>();
-        String msg = null;
-        try {
-            msg = wertherinfoService.synchronizationAll(orgId);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ResponseEntity.ok("同步失败！");
-        }
-        requestEntity.add("msg", msg);
+        Map<String, String> requestEntity = new HashMap<>();
+        requestEntity.put("orgId", orgId);
         return remoteControlUtil.remoteScan(
-                String.format("%s%s", url, remoteControlUtil.wertherzhiyuan),
-                requestEntity, "POST", null
+                String.format("%s%s", url, RemoteControlUtil.wertherzhiyuan),
+                requestEntity
         );
-
-//        if (StringUtils.isBlank(orgId)){
-//            return ResponseEntity.ok("库房编码不能为空！");
-//        }
-//
-//        String msg = null;
-//        try {
-//            msg = wertherinfoService.synchronizationAll(orgId);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            return ResponseEntity.ok("同步失败！");
-//        }
-//        return ResponseEntity.ok(msg);
     }
+
 }