 ty
|
c85e25babb
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
ty
|
2c881e0417
|
调整：调整告警消息推送顺序
|
4 months ago |
 yang_shj
|
63b310d47d
|
#新版告警修改
|
4 months ago |
|
yang_shj
|
f84d172c23
|
#新版告警修改
|
4 months ago |
|
ty
|
fc37745154
|
调整：调整告警消息推送顺序
|
4 months ago |
|
yang_shj
|
dcba22e179
|
#集中监控增加设备装机容量
|
4 months ago |
|
yang_shj
|
d214b181d0
|
#集中监控增加设备装机容量
|
4 months ago |
 haungxing
|
adc5bb4bcc
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
haungxing
|
d7b4db66cf
|
# 取消危险源位置数据权限
|
4 months ago |
|
ty
|
6920dd6ac9
|
修正：交接班逻辑漏洞
|
4 months ago |
|
yang_shj
|
71df561902
|
#离线巡检图片上传问题修复
|
4 months ago |
|
ty
|
bc2604e93b
|
新增：设备维护库设置对应得机构
|
4 months ago |
|
ty
|
901dfe696e
|
新增：操作票设备名称
|
4 months ago |
|
ty
|
ad094b1d9c
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
ty
|
5d8e614d48
|
修复：操作票逻辑判断修复
|
4 months ago |
|
haungxing
|
5ae026cba5
|
# 巡检feign接口调整
|
4 months ago |
|
haungxing
|
72a74b8afc
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
haungxing
|
bff12f46b5
|
# stationMapper新增@Param注解
|
4 months ago |
|
ty
|
2f7a7f3382
|
修复：操作票逻辑判断修复
|
4 months ago |
|
ty
|
4d6b80a93e
|
修复：平台升级，巡检sql冲突
|
4 months ago |
|
yang_shj
|
d847e5fda0
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
yang_shj
|
f0c70490d8
|
#app告警查询修改
|
4 months ago |
|
ty
|
b8cabf895f
|
修复：增加视频配置错误提示
|
4 months ago |
|
ty
|
9b20dc0417
|
修复：工作流去掉权限设置
|
4 months ago |
|
ty
|
e9fd55f69e
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
4 months ago |
|
ty
|
0d721756d1
|
修复：巡检项目管理增加权限设置
|
4 months ago |
|
yang_shj
|
05f97d58c4
|
#app告警查询
|
4 months ago |
|
yang_shj
|
13125811af
|
#离线巡检图片上传问题
|
4 months ago |
|
yang_shj
|
b6614d7c9f
|
#工作任务单班组查询bug修复
|
4 months ago |
|
yang_shj
|
99b21e5e42
|
#近3年发电量格式修改
|
4 months ago |
 Jone
|
8d0c72fb94
|
删除项目配置文件
|
4 months ago |
|
ty
|
2199b22525
|
修复：流程判断逻辑
|
4 months ago |
|
ty
|
eee0993d7c
|
修复：消息中心类型转换
|
4 months ago |
|
ty
|
f8bd1b25fb
|
修复：消息中心类型转换
|
4 months ago |
|
ty
|
bf18eb0ad5
|
修复：线下操作票和安全工器具
|
4 months ago |
|
ty
|
5e664747d5
|
新增：线下操作票
|
4 months ago |
|
ty
|
142573b3c7
|
升级：修改xxljob相关配置
|
4 months ago |
|
ty
|
41e6e9f674
|
修改：jar包依赖
|
4 months ago |
|
ty
|
9951395564
|
修改：近三年发电量容器修改
|
4 months ago |
|
ty
|
320af05f98
|
升级：升级xxljob依赖
|
4 months ago |
|
ty
|
ab0b0f7ee1
|
新增:德联一键控制功能
|
4 months ago |
|
ty
|
6b6d67947e
|
新增:工作流补偿机制
|
4 months ago |
|
yang_shj
|
b5f071cff9
|
#master代码
|
5 months ago |
|
yang_shj
|
020f5e9b7c
|
#服务默认配置整理
|
5 months ago |
|
yang_shj
|
96a56875e1
|
#master代码合并
|
5 months ago |
|
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
|
5 months ago |
|
yang_shj
|
77f0fbbc1f
|
#prod代码合并
|
5 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
|
5 months ago |
|
haungxing
|
95c8a37d81
|
Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3
|
5 months ago |
|
haungxing
|
03d3c6749e
|
fix：大模型代码合并
|
5 months ago |
