From 453a6f886bc9bb289759e598135be610c665c8aa Mon Sep 17 00:00:00 2001
From: haungxing <1203316822@qq.com>
Date: Thu, 5 Sep 2024 16:49:20 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E5=B7=A1=E6=A3=80=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hnac/hzinfo/inspect/ai/feign/ImageAnalysisClient.java     | 3 ++-
 .../src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.java  | 2 +-
 .../src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/feign/ImageAnalysisClient.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/feign/ImageAnalysisClient.java
index 816853d..d65648e 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/feign/ImageAnalysisClient.java
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/feign/ImageAnalysisClient.java
@@ -4,6 +4,7 @@ import com.hnac.hzinfo.inspect.ai.service.IZhiPuBigModelService;
 import com.hnac.hzinfo.inspect.ai.vo.ZhiPuImageAnalysisDTO;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -21,7 +22,7 @@ public class ImageAnalysisClient implements IImageAnalysisClient {
 
     @Override
     @PostMapping(ANALYSIS_BY_STATION_ID)
-    public List<ZhiPuImageAnalysisDTO> analysisByStationId(Long stationId) {
+    public List<ZhiPuImageAnalysisDTO> analysisByStationId(@RequestBody Long stationId) {
         return zhiPuBigModelService.analysisImgByStationId(stationId);
     }
 }
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.java
index ebfa615..29280c2 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.java
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.java
@@ -129,5 +129,5 @@ public interface TaskMapper extends UserDataScopeBaseMapper<TaskEntity> {
 
 	List<TaskEntity> getSameDayTask(@Param("taskIds") List<Long> taskIds, @Param("status") String status,@Param("startDate") String startDate,@Param("endDate") String endDate);
 
-	List<TaskEntity> getListByUserIdAndStatus(Long userId, String autoVideo, List<String> taskStatus,String time);
+	List<TaskEntity> getListByUserIdAndStatus(@Param("userId") Long userId, @Param("autoVideo") String autoVideo, @Param("taskStatus") List<String> taskStatus, @Param("time") String time);
 }
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml
index 3bc04c3..84ecf4e 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml
@@ -238,7 +238,7 @@
         <include refid="getTaskListSql"></include>
         order by t.UPDATE_TIME desc
     </select>
-、
+
     <select id="getFinishTaskList" parameterType="com.hnac.hzinfo.inspect.task.vo.TaskListQuery" resultType="com.hnac.hzinfo.inspect.task.vo.TaskVo">
         SELECT t.* from HZ_ST_EX_TASK t
         LEFT JOIN HZ_ST_EX_TASK_USER u on t.ID=u.TASK_ID

From fbe40b20b44cc673fa405207e8173f27d25ab07a Mon Sep 17 00:00:00 2001
From: luyie <yangpujun@163.com>
Date: Thu, 5 Sep 2024 17:32:02 +0800
Subject: [PATCH 2/4] =?UTF-8?q?add:=E8=8E=B7=E5=8F=96=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=EF=BC=8Cfeign=E4=BF=AE=E6=94=B9=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hnac/hzinfo/inspect/ai/feign/IImageAnalysisClient.java   | 3 ++-
 .../java/com/hnac/hzinfo/inspect/ai/feign/ImageAnalysisClient.java    | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/feign/IImageAnalysisClient.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/feign/IImageAnalysisClient.java
index 8be314b..25a14ad 100644
--- a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/feign/IImageAnalysisClient.java
+++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/feign/IImageAnalysisClient.java
@@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author: ypj
@@ -18,5 +19,5 @@ public interface IImageAnalysisClient {
     String ANALYSIS_BY_STATION_ID = "/analysisByStationId";
 
     @PostMapping(API_PREFIX + ANALYSIS_BY_STATION_ID)
-    List<ZhiPuImageAnalysisDTO> analysisByStationId(@RequestBody Long stationId);
+    List<ZhiPuImageAnalysisDTO> analysisByStationId(@RequestBody Map<String, Long> stationIdMap);
 }
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/feign/ImageAnalysisClient.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/feign/ImageAnalysisClient.java
index d65648e..d522db5 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/feign/ImageAnalysisClient.java
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/feign/ImageAnalysisClient.java
@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author: ypj
@@ -22,7 +23,8 @@ public class ImageAnalysisClient implements IImageAnalysisClient {
 
     @Override
     @PostMapping(ANALYSIS_BY_STATION_ID)
-    public List<ZhiPuImageAnalysisDTO> analysisByStationId(@RequestBody Long stationId) {
+    public List<ZhiPuImageAnalysisDTO> analysisByStationId(@RequestBody Map<String, Long> stationIdMap) {
+        Long stationId = Long.valueOf(stationIdMap.get("stationId").toString());
         return zhiPuBigModelService.analysisImgByStationId(stationId);
     }
 }

From ae8fd586a2c396e9a3bbd9d34edf25ecf575c6aa Mon Sep 17 00:00:00 2001
From: haungxing <1203316822@qq.com>
Date: Fri, 6 Sep 2024 09:15:45 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E8=A7=86=E9=A2=91=E5=B7=A1=E6=A3=80?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspect/ai/feign/IImageAnalysisClient.java     |  3 ++-
 .../bigmodel/database/service/WeaviateService.java | 13 ++++++----
 .../interactive/constants/FunctionConstants.java   |  4 +++-
 .../interactive/constants/ParamKeyConstants.java   |  4 ++++
 .../impl/ControlAnswerResolveServiceImpl.java      | 28 ++++++++++++++++++++--
 .../inspect/ai/feign/ImageAnalysisClient.java      |  5 ++--
 .../inspect/ai/service/IZhiPuBigModelService.java  |  2 +-
 .../ai/service/impl/ZhiPuBigModelServiceImpl.java  |  4 ++--
 8 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/feign/IImageAnalysisClient.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/feign/IImageAnalysisClient.java
index 8be314b..a3836a8 100644
--- a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/feign/IImageAnalysisClient.java
+++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/feign/IImageAnalysisClient.java
@@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author: ypj
@@ -18,5 +19,5 @@ public interface IImageAnalysisClient {
     String ANALYSIS_BY_STATION_ID = "/analysisByStationId";
 
     @PostMapping(API_PREFIX + ANALYSIS_BY_STATION_ID)
-    List<ZhiPuImageAnalysisDTO> analysisByStationId(@RequestBody Long stationId);
+    List<ZhiPuImageAnalysisDTO> analysisByStationId(@RequestBody Map<String,String> request);
 }
diff --git a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/database/service/WeaviateService.java b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/database/service/WeaviateService.java
index 5b0f00e..7197ea9 100644
--- a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/database/service/WeaviateService.java
+++ b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/database/service/WeaviateService.java
@@ -90,19 +90,24 @@ public class WeaviateService {
             List<Map<String, Float[]>> vector = this.splitVector(entities.size(), attrsMap, vectors);
             for(int i = 0; i < entities.size(); i++) {
                 // log.info("vector:{}",JSON.toJSONString(vector.get(i)));
-                JSONObject object = JSONObject.parseObject(JSON.toJSONString(entities.get(i)));
-                Map<String,Object> properties = new HashMap<>();
-                object.forEach((k,v) -> properties.put(k,v));
+                Map<String, Object> properties = this.objectToMap(entities.get(i));
                 log.info("properties:{}",JSON.toJSONString(properties));
                 creator.withProperties(properties).withVectors(vector.get(i)).run();
             }
         } else {
-            entities.forEach(entity -> creator.withProperties(BeanUtil.toMap(entity)).run());
+            entities.forEach(entity -> creator.withProperties(this.objectToMap(entity)).run());
             return true;
         }
         return false;
     }
 
+    private Map<String,Object> objectToMap(Object object) {
+        JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(object));
+        Map<String,Object> properties = new HashMap<>();
+        jsonObject.forEach((k,v) -> properties.put(k,v));
+        return properties;
+    }
+
     /**
      * 删除向量数据库（表名）
      * @param className 表名
diff --git a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/constants/FunctionConstants.java b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/constants/FunctionConstants.java
index 4005c37..097d57e 100644
--- a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/constants/FunctionConstants.java
+++ b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/constants/FunctionConstants.java
@@ -24,7 +24,9 @@ public interface FunctionConstants {
         CHOOSE("4"),
         /**确认**/
         CONFIRM("5"),
