[初始化] wuLink对接

backend/inz.common/src/main/java/com/beecode/inz/common/util/IotPlatformUtils.java

@@ -76,14 +76,19 @@ public class IotPlatformUtils {
         if(StringUtils.isEmpty(imeis)){
             return null;
         }
-        String token = "";
-        HashMap<String, Object> tokenMap = getAuthToken(CLIET_ID, CLIENT_SECRET);
-        if ((int) tokenMap.get("status") == -1 || (int) tokenMap.get("status") == -2) {
-            token =  tokenMap.get("data").toString();
+
+        String token = null;
+        try {
+            token = RedisUtils.getInstance().get(getGpsWuLingTokenRedisKey(CLIET_ID, CLIENT_SECRET));
+        } catch (Exception e) {
+            e.printStackTrace();
         }
 
         if(token==null || "".equals(token)){
-            return null;
+            HashMap<String, Object> tokenMap = getAuthToken(CLIET_ID, CLIENT_SECRET);
+            if ((int) tokenMap.get("status") == 0) {
+                token =  tokenMap.get("data").toString();
+            }
         }
         List<Map<String,Object>> imeisInfos = new ArrayList<>();
         List<String> imeisInfoKey = new ArrayList<>();
@@ -104,7 +109,7 @@ public class IotPlatformUtils {
         int findCode = findStr.getInt("code");
         String id = "";
         if (20000==(findCode)) {
-            id = findStr.getJSONObject("data").toString();
+            id = findStr.get("data").toString();
         }
         if("".equals(id)){
             return null;

backend/xyst.dinas.camera/src/main/java/com/xyst/dinas/camera/web/IotPlatformController.java

-package com.xyst.dinas.camera.web;
-
-
-import com.beecode.inz.basis.team.pojo.ResponseObj;
-import com.beecode.inz.common.util.IotPlatformUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashMap;
-
-/**
- * Description:对接IOT平台controller
- * @param
- * @author yanHeng
- * @version 1.0
- * @date: 2021/7/15 9:37
- */
-@RestController
-@RequestMapping("/iotplatform")
-public class IotPlatformController {
-
-
-    //获取token必填参数 如下三个
-    private static final String GRANT_TYPE = "client_credentials";
-    private static final String CLIET_ID = "jt808";
-    private static final String CLIENT_SECRET = "f04dd1e4";
-
-    @Autowired
-    private IotPlatformUtils iotPlatformUtils;
-
-    /**Description:从IOT平台获取access_token
-     * @Author yanHeng
-     * @Date  2022/4/24 18:25
-     * @Param []
-     * @return com.beecode.inz.basis.team.pojo.ResponseObj
-     **/
-    @GetMapping("/getAccessToken")
-    public ResponseObj getAccessToken() throws Exception{
-
-        HashMap<String, Object> tokenMap = IotPlatformUtils.getAuthToken(CLIET_ID, CLIENT_SECRET);
-        if ((int) tokenMap.get("status") == -1 || (int) tokenMap.get("status") == -2) {
-            return ResponseObj.success("获取失败",tokenMap.get("message").toString());
-        } else {
-            String token = tokenMap.get("data").toString();
-            return ResponseObj.success("获取成功",token);
-        }
-    }
-
-}

backend/xyst.dinas.camera/src/main/java/com/xyst/dinas/camera/web/WatershedCameraPlayController.java

@@ -3,16 +3,22 @@ package com.xyst.dinas.camera.web;
 
 import com.beecode.bcp.type.KObject;
 import com.beecode.inz.basis.team.pojo.ResponseObj;
+import com.beecode.inz.common.util.IotPlatformUtils;
 import com.xyst.dinas.biz.service.SandMiningAreaService;
 import com.xyst.dinas.biz.service.ShipInfoService;
 import com.xyst.dinas.camera.entity.RegionalCompanyWatershedCameraTree;
 import com.xyst.dinas.camera.service.CameraInfoService;
 import com.xyst.dinas.production.service.SandMiningService;
-import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 /**
  * @author scol
@@ -32,6 +38,12 @@ public class WatershedCameraPlayController {
     @Autowired
     private SandMiningService sandMiningService;
 
+    //获取token必填参数 如下三个
+    private static final String GRANT_TYPE = "client_credentials";
+    private static final String CLIET_ID = "jt808";
+    private static final String CLIENT_SECRET = "f04dd1e4";
+
+
     /**
      * 获取摄像头树列表
      * @param uuidList
@@ -77,5 +89,23 @@ public class WatershedCameraPlayController {
     }
 
 
+    /**Description:从IOT平台获取access_token
+     * @Author yanHeng
+     * @Date  2022/4/24 18:25
+     * @Param []
+     * @return com.beecode.inz.basis.team.pojo.ResponseObj
+     **/
+    @GetMapping("/getAccessToken")
+    public ResponseObj getAccessToken() throws Exception{
+
+        HashMap<String, Object> tokenMap = IotPlatformUtils.getAuthToken(CLIET_ID, CLIENT_SECRET);
+        if ((int) tokenMap.get("status") == -1 || (int) tokenMap.get("status") == -2) {
+            return ResponseObj.success("获取失败",tokenMap.get("message").toString());
+        } else {
+            String token = tokenMap.get("data").toString();
+            return ResponseObj.success("获取成功",token);
+        }
+    }
+
 
 }

backend/xyst.dinas.camera/src/main/java/com/xyst/dinas/camera/websocket/WsClient.java

@@ -2,7 +2,7 @@ package com.xyst.dinas.camera.websocket;
 
 
 import com.beecode.amino.core.Amino;
-import com.xyst.dinas.camera.web.IotPlatformController;
+import com.xyst.dinas.camera.web.WatershedCameraPlayController;
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.handshake.ServerHandshake;
 import org.slf4j.Logger;
@@ -33,7 +33,7 @@ public class WsClient extends WebSocketClient {
 
     static {
         try {
-            IotPlatformController iotPlatformController = Amino.getApplicationContext().getBean(IotPlatformController.class);
+            WatershedCameraPlayController iotPlatformController = Amino.getApplicationContext().getBean(WatershedCameraPlayController.class);
             String accessToken = (String) iotPlatformController.getAccessToken().getData();
 
 //            EquipmentController equipmentController = Amino.getApplicationContext().getBean(EquipmentController.class);