Przeglądaj źródła

优化 重构测报灯业务端逻辑为通用模式

zhaiyifei 10 miesięcy temu
rodzic
commit
898ebc6212

+ 3 - 1
src/main/java/com/yunfeiyun/agmp/iot/common/domain/reqvo/IotCbdConfigEditReqVo.java

@@ -1,11 +1,13 @@
 package com.yunfeiyun.agmp.iot.common.domain.reqvo;
 
+import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.device.config.IotCbdConfig;
 import lombok.Data;
 
 @Data
 public class IotCbdConfigEditReqVo {
-    private String cdbdataBid;
+    private IotDevice iotDevice;
+    private String devBid;
     private IotCbdConfig iotCbdConfig;
 
 }

+ 16 - 1
src/main/java/com/yunfeiyun/agmp/iot/common/service/YfCbdRecogeService.java

@@ -45,7 +45,22 @@ public class YfCbdRecogeService {
             log.error("[云飞吸虫塔手动识别服务]: 识别失败,错误信息:{}", jsonObject);
             throw new RuntimeException("识别失败,请检查图片是否正确");
         }
-        JSONObject resultData = jsonObject.getJSONObject("data");
+        JSONObject rspData = jsonObject.getJSONObject("data");
+//        {
+//            "device_id": "15f6713a39ed8a4d",
+//                "return_string": "4,1",
+//                "label": "[{'4': [5852, 1412, 6431, 1980, 0.86]}]",
+//                "create_time": "1739146312",
+//                "img": "https://web.hnyfwlw.com:58003/Basics/xct/15f6713a39ed8a4d/2025/2/10/15f6713a39ed8a4d-20250210-081122-3000.000000.jpg"}
+//
+        JSONObject resultData = new JSONObject();
+        resultData.put("device_id", "");
+        resultData.put("return_string", rspData.getString("returnString"));
+        resultData.put("label", rspData.getString("returnCode"));
+        resultData.put("create_time", "");
+        resultData.put("img", rspData.getString("returnImageUrl"));
+
+
         return XctToCbdUtil.xctToCbdData(resultData);
     }