-        CHART("6");
+        CHART("6"),
+        IMAGE_TEXT("7")
+        ;
         ;
         @Getter
         private String type;
diff --git a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/constants/ParamKeyConstants.java b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/constants/ParamKeyConstants.java
index cb7b02a..5032198 100644
--- a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/constants/ParamKeyConstants.java
+++ b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/constants/ParamKeyConstants.java
@@ -15,5 +15,9 @@ public interface ParamKeyConstants {
     String CANVAS_V4_PATH = "hzims:bigModel:canvas:v4:path";
     /**实时画面云组态路径 hzinfo-data-scada/view/{projectId}/{id}?source=app**/
     String CANVAS_YZT_PATH = "hzims:bigModel:canvas:yzt:path";
+    /**视频巡检指令编号**/
+    String VIDEO_INSPECTION_CODE = "gglm:bigModel:video:inspection:code";
+    /**视频巡检识别url**/
+    String VIDEO_INSPECTION_URL = "gglm:bigModel:video:inspection:url";
 
 }
diff --git a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/ControlAnswerResolveServiceImpl.java b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/ControlAnswerResolveServiceImpl.java
index 8037e44..2159025 100644
--- a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/ControlAnswerResolveServiceImpl.java
+++ b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/ControlAnswerResolveServiceImpl.java
@@ -1,13 +1,20 @@
 package com.hnac.hzims.bigmodel.interactive.service.impl;
 
