调用库端硬件设备代码

src/main/java/com/DepotIntelligentApplication.java

@@ -6,6 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+import org.springframework.web.client.RestTemplate;
 
 @EnableEurekaClient
 @SpringBootApplication
@@ -20,4 +21,10 @@ public class DepotIntelligentApplication {
 	public ThreadPoolTaskScheduler threadPoolTaskScheduler() {
 		return new ThreadPoolTaskScheduler();
 	}
+
+	@Bean
+	public RestTemplate restTemplate() {
+		return new RestTemplate();
+	}
+
 }

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

@@ -7,6 +7,7 @@ import com.chinaitop.depot.intelligent.grainsituation.service.TemperatureRecordS
 import com.chinaitop.depot.intelligent.socket.SocketClient;
 import com.chinaitop.depot.intelligent.utils.ConstUtils;
 import com.chinaitop.depot.intelligent.utils.HexConvertUtils;
+import com.chinaitop.depot.intelligent.utils.RemoteControlUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.unissoft.model.ResponseEntity;
@@ -19,12 +20,16 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
 import java.util.*;
 
 @RestController
@@ -50,7 +55,7 @@ public class TemperatureRecordController {
             @ApiImplicitParam(name = "vCfCode", value = "仓库名称", paramType = "query"),
             @ApiImplicitParam(name = "tType", value = "检测类型0测温，1粮油,2测水分", paramType = "query")
     })
