 yang_shj
|
c3ae73fb4c
|
Merge remote-tracking branch 'origin/master' into prod-5.1.3
# Conflicts:
# hzims-service-api/big-model-api/src/main/java/com/hnac/hzims/bigmodel/api/feign/IVideoSyncClient.java
# hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/feign/IStationClient.java
# hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/feign/IStationVideoTypeClient.java
# hzims-service-api/middle-api/src/main/java/com/hnac/hzims/middle/process/constant/TicketProcessConstant.java
# hzims-service-api/pom.xml
# hzims-service/hzims-alarm/pom.xml
# hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/service/impl/AlarmSaveServiceImpl.java
# hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/ShowAlarmController.java
# hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmService.java
# hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/HzimsBigModelApplication.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/business/service/HistoryDataService.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/factory/AnswerResolveFactory.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/factory/ResolveFactory.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/CanvasResolveServiceImpl.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/HznlmInvokeServiceImpl.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/VideoResolveServiceImpl.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/maintenance/entity/DatasourceEntity.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/schedule/FrontEndInteractiveSchedule.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/utils/RequestClientUtil.java
# hzims-service/hzims-big-model/src/main/resources/db/2.0.0.sql
# hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java
# hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotServiceImpl.java
# hzims-service/message/pom.xml
# hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java
# hzims-service/message/src/main/java/com/hnac/hzims/message/service/IMessageService.java
# hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/MailMessageServiceImpl.java
# hzims-service/message/src/main/java/com/hnac/hzims/message/service/impl/SmsMessageServiceImpl.java
# hzims-service/message/src/main/java/com/hnac/hzims/message/web/MsgWsRecordHistoryController.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/DeptServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/feign/StationVideoTypeClient.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/IStationVideoTypeService.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/RealMonitorServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationVideoTypeServiceImpl.java
# hzims-service/operational/src/main/resources/db/2.0.5.sql
# hzims-service/pom.xml
# hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarCheckTemplateMapper.java
# hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/OperationTicketController.java
# hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/OperationTicketService.java
# hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java
# pom.xml
|
4 months ago |
|
yang_shj
|
77f0fbbc1f
|
#prod代码合并
|
4 months ago |
|
yang_shj
|
68ed88192d
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
# Conflicts:
# hzims-service-api/big-model-api/src/main/java/com/hnac/hzims/bigmodel/interactive/vo/DataItemVO.java
# hzims-service-api/big-model-api/src/main/java/com/hnac/hzims/bigmodel/interactive/vo/ExtraVO.java
# hzims-service-api/big-model-api/src/main/java/com/hnac/hzims/bigmodel/interactive/vo/SelectionVO.java
# hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/feign/IStationClient.java
# hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/feign/IStationVideoTypeClient.java
# hzims-service/hzims-big-model/pom.xml
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/function/controller/FunctionController.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/constants/FuncRouteEnum.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/controller/FontEndInteractiveController.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/controller/HznlmInteractiveController.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/controller/InteractiveController.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/dto/AuthDataDTO.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/factory/AnswerResolveFactory.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/factory/ResolveFactory.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/IHznlmInteractiveService.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/IHznlmInvokeService.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/IInteractiveService.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/IJumpPageService.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/AnalyseDataServiceImpl.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/CanvasResolveServiceImpl.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/ChoiceAnswerResolveServiceImpl.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/HznlmInteractiveServiceImpl.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/HznlmInvokeServiceImpl.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/InteractiveServiceImpl.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/JumpPageServiceImpl.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/JumpRouteJoinStrategy.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/VideoResolveServiceImpl.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/vo/AuthDataVO.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/vo/RemoteParamVO.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/schedule/FrontEndInteractiveSchedule.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/schedule/InteractiveSchedule.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/utils/RequestClientUtil.java
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/websocket/handler/InteractiveHandler.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/feign/StationVideoTypeClient.java
|
4 months ago |
 haungxing
|
95c8a37d81
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
haungxing
|
03d3c6749e
|
fix：大模型代码合并
|
4 months ago |
|
yang_shj
|
92d823b230
|
Merge remote-tracking branch 'origin/prod-20240506' into prod-5.1.3
# Conflicts:
# hzims-service/hzims-alarm/pom.xml
# hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/AlarmService.java
# hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java
# hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/MessageServiceImpl.java
# hzims-service/hzims-big-model/pom.xml
# hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/HzimsBigModelApplication.java
# hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/feign/StationVideoTypeClient.java
# pom.xml
|
4 months ago |
 ty
