zhangbaojian
|
a549c461f9
|
zbj//1.代码调整
|
2023-05-30 11:29:54 +08:00 |
|
wr
|
34cc8bd8d1
|
1.审计管理修改
2.数据中心bug修改
|
2023-05-30 10:05:51 +08:00 |
|
zhangbaojian
|
d0f30d5eec
|
zbj//1.代码调整
|
2023-05-29 16:33:52 +08:00 |
|
zhangbaojian
|
c11f60bb06
|
Merge remote-tracking branch 'origin/master'
|
2023-05-29 13:36:59 +08:00 |
|
|
|
80d2ab2c3c
|
添加字段
|
2023-05-29 11:18:26 +08:00 |
|
zhangbaojian
|
4a8e540f61
|
zbj//1.代码调整
|
2023-05-29 09:57:56 +08:00 |
|
zhangbaojian
|
2291b360f7
|
zbj//1.修改资源 2.删除资源
|
2023-05-29 09:46:00 +08:00 |
|
|
|
8028a058de
|
代码调整
|
2023-05-29 08:47:32 +08:00 |
|
zhangbaojian
|
ffe71537f7
|
zbj//1.预览资源 todo未完成
|
2023-05-26 10:59:46 +08:00 |
|
wr
|
c7e063a6ae
|
1.冀北分布式光伏代码提交
2.审计日志管理代码提交修改
3.暂降推送日志，筛选添加
|
2023-05-26 08:52:00 +08:00 |
|
zhangbaojian
|
376aab019d
|
zbj//1.资源管理(查询数据)
|
2023-05-25 16:33:12 +08:00 |
|
zhangbaojian
|
e4d09ac7c8
|
zbj//1.资源管理(上传资源)
|
2023-05-25 16:23:50 +08:00 |
|
|
|
47bff79b42
|
代码调整
|
2023-05-25 15:51:19 +08:00 |
|
|
|
da7b7ee8eb
|
终端bug修改
|
2023-05-25 09:10:26 +08:00 |
|
zhangbaojian
|
33a52beaad
|
zbj//
1.程序版本查询增加搜索框入参,使用实体接收参数 代码调整
2.终端运维管理终端流量使用详情接口 cld_dev_fuction表新增数据(test测试类删除)
|
2023-05-24 14:17:15 +08:00 |
|
|
|
2925d46a07
|
代码调整
|
2023-05-23 19:31:11 +08:00 |
|
|
|
fd97f5fd78
|
bug修改
|
2023-05-23 16:50:42 +08:00 |
|
zhangbaojian
|
b5a0e4c9e3
|
zbj//1.修改流量套餐 可以修改默认类型套餐的名称及流量 代码调整
|
2023-05-23 13:52:14 +08:00 |
|
|
|
f840ab9774
|
bug修改
|
2023-05-22 20:23:06 +08:00 |
|
zhangbaojian
|
da9e1c0e98
|
zbj//1.大屏中间暂态 代码调整
|
2023-05-22 16:25:26 +08:00 |
|
wr
|
682b40c849
|
pqbug解决
|
2023-05-22 15:59:51 +08:00 |
|
zhangbaojian
|
ded7f0f447
|
zbj//1.大屏接口 代码调整
|
2023-05-22 15:13:31 +08:00 |
|
|
|
6b7dfdb6f7
|
终端运行统计bug修改
|
2023-05-19 08:47:41 +08:00 |
|
|
|
16c933d631
|
bug修改
|
2023-05-18 15:00:49 +08:00 |
|
|
|
13b6ae6f13
|
pms单位修改同步修改台账中的单位信息
bug
|
2023-05-17 20:23:40 +08:00 |
|
wr
|
b4938a8345
|
添加暂态事件id
|
2023-05-17 20:16:59 +08:00 |
|
|
|
c7b6d4022c
|
限值提交
|
2023-05-17 17:17:15 +08:00 |
|
|
|
4cbf39fe20
|
限值提交
|
2023-05-17 17:11:20 +08:00 |
|
wr
|
66906d15d9
|
1.解决统计类型：在线离线类型
2.解决设备运行，初始时间和结束时间bug
|
2023-05-17 11:02:53 +08:00 |
|
|
|
f0eabb44b1
|
限值提交
|
2023-05-16 15:46:17 +08:00 |
|
|
|
a2c8661515
|
限值提交
|
2023-05-16 11:30:41 +08:00 |
|
|
|
543daa0a39
|
限值提交
|
2023-05-16 11:18:38 +08:00 |
|
|
|
09bf6ef5a3
|
限值提交
|
2023-05-16 11:15:50 +08:00 |
|
wr
|
7ee067191f
|
解决文件冲突代码
|
2023-05-16 10:23:07 +08:00 |
|
huangzj
|
ffdec2152a
|
Merge branch 'master' of http://192.168.1.13:3000/root/pqs
# Conflicts:
# pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsSimpleDTO.java
# pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/SubstationExpendController.java
# pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/MonitorMapper.xml
# pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/SubstationExpendServiceImpl.java
# pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/CommunicateParam.java
# pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java
# pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/CommunicateVO.java
# pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
# pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ISubstationExpendService.java
# pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/SubstationExpendServiceImpl.java
# pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/WaveTypeParam.java
|
2023-05-16 09:44:57 +08:00 |
|
wr
|
412cbc4124
|
代码重新提交
|
2023-05-16 09:39:08 +08:00 |
|
wr
|
889039f2b4
|
测试提交
|
2023-05-16 09:11:46 +08:00 |
|
huangzj
|
3d015de224
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/SubstationExpendController.java
|
2023-05-15 17:34:44 +08:00 |
|
wr
|
37a7921eab
|
..
|
2023-05-15 17:31:47 +08:00 |
|
wr
|
b035dbef82
|
Revert "1.冀北：暂态暂降统计列表"
This reverts commit 85fb7c843e.
|
2023-05-15 16:08:27 +08:00 |
|
wr
|
85fb7c843e
|
1.冀北：暂态暂降统计列表
2.冀北主网台账：部门电压信息展示
3.冀北：污染指数列表
|
2023-05-15 16:03:28 +08:00 |
|
|
|
919c64a463
|
台账算法支持
|
2023-05-12 15:25:02 +08:00 |
|
wr
|
0e4bdb62fd
|
1.pms谐波模块保留俩位小数
2.冀北分布式光伏概览代码提交
|
2023-05-11 09:26:52 +08:00 |
|
zhuxinyu
|
bf52617a24
|
冀北地图信息开发
|
2023-05-10 16:06:11 +08:00 |
|
zhuxinyu
|
5ba93f799e
|
问题单修复
|
2023-05-06 16:33:34 +08:00 |
|
zhuxinyu
|
fe0426520b
|
问题单修复
|
2023-05-06 14:52:44 +08:00 |
|
|
|
a88d5237ec
|
监测点评分
|
2023-05-06 14:28:16 +08:00 |
|
zhuxinyu
|
01f83e8a3a
|
终端异常统计优化
|
2023-05-06 11:30:24 +08:00 |
|
zhuxinyu
|
669e843d16
|
终端异常统计优化
|
2023-05-06 11:29:10 +08:00 |
|
zhangbaojian
|
bc603fdb5e
|
zbj//1.类名称调整
|
2023-05-05 11:11:42 +08:00 |
|