-    public ResponseEntity<PageInfo<TTestdata>> getList(Integer pageNum, Integer pageSize, String vCfCode, String vDatatime, String startTime, String endTime, String tType,String orgId) {
+    public ResponseEntity<PageInfo<TTestdata>> getList(Integer pageNum, Integer pageSize, String vCfCode, String vDatatime, String startTime, String endTime, String tType, String orgId) {
         List<TTestdata> list = null;
         try {
             if (null != pageNum && null != pageSize) {
@@ -91,11 +96,10 @@ public class TemperatureRecordController {
     }
 
     /**
-     *
      * @param lqId
      * @param vCfCode
      * @param vDatatime
-     * @param viewFlag true: 表格数据,false: 3D三温图数据
+     * @param viewFlag  true: 表格数据,false: 3D三温图数据
      * @return
      */
     @RequestMapping(value = "/findByHouseAndTimes", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
@@ -232,54 +236,26 @@ public class TemperatureRecordController {
     private SocketClient socketClient;
     @Autowired
     private ConstUtils constUtils;
+    @Resource
+    private RemoteControlUtil remoteControlUtil;
 
     @RequestMapping(value = "/sendTemperatureDetection", method = RequestMethod.POST)
     @ApiOperation(value = "粮情实时检测", notes = "粮情实时检测")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "storeCode", defaultValue = "001", value = "仓库编号", paramType = "query")
     })
-    public ResponseEntity<Map<String, String>> sendTemperatureDetection(String storeCode) {
-        Map<String, String> map = new LinkedHashMap<>();
-        if (StringUtils.isNotBlank(storeCode)) {
-            String sTemp = storeCode.substring(0, storeCode.length());
-            String[] sArray = sTemp.split(",");
-            for (String cfCode : sArray) {
-                // 0X02粮情数据采集,仓房号,设备编号若为0则控全部
-                String dir = constUtils.directiveJoint(constUtils.F_EXTENT, constUtils.F_SUB_P, constUtils.GRAIN_TYPE, cfCode, "");
-                // 16进制字符串转byte数组
-                byte[] bytes = HexConvertUtils.hexStringToByte(dir);
-                // 发送指令
-                String s = socketClient.startClient(bytes);
-                // 0：失败；1：成功；2：设备通讯异常；3：设备故障；4：未知原因; 5: 本地模式(有的设备有本地模式，即无法远程控制)
-                if (s.contains("7E")) {
-                    String substring = s.substring(s.length() - 2, s.length());
-                    if ("00".equals(substring))
-                        map.put(cfCode, TypeEnum.S_NUL.getDesc()); // 失败
-                    else if ("01".equals(substring))
-                        map.put(cfCode, TypeEnum.S_SOH.getDesc()); // 成功
-                    else if ("02".equals(substring))
-                        map.put(cfCode, TypeEnum.S_STX.getDesc()); // 设备通讯异常
-                    else if ("03".equals(substring))
-                        map.put(cfCode, TypeEnum.S_ETX.getDesc()); // 设备故障
-                    else if ("04".equals(substring))
-                        map.put(cfCode, TypeEnum.S_EOT.getDesc()); // 未知原因
-                    else if ("05".equals(substring))
-                        map.put(cfCode, TypeEnum.S_2D_SOH.getDesc()); // 本地模式,无法远程控制
-                    else if ("06".equals(substring))
-                        map.put(cfCode, TypeEnum.SM.getDesc()); // 设备正忙
-                } else {
-                    if (s.contains("323230")) { // 220-FileZilla Server 0.9.60 beta
-                        map.put("error", "无法连接到服务器!");
-                    } else {
-                        map.put("error", s);
-                    }
-                    return ResponseEntity.failed(s);
-                }
-            }
-        } else {
-            return ResponseEntity.failed(TypeEnum.S_EM.getDesc());  // 仓房号为空
-        }
-        return ResponseEntity.ok(map);
+    public ResponseEntity<Map<String, String>> sendTemperatureDetection(String storeCode, @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);
+        return remoteControlUtil.remoteScan(
+                String.format("%s%s", url, remoteControlUtil.chooseCFCode),
+                requestEntity, "POST", null
+        );
     }
 
     @RequestMapping(value = "/sendTemperatureDetectionAll", method = RequestMethod.GET)

src/main/java/com/chinaitop/depot/intelligent/grainsituation/mapper/TTestdataMapper.java

@@ -49,4 +49,6 @@ public interface TTestdataMapper {
      * @return
      */
     List<Map<String,Object>> getGrainPointAll(Map<String, Object> map);
+
+    String getRemoteUrl(@Param("orgId") String orgId);
 }

src/main/java/com/chinaitop/depot/intelligent/grainsituation/mapper/TTestdataMapper.xml

@@ -465,4 +465,16 @@
       </if>
     </where>
   </select>
+  <select id="getRemoteUrl" resultType="java.lang.String" parameterType="java.lang.String">
+    SELECT
+        intranet_url
+    FROM
+        t_url_config
+    WHERE
+        user_type = '1'
+        <if test="orgId != null">
+          AND org_id = #{orgId}
+        </if>
+  </select>
+
 </mapper>

src/main/java/com/chinaitop/depot/intelligent/grainsituation/service/TemperatureRecordService.java

@@ -24,4 +24,6 @@ public interface TemperatureRecordService {
     String getOrgId (String cfCode);
 
     TTestdata getById(String id);
+
+    String getRemoteUrl(String orgId);
 }

src/main/java/com/chinaitop/depot/intelligent/grainsituation/service/impl/TemperatureRecordServiceImpl.java

@@ -167,4 +167,9 @@ public class TemperatureRecordServiceImpl implements TemperatureRecordService {
         return tTestdata;
     }
 
+    @Override
+    public String getRemoteUrl(String orgId) {
+        return tTestdataMapper.getRemoteUrl(orgId);
+    }
+
 }

src/main/java/com/chinaitop/depot/intelligent/utils/RemoteControlUtil.java

@@ -0,0 +1,113 @@
+package com.chinaitop.depot.intelligent.utils;
+
+import com.unissoft.model.ResponseEntity;
+import com.unissoft.model.TypeEnum;
+import org.springframework.stereotype.Component;
+import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
+import org.springframework.web.client.RestTemplate;
+
+import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * @author qingsong.han
+ * @description: 云端远程检测控制工具类
+ * @create 2020-06-01 11:05
+ */
+@Component
+public class RemoteControlUtil {
+    /**
+     * rest接口注入
+     */
+    @Resource
+    private RestTemplate restTemplate;
+    /**
+     * url常量
+     */
+    // 数量检测,获取测量进度
+    public static final String scanProgress = "/intelligents/monitorWarning/getScanResult";
+    // 数量检测,获取扫描结果
+    public static final String measureWeight = "/intelligents/monitorWarning/getmeasureweight";
+    // 数量检测,监测指令接口
+    public static final String sendOrder = "/intelligents/monitorWarning/sendNumberMonitor";
+    // 粮温检测-手动选仓
+    public static final String chooseCFCode = "/intelligents/temperatureRecord/sendTemperatureDetection";
+    // 粮情全仓检测
+    public static final String foodAll = "/intelligents/temperatureRecord/sendTemperatureDetectionAll";
+    // 粮情单仓检测
+    public static final String foodOnly = "/intelligents/temperatureRecord/sendOnlyStoreDetection";
+    // 气体全仓检测
+    public static final String gasAll = "/intelligents/gasDetection/sendGasDetectionAll";
+    // 气体单仓检测
+    public static final String gasOnly = "/intelligents/gasDetection/sendOnlyGasDetection";
+    // 气象检测
+    public static final String weatherMonitored = "/intelligents/wertherinfo/sendNowWeatherDetection";
+    // 液位所有油罐检测
+    public static final String levelAll = "/intelligents/LevelDetection/sendLevelDetectionAll";
+    // 液位单油罐检测
+    public static final String onlyLevel = "/intelligents/LevelDetection/sendOnlyStoreDetection";
+    // 所有虫害检测
+    public static final String pestAll = "/intelligents/insectPestDetection/sendInsectPestDetectionAll";
+    // 单仓虫害检测
+    public static final String onlyPest = "/intelligents/insectPestDetection/sendOnlyInsectPestDetection";
+    // 能耗检测
+    public static final String energyOrder = "/intelligents/energyDetection/addHistoryData";
+
+    /**
+     * 远程库端请求方法
+     *
+     * @param url           库端地址
+     * @param requestEntity post请求参数 无参数传入 new LinkedMultiValueMap<>()
+     * @param httpType      http 类型
+     * @param requestMap    get请求参数 无参数传入 new HashMap<>()
+     * @return string
+     */
+    public ResponseEntity remoteScan(@NotNull String url, MultiValueMap requestEntity, @NotNull String httpType, Map requestMap) {
+        httpType = httpType.toUpperCase();
+        ResponseEntity responseEntity = null;
+        try {
+            if ("GET".equals(httpType)) {
+                responseEntity = restTemplate.getForObject(getForObject(url, requestMap), ResponseEntity.class);
+            } else {
+                responseEntity = restTemplate.postForObject(url, requestEntity, ResponseEntity.class);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return responseEntity;
+    }
+
+    /**
+     * 封装的get请求，暂时只支持map传参，并且value只支持基本类型和String
+     *
+     * @param url    库端配置url
+     * @param object 接收数据(只支持map类型)
+     * @return string类型带参数get请求url
+     */
+    private static String getForObject(String url, Object object) {
+        StringBuilder stringBuilder = new StringBuilder(url);
+        if (object instanceof Map) {
+            Iterator iterator = ((Map) object).entrySet().iterator();
+            if (iterator.hasNext()) {
+                stringBuilder.append("?");
+                Object element;
+                while (iterator.hasNext()) {
+                    element = iterator.next();
+                    Map.Entry entry = (Map.Entry) element;
+                    //过滤value为null，value为null时进行拼接字符串会变成 "null"字符串
+                    if (entry.getValue() != null) {
+                        stringBuilder.append(element).append("&");
+                    }
+                    url = stringBuilder.substring(0, stringBuilder.length() - 1);
+                }
+            }
+        } else {
+            throw new RuntimeException("url请求:" + url + "请求参数有误不是map类型");
+        }
+        return url;
+    }
+
+}