|
5445e3dd95
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
# Conflicts:
# hzims-service/operational/src/main/java/com/hnac/hzims/operational/history/service/impl/PointServiceImpl.java
|
4 months ago |
|
ty
|
69f0a7eea9
|
新增:工作流补偿机制
|
4 months ago |
|
yang_shj
|
7849754be3
|
#http依赖引入
|
4 months ago |
|
yang_shj
|
c0df81a615
|
#app历史数据统计、告警数据查询
|
5 months ago |
|
yang_shj
|
6d610662a6
|
#app历史数据统计、告警数据查询
|
5 months ago |
|
haungxing
|
25baab8939
|
fix：大模型代码同步
|
5 months ago |
|
haungxing
|
6b51668db2
|
fix：大模型结构调整
|
5 months ago |
|
haungxing
|
9a87d6550c
|
fix：大模型结构调整
|
5 months ago |
|
yang_shj
|
c18220a7f3
|
#app历史数据,历史告警查询
|
5 months ago |
|
haungxing
|
55d24f867d
|
fix：大模型结构调整
|
5 months ago |
|
yang_shj
|
272abeaf55
|
#设备实例告警修改
|
5 months ago |
|
yang_shj
|
475f03f5c9
|
#设备实例告警修改
|
5 months ago |
|
yang_shj
|
108e6ab7e9
|
#优化app首页接口
|
5 months ago |
|
haungxing
|
4600e74945
|
fix：大模型代码架构修改
add:大模型数据源信息维护
|
5 months ago |
|
yang_shj
|
a436845b38
|
#优化app首页接口
|
5 months ago |
|
yang_shj
|
c739441837
|
#工作流修改
|
5 months ago |
|
ty
|
e2fc530629
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
5 months ago |
|
ty
|
cddb21eaf7
|
新增:工作流补偿机制
|
5 months ago |
|
yang_shj
|
33715188ed
|
#生态流量服务
|
5 months ago |
|
yang_shj
|
4d1006b356
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
5 months ago |
|
yang_shj
|
a0cd37141c
|
#生态流量服务
|
5 months ago |
|
ty
|
8be8ed37d3
|
新增:工作流补偿机制
|
5 months ago |
|
yang_shj
|
24e91c7c2b
|
#工作任务单实现类重复
|
5 months ago |
|
yang_shj
|
04c175b79e
|
#工作任务单实现类重复
|
5 months ago |
|
yang_shj
|
c38d97f8f0
|
#消息中心升级
|
5 months ago |
|
yang_shj
|
93f32a53b3
|
#mqttv3依赖引入
|
5 months ago |
|
yang_shj
|
76dfae57b0
|
#移除没用服务
|
5 months ago |
|
yang_shj
|
b4d792ad02
|
#消息中心优化
|
5 months ago |
|
yang_shj
|
ec912073aa
|
#消息中心优化
|
5 months ago |
|
yang_shj
|
18be56465e
|
#消息中心优化
|
5 months ago |
|
yang_shj
|
791cfbf76f
|
#站点页面修改
|
5 months ago |
|
yang_shj
|
8a57ecc3b1
|
#mybatis-plus分页-1参数不支持修改
|
5 months ago |
|
yang_shj
|
061f41e2a5
|
#大模型白名单
|
5 months ago |
|
haungxing
|
948000e500
|
fix：大模型sql执行接口
|
5 months ago |
|
yang_shj
|
ef0cfd6749
|
#mybatis-plus分页不支持-1修改
|
5 months ago |
|
haungxing
|
320086eab9
|
Merge remote-tracking branch 'origin/master'
|
5 months ago |
|
haungxing
|
2f731cafa0
|
fix：大模型sql执行接口
|
5 months ago |
|
yang_shj
|
c58404a342
|
#大模型白名单
|
5 months ago |
|
yang_shj
|
7f53ec3b55
|
#mybatis-plus不支持分页参数为-1
|
5 months ago |
|
yang_shj
|
54c7e81473
|
#mybatis-plus不支持分页参数为-1
|
5 months ago |
|
yang_shj
|
193756b64c
|
#mybatis-plus不支持分页参数为-1
|
5 months ago |
|
yang_shj
|
dee1ab9f6b
|
Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506
|
5 months ago |
|
yang_shj
|
deff12855c
|
#微信公众号时间参数不支持毫秒
|
5 months ago |
|
haungxing
|
6edb91a930
|
fix：鉴权接口requestbody获取不到问题
|
5 months ago |
