全局格式化

src/main/java/com/ebei/screen/common/task/EbaTask.java

@@ -21,6 +21,5 @@ public class EbaTask {
 
     @Scheduled(cron = "*/5 * * * * ?")
     public void execute() {
-        ebaSystemService.getProjectList();
     }
 }

src/main/java/com/ebei/screen/common/util/EbaUtils.java

@@ -1,11 +1,16 @@
 package com.ebei.screen.common.util;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSON;
 import com.ebei.screen.common.constants.EbaSystemConstants;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -21,6 +26,13 @@ public class EbaUtils {
 
     private static Integer SUCCESS_CODE = 200;
 
+    private static MongoTemplate mongoTemplate;
+
+    @Autowired
+    public void setMongoTemplate(MongoTemplate mongoTemplate) {
+        EbaUtils.mongoTemplate = mongoTemplate;
+    }
+
     /**
      * 判断执行结果是否成功
      *
@@ -37,13 +49,21 @@ public class EbaUtils {
      * @return
      */
     public static String getTokenInfo() {
+        Map tokenMap = mongoTemplate.findById("ebatoken", Map.class, "ebaAuth");
+        if (tokenMap != null) {
+            String token = (String) tokenMap.get("token");
+        }
         String param = JSON.toJSONString(Levi.by("clientId", EbaSystemConstants.cliendId).set("clientSecret", EbaSystemConstants.clientSecret));
         String result = HttpRequest.post(EbaSystemConstants.getTokenInfo)
                 .header("content-type", "application/json")
                 .body(param)
                 .execute().body();
-        log.info("######### 01、获取token:{} 参数:{}", result, param);
-        return LeviUtils.getJsonFieldOne(result, "data.token", String.class);
+        if (isSuccess(result)) {
+            String token = LeviUtils.getJsonFieldOne(result, "data.token", String.class);
+            mongoTemplate.insert(Levi.by("_id", "ebatoken").set("token", token).set("expire", LocalDateTime.now()), "ebaAuth");
+            return token;
+        }
+        return null;
     }
 
     /**
@@ -51,12 +71,15 @@ public class EbaUtils {
      *
      * @return
      */
-    public static List<Map> getProjectList() {
+    public static void getProjectList() {
         String result = HttpRequest.post(EbaSystemConstants.getProjectList)
                 .header("token", getTokenInfo())
                 .execute().body();
-        log.info("######### 02、获取当前用户名下项目列表:{}", result);
-        return LeviUtils.getJsonFieldMany(result, "data.projectList", Map.class);
+        if (isSuccess(result)) {
+            List<Map> list = LeviUtils.getJsonFieldMany(result, "data.projectList", Map.class);
+            mongoTemplate.dropCollection("eba-projectList");
+            mongoTemplate.insert(list, "eba-projectList");
+        }
     }
 
     /**
@@ -64,14 +87,24 @@ public class EbaUtils {
      *
      * @return
      */
-    public static List<Map> getMobjectList(Long projectId) {
-        String param = JSON.toJSONString(Levi.by("projectId", projectId));
-        String result = HttpRequest.post(EbaSystemConstants.getMobjectList)
-                .header("token", getTokenInfo())
-                .body(param)
-                .execute().body();
-        log.info("######### 03、根据项目id获取所有device信息:{} 参数:{}", result, param);
-        return LeviUtils.getJsonFieldMany(result, "data.mObjectList", Map.class);
+    public static void getMobjectList() {
+        List<Levi> projectList = mongoTemplate.findAll(Levi.class, "eba-projectList");
+        List<Levi<Integer, List>> result = new ArrayList<>();
+        if (CollUtil.isNotEmpty(projectList)) {
+            projectList.forEach(x -> {
+                Integer projectId = (Integer) x.get("projectId");
+                String param = JSON.toJSONString(Levi.by("projectId", projectId));
+                String str = HttpRequest.post(EbaSystemConstants.getMobjectList)
+                        .header("token", getTokenInfo())
+                        .body(param)
+                        .execute().body();
+                if (isSuccess(str)) {
+                    result.add(Levi.by(projectId, LeviUtils.getJsonFieldMany(str, "data.mObjectList", Map.class)));
+                }
+            });
+            mongoTemplate.dropCollection("eba-projectMobjectList");
+            mongoTemplate.insertAll(result);
+        }
     }
 
     /**
@@ -274,5 +307,4 @@ public class EbaUtils {
         log.info("######### 16、根据项目id获取iot实时告警列表:{} 参数:{}", result, param);
         return LeviUtils.getJsonFieldMany(result, "data.datas", Map.class);
     }
-
 }

src/main/java/com/ebei/screen/common/util/EnergyUtils.java

@@ -39,7 +39,7 @@ public class EnergyUtils {
      *
      * @return
      */
-    public static String coreConnectToken() {
+    public static String getToken() {
         String param = JSON.toJSONString(Levi.by("clientId", EbaSystemConstants.cliendId).set("clientSecret", EbaSystemConstants.clientSecret));
         String result = HttpRequest.post(EnergyPlatformConstants.coreConnectToken)
                 .header("content-type", "application/x-www-form-urlencoded")
@@ -55,6 +55,15 @@ public class EnergyUtils {
         return obj.getString("token_type") + " " + obj.getString("access_token");
     }
 
+    /**
+     * 重新登录接口
+     *
+     * @return
+     */
+    public static String refreshToken() {
+        return null;
+    }
+
     /**
      * 2、获取当前用户名下盒子列表
      *
@@ -62,7 +71,7 @@ public class EnergyUtils {
      */
     public static List<Map> apiClientBoxGrouped() {
         String result = HttpRequest.get(EnergyPlatformConstants.apiClientBoxGrouped)
-                .header("Authorization", coreConnectToken())
+                .header("Authorization", getToken())
                 .execute().body();
         log.info("######### 2、获取当前用户名下盒子列表:{}", result);
         return LeviUtils.getJsonFieldMany(result, null, Map.class);
@@ -76,7 +85,7 @@ public class EnergyUtils {
      */
     public static Map apiClientBoxRegBoxNo(String boxNo) {
         String result = HttpRequest.get(getUrl(EnergyPlatformConstants.apiClientBoxRegBoxNo, boxNo))
-                .header("Authorization", coreConnectToken())
+                .header("Authorization", getToken())
                 .execute().body();
         log.info("######### 3、根据boxNo获取单个盒子:{}", result);
         return LeviUtils.getJsonFieldOne(result, null, Map.class);
@@ -90,7 +99,7 @@ public class EnergyUtils {
      */
     public static List<Map> v2BoxDmonGroups(String boxId) {
         String result = HttpRequest.get(getUrl(EnergyPlatformConstants.v2BoxDmonGroups, boxId))
-                .header("Authorization", coreConnectToken())
+                .header("Authorization", getToken())
                 .execute().body();
         log.info("######### 4、根据boxId获取监控点分组:{}", result);
         return LeviUtils.getJsonFieldMany(result, null, Map.class);
@@ -104,7 +113,7 @@ public class EnergyUtils {
      */
     public static List<Map> V2BoxDmonGroupsBoxNo(String boxNo) {
         String result = HttpRequest.get(getUrl(EnergyPlatformConstants.V2BoxDmonGroupsBoxNo, boxNo))
-                .header("Authorization", coreConnectToken())
+                .header("Authorization", getToken())
                 .execute().body();
         log.info("######### 5、根据boxNo获取监控点分组:{}", result);
         return LeviUtils.getJsonFieldMany(result, null, Map.class);
@@ -119,7 +128,7 @@ public class EnergyUtils {
      */
     public static List<Map> v2BoxDmonGroupDmon(String boxId, String groupId) {
         String result = HttpRequest.get(getUrl(EnergyPlatformConstants.v2BoxDmonGroupDmon, boxId, groupId))
-                .header("Authorization", coreConnectToken())
+                .header("Authorization", getToken())
                 .execute().body();
         log.info("######### 6、根据boxId和分组id获取监控点:{}", result);
         return LeviUtils.getJsonFieldMany(result, null, Map.class);
@@ -135,7 +144,7 @@ public class EnergyUtils {
     public static List<Map> v2BoxDmonGet(String boxId, String id) {
         String param = JSON.toJSONString(Arrays.asList(id));
         String result = HttpRequest.post(getUrl(EnergyPlatformConstants.v2BoxDmonGet, boxId))
-                .header("Authorization", coreConnectToken())
+                .header("Authorization", getToken())
                 .header("content-type", "application/json")
                 .body(param)
                 .execute().body();
@@ -153,7 +162,7 @@ public class EnergyUtils {
     public static List<Map> v2BoxDmonGetBoxNo(String boxNo, String id) {
         String param = JSON.toJSONString(Arrays.asList(id));
         String result = HttpRequest.post(getUrl(EnergyPlatformConstants.v2BoxDmonGetBoxNo, boxNo))
-                .header("Authorization", coreConnectToken())
+                .header("Authorization", getToken())
                 .header("content-type", "application/json")
                 .body(param)
                 .execute().body();

src/main/java/com/ebei/screen/controller/eba/EbaSystemController.java

@@ -1,18 +1,13 @@
 package com.ebei.screen.controller.eba;
 
-import com.ebei.screen.common.response.ResponseBean;
-import com.ebei.screen.common.response.ResponseBuilder;
-import com.ebei.screen.modules.po.Test;
+import com.ebei.screen.common.util.EbaUtils;
 import com.ebei.screen.service.EbaSystemService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 /**
  * @author Liu.x
  * @description EBA系统大屏
@@ -25,17 +20,10 @@ public class EbaSystemController {
     @Autowired
     private EbaSystemService ebaSystemService;
 
-    @ApiOperation("测试")
-    @PostMapping("/test")
-    public ResponseBean<List<Test>> test() {
-        return ebaSystemService.test();
-    }
-
-    @ApiOperation("冀朝明的测试")
-    @PostMapping("/testJCM")
-    public ResponseBean<String> testJCM() {
-        ebaSystemService.getProjectList();
-        return ResponseBuilder.ok("可以的");
+    @PostMapping("test")
+    public String test() {
+        EbaUtils.getMobjectList();
+        return "success";
     }
 
 }

src/main/java/com/ebei/screen/service/EbaSystemService.java

@@ -1,8 +1,5 @@
 package com.ebei.screen.service;
 
-import com.ebei.screen.common.response.ResponseBean;
-import com.ebei.screen.modules.po.Test;
-
 import java.util.List;
 import java.util.Map;
 
@@ -14,13 +11,6 @@ import java.util.Map;
  */
 public interface EbaSystemService {
 
-    ResponseBean<List<Test>> test();
-
-    /**
-     * 获取项目列表
-     */
-    void getProjectList();
-
     /**
      * 根据项目id获取所有device信息
      */

src/main/java/com/ebei/screen/service/impl/EbaSystemServiceImpl.java

@@ -1,9 +1,6 @@
 package com.ebei.screen.service.impl;
 
-import com.ebei.screen.common.response.ResponseBean;
-import com.ebei.screen.common.response.ResponseBuilder;
 import com.ebei.screen.common.util.EbaUtils;
-import com.ebei.screen.modules.po.Test;
 import com.ebei.screen.service.EbaSystemService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,27 +25,11 @@ public class EbaSystemServiceImpl implements EbaSystemService {
     @Autowired
     private MongoTemplate mongoTemplate;
 
-    @Override
-    public ResponseBean<List<Test>> test() {
-        List<Test> all = mongoTemplate.findAll(Test.class);
-        return ResponseBuilder.ok(all);
-    }
-
-    /**
-     * 获取项目列表
-     */
-    @Override
-    public void getProjectList() {
-        List<Map> projectList = EbaUtils.getProjectList();
-        mongoTemplate.dropCollection("projectList");
-        mongoTemplate.insert(projectList, "projectList");
-    }
-
     @Override
     public void getMobjectList(Long projectId) {
-        List<Map> mobjectList = EbaUtils.getMobjectList(projectId);
+//        List<Map> mobjectList = EbaUtils.getMobjectList(projectId);
         mongoTemplate.dropCollection("mobjectList");
-        mongoTemplate.insert(mobjectList, "mobjectList");
+        mongoTemplate.insert("mobjectList", "mobjectList");
     }
 
     @Override