weiweiw
/
Bonus-Cloud-AI-V2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
jiang 2025-01-12 15:20:37 +08:00
parent 34261acf7d 4627f131c7
commit e85e026edd
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/IntelligentAnnotationController.java
View File

@ -59,7 +59,7 @@ public class IntelligentAnnotationController extends BaseController {
List<IntelligentAnnotationServiceEntity> list = intelligentAnnotationService.getAIAnnotationServiceList(entity); List<IntelligentAnnotationServiceEntity> list = intelligentAnnotationService.getAIAnnotationServiceList(entity);
return AjaxResult.success(list); return AjaxResult.success(list);
}catch (Exception e) { }catch (Exception e) {
return AjaxResult.error("信息获取失败"); return AjaxResult.error("信息获取失败" + e.getMessage());
} }
} }
@ -74,7 +74,7 @@ public class IntelligentAnnotationController extends BaseController {
IntelligentAnnotationServiceEntity service = intelligentAnnotationService.getAIAnnotationServiceById(id); IntelligentAnnotationServiceEntity service = intelligentAnnotationService.getAIAnnotationServiceById(id);
return AjaxResult.success(service); return AjaxResult.success(service);
} catch (Exception e){ } catch (Exception e){
return AjaxResult.error("获取智能标注服务详细信息失败"); return AjaxResult.error("获取智能标注服务详细信息失败" + e.getMessage());
} }
} }
@ -91,7 +91,7 @@ public class IntelligentAnnotationController extends BaseController {
int result = intelligentAnnotationService.insertAIAnnotationService(entity); int result = intelligentAnnotationService.insertAIAnnotationService(entity);
return AjaxResult.success(result); return AjaxResult.success(result);
}catch(Exception e){ }catch(Exception e){
return AjaxResult.error("新增失败"); return AjaxResult.error("新增失败" + e.getMessage());
} }
} }
@ -108,7 +108,7 @@ public class IntelligentAnnotationController extends BaseController {
int result = intelligentAnnotationService.updateAIAnnotationService(entity); int result = intelligentAnnotationService.updateAIAnnotationService(entity);
return AjaxResult.success(result); return AjaxResult.success(result);
}catch(Exception e){ }catch(Exception e){
return AjaxResult.error("更新失败"); return AjaxResult.error("更新失败"+ e.getMessage());
} }
} }
@ -124,7 +124,7 @@ public class IntelligentAnnotationController extends BaseController {
int result = intelligentAnnotationService.deleteAIAnnotationService(ids); int result = intelligentAnnotationService.deleteAIAnnotationService(ids);
return AjaxResult.success(result); return AjaxResult.success(result);
}catch(Exception e){ }catch(Exception e){
return AjaxResult.error("删除失败"); return AjaxResult.error("删除失败"+ e.getMessage());
} }
} }
@ -150,7 +150,7 @@ public class IntelligentAnnotationController extends BaseController {
//根据以上信息进行智能标注，并将标注结果保存数据库 //根据以上信息进行智能标注，并将标注结果保存数据库
return intelligentAnnotationService.aiAnnotate(taskInfo, fileList, service); return intelligentAnnotationService.aiAnnotate(taskInfo, fileList, service);
}catch (Exception e){ }catch (Exception e){
return AjaxResult.error(); return AjaxResult.error(e.getMessage());
} }
} }

8
bonus-modules/bonus-ai/src/main/resources/bootstrap.yml
View File

@ -21,13 +21,13 @@ spring:
password: nacos password: nacos
discovery: discovery:
# 服务注册地址 # 服务注册地址
server-addr: 127.0.0.1:8848 server-addr: 192.168.0.14:8848
namespace: db93cb6f-e0b3-4f24-a5fc-72f5562f5676 namespace: f648524d-0a7b-449e-8f92-64e05236fd51
config: config:
# 配置中心地址 # 配置中心地址
server-addr: 127.0.0.1:8848 server-addr: 192.168.0.14:8848
namespace: db93cb6f-e0b3-4f24-a5fc-72f5562f5676 namespace: f648524d-0a7b-449e-8f92-64e05236fd51
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml

2
bonus-modules/bonus-ai/src/main/resources/mapper/IntelligentAnnotationMapper.xml
View File

@ -48,7 +48,7 @@
<trim prefix="VALUES (" suffix=")" suffixOverrides=","> <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
<if test="serviceName != null and serviceName != ''">#{serviceName},</if> <if test="serviceName != null and serviceName != ''">#{serviceName},</if>
<if test="serviceUrl != null and serviceUrl != ''">#{serviceUrl},</if> <if test="serviceUrl != null and serviceUrl != ''">#{serviceUrl},</if>
<if test="confLevel != null">#{conf_level},</if> <if test="confLevel != null">#{confLevel},</if>
<if test="delFlag != null">#{delFlag},</if> <if test="delFlag != null">#{delFlag},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>

2
sql/bonus_ai.sql
View File

@ -250,7 +250,7 @@ create table ai_intelligent_annotation_service
update_time datetime default CURRENT_TIMESTAMP on UPDATE CURRENT_TIMESTAMP comment '更新时间', update_time datetime default CURRENT_TIMESTAMP on UPDATE CURRENT_TIMESTAMP comment '更新时间',
create_time datetime default CURRENT_TIMESTAMP comment '创建时间', create_time datetime default CURRENT_TIMESTAMP comment '创建时间',
primary key(intelligent_annotation_service_id) primary key(intelligent_annotation_service_id)
)engine=innodb comment = '智能标注服务’; )engine=innodb comment = '智能标注服务';
INSERT INTO ai_intelligent_annotation_service ( INSERT INTO ai_intelligent_annotation_service (
intelligent_annotation_service_name, intelligent_annotation_service_name,