Merge branch 'dev_lsk_fullfix' of www/taais into develop

script/sql/postgresql/data(postgresql).sql

@@ -1163,27 +1163,27 @@ COMMENT ON COLUMN "public"."object_trace_merge"."tenant_id" IS '租户编码';
 
 COMMENT ON COLUMN "public"."object_trace_merge"."del_flag" IS '逻辑删除标志（0代表存在 1代表删除）';
 
-COMMENT ON TABLE "public"."object_trace_merge" IS '多物体融合轨迹识别';
+COMMENT ON TABLE "public"."object_trace_merge" IS '多源信息融合';
 
 -- 菜单 SQL
 insert into sys_menu (menu_id, menu_name, order_num, path, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
 values(4, '多目标选择', '1', 'multiObj', 1, 0, 'M', '0', '0', 'demo:traceMerge:list', '', 1, now(), 1, null, '多目标选择');
 
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values(2024101614471100, '多物体融合轨迹识别', 4, '1', '/demo/traceMerge', 'demo/traceMerge/index', 1, 0, 'C', '0', '0', 'demo:traceMerge:list', '', 1, now(), 1, null, '多物体融合轨迹识别菜单');
+values(2024101614471100, '多源信息融合', 4, '1', '/demo/traceMerge', 'demo/traceMerge/index', 1, 0, 'C', '0', '0', 'demo:traceMerge:list', '', 1, now(), 1, null, '多源信息融合菜单');
 
 -- 按钮 SQL
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values(2024101614471101, '多物体融合轨迹识别查询', 2024101614471100, '1',  '', '', 1, 0, 'F', '0', '0', 'demo:traceMerge:query',        '', 1, now(), 1, null, '');
+values(2024101614471101, '多源信息融合查询', 2024101614471100, '1',  '', '', 1, 0, 'F', '0', '0', 'demo:traceMerge:query',        '', 1, now(), 1, null, '');
 
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values(2024101614471102, '多物体融合轨迹识别新增', 2024101614471100, '2',  '', '', 1, 0, 'F', '0', '0', 'demo:traceMerge:add',          '', 1, now(), 1, null, '');
+values(2024101614471102, '多源信息融合新增', 2024101614471100, '2',  '', '', 1, 0, 'F', '0', '0', 'demo:traceMerge:add',          '', 1, now(), 1, null, '');
 
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values(2024101614471103, '多物体融合轨迹识别修改', 2024101614471100, '3',  '', '', 1, 0, 'F', '0', '0', 'demo:traceMerge:edit',         '', 1, now(), 1, null, '');
+values(2024101614471103, '多源信息融合修改', 2024101614471100, '3',  '', '', 1, 0, 'F', '0', '0', 'demo:traceMerge:edit',         '', 1, now(), 1, null, '');
 
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values(2024101614471104, '多物体融合轨迹识别删除', 2024101614471100, '4',  '', '', 1, 0, 'F', '0', '0', 'demo:traceMerge:remove',       '', 1, now(), 1, null, '');
+values(2024101614471104, '多源信息融合删除', 2024101614471100, '4',  '', '', 1, 0, 'F', '0', '0', 'demo:traceMerge:remove',       '', 1, now(), 1, null, '');
 
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values(2024101614471105, '多物体融合轨迹识别导出', 2024101614471100, '5',  '', '', 1, 0, 'F', '0', '0', 'demo:traceMerge:export',       '', 1, now(), 1, null, '');
+values(2024101614471105, '多源信息融合导出', 2024101614471100, '5',  '', '', 1, 0, 'F', '0', '0', 'demo:traceMerge:export',       '', 1, now(), 1, null, '');

taais-modules/taais-biz/src/main/java/com/taais/biz/controller/ObjectTraceMergeController.java

@@ -12,11 +12,15 @@ import com.taais.biz.domain.bo.ObjectTraceMergeBo;
 import com.taais.biz.domain.vo.ObjectTraceMergeVo;
 import com.taais.biz.service.IObjectTraceMergeService;
 import com.taais.biz.service.impl.ObjectTraceMergeServiceImpl;
+import com.taais.common.core.config.TaaisConfig;
 import com.taais.common.core.utils.MapstructUtils;
 import com.taais.common.core.utils.uuid.UUID;
+import com.taais.system.domain.vo.SysOssVo;
+import com.taais.system.service.ISysOssService;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import com.taais.common.core.core.domain.CommonResult;
@@ -41,10 +45,14 @@ import static com.taais.biz.constant.BizConstant.*;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/demo/traceMerge")
+@Slf4j
 public class ObjectTraceMergeController extends BaseController {
     @Resource
     private ObjectTraceMergeServiceImpl objectTraceMergeService;
 
+    @Resource
+    private ISysOssService sysOssService;
+
     /**
      * 查询多物体融合轨迹识别列表
      */
@@ -87,7 +95,11 @@ public class ObjectTraceMergeController extends BaseController {
         String resultPath = DOCKER_MAT_TASK + "/" + uuid;
         objectTraceMergeBo.setResultPath(resultPath);
         objectTraceMergeBo.setStatus(TASK_STATUS_PENDING);
-        objectTraceMergeBo.setPreprocessPath(objectTraceMergeBo.getPreprocessPath().replace("/profile", DOCKER_BASE_PATH));
+
+        String modelAddress = objectTraceMergeBo.getPreprocessPath();
+        SysOssVo vo = sysOssService.getById(Long.parseLong(modelAddress));
+        objectTraceMergeBo.setPreprocessPath((TaaisConfig.getProfile() + vo.getUrl().split("/profile")[1]));
+
         boolean inserted = objectTraceMergeService.insert(objectTraceMergeBo);
         if (!inserted) {
             return CommonResult.fail("新增多物体融合轨迹识别记录失败！");
@@ -131,6 +143,8 @@ public class ObjectTraceMergeController extends BaseController {
         params.put("resultPath", vo.getResultPath());
         params.put("otherParams", new JSONObject().toString());
 
+        log.info("obj_trace params: {}", params);
+
         try {
             String res = HttpUtil.post(MULTI_OBJ_TRACE_URL, JSONUtil.toJsonStr(params));
             vo.setStatus(TASK_STATUS_PROCESSING);