+import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.hnac.hzims.bigmodel.interactive.constants.FunctionConstants;
 import com.hnac.hzims.bigmodel.interactive.factory.AnswerResolveFactory;
 import com.hnac.hzims.bigmodel.interactive.service.IAnswerResolveService;
 import com.hnac.hzims.bigmodel.interactive.vo.AnswerVO;
 import com.hnac.hzims.bigmodel.interactive.vo.ExtraVO;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.system.cache.ParamCache;
 import org.springframework.stereotype.Service;
+import com.hnac.hzims.bigmodel.interactive.constants.ParamKeyConstants;
+
+import java.util.HashMap;
 
 /**
  * @Author: huangxing
@@ -26,7 +33,24 @@ public class ControlAnswerResolveServiceImpl implements IAnswerResolveService {
 
     @Override
     public ExtraVO getExtra(JSONObject originExtra) {
-        log.info("控制指令传参为：{}", JSON.toJSONString(originExtra));
-        return null;
+        // 若extra中 itemId 为 spxj 则为视频巡检需特殊处理
+        JSONObject params = originExtra.getJSONObject("params");
+        if(Func.isNotEmpty(params) && Func.isNotEmpty(params.getString("itemId"))) {
+            String itemId = ParamCache.getValue(ParamKeyConstants.VIDEO_INSPECTION_CODE);
+            String url = ParamCache.getValue(ParamKeyConstants.VIDEO_INSPECTION_URL);
+            if(Func.isNotEmpty(itemId) && Func.isNotEmpty(url)
+                    && itemId.equals(params.getString("itemId")) && Func.isNotEmpty(params.getString("stationId"))) {
+                log.info("控制指令传参为：{}", JSON.toJSONString(originExtra));
+                String stationId = params.getString("stationId");
+                HashMap<String, String> param = new HashMap<>(1);
+                param.put("stationId",stationId);
+                String body = HttpRequest.post(url).body(JSON.toJSONString(param)).execute().body();
+                params.put("data",body);
+                log.info("识别结果为：{}", body);
+            }
+        }
+        ExtraVO result = originExtra.toJavaObject(ExtraVO.class);
+        result.setType(FunctionConstants.TypeEnum.IMAGE_TEXT.getType());
+        return result;
     }
 }
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/feign/ImageAnalysisClient.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/feign/ImageAnalysisClient.java
index d65648e..83eb8d7 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/feign/ImageAnalysisClient.java
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/feign/ImageAnalysisClient.java
@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author: ypj
@@ -22,7 +23,7 @@ public class ImageAnalysisClient implements IImageAnalysisClient {
 
     @Override
     @PostMapping(ANALYSIS_BY_STATION_ID)
-    public List<ZhiPuImageAnalysisDTO> analysisByStationId(@RequestBody Long stationId) {
-        return zhiPuBigModelService.analysisImgByStationId(stationId);
+    public List<ZhiPuImageAnalysisDTO> analysisByStationId(@RequestBody Map<String,String> request) {
+        return zhiPuBigModelService.analysisImgByStationId(request.get("stationId"));
     }
 }
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IZhiPuBigModelService.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IZhiPuBigModelService.java
index 14b0801..f4b8125 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IZhiPuBigModelService.java
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/IZhiPuBigModelService.java
@@ -9,7 +9,7 @@ import java.util.List;
  * @Date: 2024/8/29 13:58
  */
 public interface IZhiPuBigModelService {
-    List<ZhiPuImageAnalysisDTO> analysisImgByStationId(Long stationId);
+    List<ZhiPuImageAnalysisDTO> analysisImgByStationId(String stationId);
 
     List<String> getZhiPuAnalysisType(String[] originalCode);
 }
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/ZhiPuBigModelServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/ZhiPuBigModelServiceImpl.java
index 37bb18f..d62d84c 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/ZhiPuBigModelServiceImpl.java
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/ZhiPuBigModelServiceImpl.java
@@ -45,9 +45,9 @@ public class ZhiPuBigModelServiceImpl implements IZhiPuBigModelService {
     private static final String CAMERA_TYPE_SPLIT = "\\^";
 
     @Override
-    public List<ZhiPuImageAnalysisDTO> analysisImgByStationId(Long stationId) {
+    public List<ZhiPuImageAnalysisDTO> analysisImgByStationId(String stationId) {
         List<ZhiPuImageAnalysisDTO> result = new ArrayList<>();
-        List<StationVideoTypeEntity> videoList = stationVideoTypeClient.listByStationId(stationId.toString());
+        List<StationVideoTypeEntity> videoList = stationVideoTypeClient.listByStationId(stationId);
         if (CollectionUtil.isEmpty(videoList)) {
             return result;
         }

From d3149796be717311e6c6482be78297a8d76fecaf Mon Sep 17 00:00:00 2001
From: haungxing <1203316822@qq.com>
Date: Fri, 6 Sep 2024 10:17:29 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E5=90=91=E9=87=8F=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E5=8F=96=E5=80=BC=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzims/bigmodel/database/service/WeaviateService.java     | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/database/service/WeaviateService.java b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/database/service/WeaviateService.java
index 7197ea9..cc43acf 100644
--- a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/database/service/WeaviateService.java
+++ b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/database/service/WeaviateService.java
@@ -209,16 +209,8 @@ public class WeaviateService {
 
 
     private String getFieldValue(String fields,Object object) {
-        Class clazz = object.getClass();
-        return Func.toStrList(",", fields).stream().map(field -> {
-            try {
-                Field declaredField = clazz.getDeclaredField(field);
-                declaredField.setAccessible(true);
-                return declaredField.get(object).toString();
-            } catch (NoSuchFieldException | IllegalAccessException e) {
-                return null;
-            }
-        }).collect(Collectors.joining(" "));
+        JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(object));
+        return Func.toStrList(",", fields).stream().map(field -> jsonObject.getString(field)).collect(Collectors.joining(" "));
     }
 
     /**