110 Commits (ebb60146591d53a09107ccd229cce80a25f586b2)

Author SHA1 Message Date
HuangHuiKang ebb6014659 fix:修复实时数据点位类型展示问题 1 month ago
86158 9c07497475 Merge branch 'plp' 1 month ago
86158 a6c16a709e fix:修复配方库编码重复问题 1 month ago
HuangHuiKang 04ccfa06fe fix:修改项目重启后继续订阅mqtt消息 1 month ago
HuangHuiKang 1a33190acb fix:修改配方库读取 1 month ago
HuangHuiKang b1a5f45b15 Merge branch 'hhk' into main
# Conflicts:
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/DeviceRespVO.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/DeviceDO.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java
1 month ago
HuangHuiKang 572ff4c3dd fix:修改读取数据方式opcuva为mqtt 1 month ago
kkk-ops 3d4a8fb65c Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server 1 month ago
kkk-ops 03f839ed61 设备运行报表 1 month ago
86158 7f0031a589 fix:修改配方管理-配方配置的新增和编辑逻辑 1 month ago
kkk-ops fdba3ea563 Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server 2 months ago
HuangHuiKang 3105c47908 Merge branch 'hhk' into main 2 months ago
HuangHuiKang 88934d7068 fix:修改配方库 2 months ago
HuangHuiKang fc4769a464 Merge branch 'hhk' into main 2 months ago
HuangHuiKang 778fe392da fix:修改配方库 2 months ago
kkk-ops afd95d255a merge 2 months ago
kkk-ops fdc1e5e684 设备点位单位列表 2 months ago
86158 1a9dadec7e Merge branch 'plp'
# Conflicts:
#	yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/criticalcomponent/CriticalComponentServiceImpl.java
2 months ago
86158 1b9e55c492 feat:新增了采集设备模型-采集点、设备管理-设备关键件、备件管理-备件信息的数据导入功能 2 months ago
HuangHuiKang 1e060796a0 fix:设备管理-任务管理-新增corn表达式不能小于一小时 2 months ago
HuangHuiKang 23bb0016ba fix:修改采集设备定时任务-添加连接中离线处理,添加运行状态默认为待机中 2 months ago
HuangHuiKang 66bc902a07 fix:修改采集设备定时任务 2 months ago
HuangHuiKang baadf3c1fe fix:优化修改告警页面分页 2 months ago
HuangHuiKang 62eea2d16a fix:优化历史数据分页 2 months ago
HuangHuiKang 1ad8100be1 fix:修改模具上模为多选,新增下模相关接口 2 months ago
HuangHuiKang 628311098b fix:设备管理模块-新增编码重复问题 2 months ago
HuangHuiKang 50081338d9 fix:tdengine问题 2 months ago
HuangHuiKang 0745d219e5 fix:修复地址编码问题 2 months ago
kkk-ops aed851fbc5 清除import 2 months ago
kkk-ops 307ba2b509 配方保存bug 2 months ago
HuangHuiKang 5d92f3cf9d Merge branch 'main' into hhk 2 months ago
HuangHuiKang 9fa8da65f5 feat:新增大屏告警近七天,产线近七天接口。修改上传接口及文件限制大小。修复相关bug 2 months ago
86158 5e57a231c5 feat:完成大屏设备点位数据接口 2 months ago
HuangHuiKang 65bca4b368 fix:修复采集设备删除问题 2 months ago
HuangHuiKang 2984fef8f2 fix:修复bug 2 months ago
HuangHuiKang a8ca54bb1f feat:完成大屏产能统计接口、产能近七天趋势图接口、能耗周趋势接口 2 months ago
HuangHuiKang 20d35645a3 feat:完成告警页面、大屏能耗检测统计 2 months ago
86158 1fa7c0ac2a Merge remote-tracking branch 'origin/main' 2 months ago
HuangHuiKang 121c447608 feat:完成大屏各任务统计、各任务列表接口。 2 months ago
HuangHuiKang d8c5f86c59 fix:优化能耗管理-能源报表接口 2 months ago
HuangHuiKang ea371faf56 fix:修改导出接口 2 months ago
86158 3104a4fc07 Merge branch 'plp' 2 months ago
86158 0d23cf3c3c fix:修改表格导出 2 months ago
HuangHuiKang 41f35456ec feat:添加设备运行报表时间字段,新增首页设备运行状态接口 2 months ago
HuangHuiKang 27778698a2 feat:完成设备运行报表页面,新增采集设备页面运行状态、采集时间字段 2 months ago
HuangHuiKang 876dcdd7ca feat:完成定时任务对每个点位的规则判断存入数据库 2 months ago
HuangHuiKang 95dff0da41 feat:完成点位规则接口 2 months ago
HuangHuiKang 9fbfb95489 fix:修改点位类型显示问题 2 months ago
HuangHuiKang 0f4126a59c feat:完成 1、点检列表、导出。2、保养列表、导出。3、维修列表、导出。4、关键件导出 5、备件导出。 2 months ago
86158 c9a94d10c9 修复配方bug 2 months ago