夜笙歌
|
9bc96b7ecb
|
修改问题
|
3 days ago |
|
夜笙歌
|
425baeb520
|
修改问题
|
3 days ago |
|
夜笙歌
|
e84c1b5b3a
|
修改问题
|
5 days ago |
|
夜笙歌
|
c2c358188c
|
修改问题
|
6 days ago |
 zch
|
383ee9c447
|
feat(portal): 为 Nacos 配置添加用户名和密码
- 在 bootstrap.yml 文件中增加了 Nacos 配置的用户名和密码
|
6 days ago |
 xs
|
b0549805fa
|
Merge remote-tracking branch 'origin/master'
|
5 months ago |
|
夜笙歌
|
3bdd9bf39d
|
修改问题
|
5 months ago |
|
夜笙歌
|
1eddf7e7ee
|
修改问题
|
5 months ago |
|
夜笙歌
|
dc9d0306ed
|
修改问题
|
5 months ago |
|
xs
|
342274b2be
|
Merge remote-tracking branch 'origin/master'
|
5 months ago |
|
夜笙歌
|
d46eaf0410
|
修改问题
|
5 months ago |
|
夜笙歌
|
91814231b2
|
修改请求方法名称
|
5 months ago |
|
夜笙歌
|
675cdb1c79
|
修改显示
|
6 months ago |
|
xs
|
ebfa380334
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
夜笙歌
|
350b2b20d9
|
修改场景跳转
|
6 months ago |
|
夜笙歌
|
55125477fc
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
夜笙歌
|
c1de49cbe7
|
添加组态化
|
6 months ago |
|
xs
|
2716401586
|
Merge remote-tracking branch 'origin/breach-zhy'
# Conflicts:
# ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/PlcDeviceController.java
# ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/PlcDeviceService.java
# ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/PlcDeviceServiceImpl.java
# ruoyi-ui/src/views/plc/plcEquipment/index.vue
# ruoyi-ui/src/views/plc/plcModel/index.vue
|
6 months ago |
|
xs
|
e3af90c13d
|
3.0.9
PLC协议开发
|
6 months ago |
maxw@mesnac.com
|
b817d4b51b
|
plc协议开发
|
6 months ago |
|
xs
|
8b54538f4b
|
3.0.8
门户网站管理：关于我们信息、关于我们详情、联系我们信息完善
|
6 months ago |
|
xs
|
afddf2994e
|
3.0.7
场景化配置:根据配置动态获取设备数据TDengine增加接口
|
6 months ago |
|
xs
|
e0d09a4685
|
3.0.6
场景化配置：场景化模板风格查询列表、增加、修改和查询详细信息接口
|
6 months ago |
|
xs
|
fc919b0241
|
3.0.5
场景化配置：动态获取设备数据接口
|
6 months ago |
|
xs
|
db180ca6de
|
3.0.4
门户网站功能完善：包括门户网站配置、门户网站配置类型、产品信息配置和案例内容
|
6 months ago |
|
maxw@mesnac.com
|
d08e7012ff
|
plc协议前端开发
|
6 months ago |
|
maxw@mesnac.com
|
eb7844ffc0
|
plc协议后端开发
|
6 months ago |
|
xs
|
e82d993dd7
|
3.0.3
门户网站配置和门户网站配置类型完善
|
6 months ago |
|
xs
|
0b0a8f5f90
|
3.0.2
门户网站配置完善
|
6 months ago |
|
夜笙歌
|
97420b1cb9
|
增加plc页面
|
6 months ago |
|
夜笙歌
|
f6db1a14d6
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
夜笙歌
|
480986236d
|
增加plc页面
|
6 months ago |
|
xs
|
84b1de6f3b
|
3.0.1
门户网站功能配置，包括前端和后端
|
6 months ago |
|
xs
|
8973798784
|
Merge remote-tracking branch 'origin/breach-zhy'
|
6 months ago |
|
maxw@mesnac.com
|
f0f3524fb0
|
模板接口
|
6 months ago |
|
xs
|
3e0a38416f
|
Merge remote-tracking branch 'origin/breach-zhy'
|
6 months ago |
|
xs
|
f4eb21a6c4
|
Merge remote-tracking branch 'origin/breach-zhy'
# Conflicts:
# ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/controller/LayoutConfigController.java
# ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/controller/LayoutDescController.java
# ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/domain/LayoutConfig.java
# ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/domain/LayoutDesc.java
# ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/mapper/LayoutConfigDao.java
# ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/mapper/LayoutDescDao.java
# ruoyi-modules/hw-basic/src/main/resources/mapper/basic/LayoutConfigDao.xml
# ruoyi-modules/hw-basic/src/main/resources/mapper/basic/LayoutDescDao.xml
# ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwDevice.java
# ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwElectronicFence.java
# ruoyi-modules/hw-business/src/main/resources/mapper/business/HwDeviceMapper.xml
# ruoyi-modules/hw-business/src/main/resources/mapper/business/HwElectronicFenceMapper.xml
# ruoyi-ui/vue.config.js
|
6 months ago |
|
maxw@mesnac.com
|
43ab6ebb5c
|
TD服务获取设备位置
|
6 months ago |
|
xs
|
048475c422
|
3.0
新增门户网站以下功能：
门户网站配置类型
门户网站配置
产品信息配置
案例内容
关于我们信息
|
7 months ago |
 马雪伟
|
de20216b43
|
TD服务bug修改，新增根据设备获取坐标接口
|
8 months ago |
|
马雪伟
|
24af04b9d5
|
business服务bug修改，新增根据设备获取坐标接口
|
8 months ago |
|
夜笙歌
|
8bd5a00d87
|
修复问题
|
8 months ago |
|
马雪伟
|
ece255f5ed
|
设备数据上传服务记录时间ts修改成设备上传数据的时间
|
8 months ago |
|
马雪伟
|
f41dcc7468
|
导出sheet名修改，三级页面历史记录得参数单位添加
|
8 months ago |
|
夜笙歌
|
e5ad285ad4
|
修复问题
|
8 months ago |
|
夜笙歌
|
2f529c4cd8
|
添加页面
|
8 months ago |
|
夜笙歌
|
db5ceeadba
|
添加页面
|
8 months ago |
|
zch
|
b0aafc8d33
|
change - 看板设备检测面板，点击父节点显示所有设备
- 看板设备检测面板，点击监控单元父节点，显示子孙节点（监控单元）下的所有设备
- 新增递归方法获取监控单元的所有子孙节点
- 将子孙节点的设备信息合并到查询结果中
- 注意：数据库样本较少，性能和有效性待进一步验证
|
8 months ago |
|
zch
|
0f8e897996
|
change - 修正报警信息模块的权限认证注解
|
8 months ago |
|
zch
|
5f7b5d0c03
|
change - 新增报警管理-报警信息页面
- 新增报警信息增删改查相关API和控制器方法
- 在HwAlarmInfo实体类中添加新的属性，如deviceName、tenantName等
- 在Mapper接口和XML中增加更新报警信息的方法和对应SQL
|
8 months ago |