农业大屏统计相关接口

fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/devlink/service/DevLinkBaseService.java

@@ -4,7 +4,7 @@ import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.fastbee.common.utils.DateUtils;
+import com.fastbee.common.exception.ServiceException;
 import com.fastbee.deviceData.domain.DeviceRealtimedataMeteorology;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -14,7 +14,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @Component
-public class DevLinkRealTimeDataService {
+public class DevLinkBaseService {
     @Autowired
     private DevLinkAuthorizationService authorizationService;
 
@@ -92,6 +92,22 @@ public class DevLinkRealTimeDataService {
         return HttpUtil.post(authorization.getBaseUrl() + authorization.getAuth(), jsonStr);
     }
 
+    /**
+     * 基本请求
+     * @return 请求结果data
+     */
+    public JSONObject baseRequest(Map<String,Object> body){
+        DevLinkAuthorizationService authorization = new DevLinkAuthorizationService();
+        String jsonStr = JSONUtil.toJsonStr(body);
+        System.err.println(authorization.getBaseUrl() + authorization.getAuth());
+        String respStr = HttpUtil.post(authorization.getBaseUrl() + authorization.getAuth(), jsonStr);
+        JSONObject resp = JSONUtil.parseObj(respStr);
+        if(!resp.get("code").toString().equals("200")){
+            throw new ServiceException(resp.get("message").toString());
+        }
+        return resp.getJSONObject("data");
+    }
+
     public BigDecimal toBigDecimalValue(String str) {
         if (str == null||"".equals(str)) {
             return null;
@@ -106,8 +122,8 @@ public class DevLinkRealTimeDataService {
     }
 
     public static void main(String[] args) {
-        DevLinkRealTimeDataService devLinkRealTimeDataService = new DevLinkRealTimeDataService();
-        Map<String, String> metDeviceRealData = devLinkRealTimeDataService.getMetDeviceRealData("3270");
+        DevLinkBaseService devLinkBaseService = new DevLinkBaseService();
+        Map<String, String> metDeviceRealData = devLinkBaseService.getMetDeviceRealData("3270");
 //        System.err.println(metDeviceRealData);
     }
 }

fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/devlink/service/DevLinkMetDataService.java

@@ -17,7 +17,7 @@ import java.util.Map;
  * devLink气象设备数据服务
  */
 @Service
-public class DevLinkMetDataService extends DevLinkRealTimeDataService {
+public class DevLinkMetDataService extends DevLinkBaseService {
 
     @Autowired
     private DevLinkAuthorizationService authorizationService;

fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/devlink/service/DevLinkMiaoQingDataService.java

@@ -3,9 +3,7 @@ package com.fastbee.deviceData.api.devlink.service;
 import com.fastbee.common.exception.ServiceException;
 import com.fastbee.common.utils.DateUtils;
 import com.fastbee.deviceData.domain.DeviceRealtimedataMiaoqing;
-import com.fastbee.deviceData.domain.DeviceRealtimedataPhotovoltaic;
 import com.fastbee.deviceData.mapper.DeviceRealtimedataMiaoqingMapper;
-import com.fastbee.deviceData.mapper.DeviceRealtimedataPhotovoltaicMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -18,7 +16,7 @@ import java.util.Map;
  * devLink苗情设备数据服务
  */
 @Service
-public class DevLinkMiaoQingDataService extends DevLinkRealTimeDataService {
+public class DevLinkMiaoQingDataService extends DevLinkBaseService {
     @Autowired
     private DevLinkAuthorizationService authorizationService;
     @Autowired

fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/devlink/service/DevLinkMoistureDataService.java

@@ -2,14 +2,11 @@ package com.fastbee.deviceData.api.devlink.service;
 
 import com.fastbee.common.exception.ServiceException;
 import com.fastbee.common.utils.DateUtils;
-import com.fastbee.deviceData.domain.DeviceRealtimedataMeteorology;
 import com.fastbee.deviceData.domain.DeviceRealtimedataMoisture;
-import com.fastbee.deviceData.mapper.DeviceRealtimedataMeteorologyMapper;
 import com.fastbee.deviceData.mapper.DeviceRealtimedataMoistureMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -19,7 +16,7 @@ import java.util.Map;
  * devLink墒情设备数据服务
  */
 @Service
-public class DevLinkMoistureDataService extends DevLinkRealTimeDataService{
+public class DevLinkMoistureDataService extends DevLinkBaseService {
     @Autowired
     private DevLinkAuthorizationService authorizationService;
     @Autowired

fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/devlink/service/DevLinkPhotovoltaicDataService.java

@@ -16,7 +16,7 @@ import java.util.Map;
  * devLink光伏设备数据服务
  */
 @Service
-public class DevLinkPhotovoltaicDataService extends DevLinkRealTimeDataService{
+public class DevLinkPhotovoltaicDataService extends DevLinkBaseService {
     @Autowired
     private DevLinkAuthorizationService authorizationService;
     @Autowired

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceServiceImpl.java

@@ -73,7 +73,7 @@ import static com.fastbee.common.utils.SecurityUtils.isAdmin;
  * 设备Service业务层处理
  *
  * @author kerwincui
- * @date 2021-12-16
+ * @date  2021-12-16
  */
 @Service
 public class DeviceServiceImpl implements IDeviceService {