|
|
d79c333d75
|
限值提交
|
2023-05-16 11:21:12 +08:00 |
|
|
|
543daa0a39
|
限值提交
|
2023-05-16 11:18:38 +08:00 |
|
|
|
09bf6ef5a3
|
限值提交
|
2023-05-16 11:15:50 +08:00 |
|
wr
|
b1eab1086a
|
重新提交
|
2023-05-16 11:03:10 +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
|
40339b22f8
|
Merge remote-tracking branch 'origin/master'
|
2023-05-15 19:03:04 +08:00 |
|
wr
|
94f5ff8b29
|
重新提交
|
2023-05-15 19:00:48 +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 |
|
zhuxinyu
|
bcf5791010
|
冀北主网监测点统计
|
2023-05-12 12:37:49 +08:00 |
|
wr
|
6019d49ad0
|
1.冀北分布式光伏:一类监测点只查询监测点标签为分布式光伏的监测点
|
2023-05-12 09:50:12 +08:00 |
|
zhuxinyu
|
d89e547ef3
|
冀北地图接口优化
|
2023-05-11 15:14:02 +08:00 |
|
zhuxinyu
|
06e0ddf802
|
冀北地图接口开发
|
2023-05-11 14:53:24 +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 |
|
hanyong
|
b7fe1aad64
|
pom文件替换为pq
|
2023-05-08 14:46:39 +08:00 |
|
hanyong
|
c59e541852
|
pom文件替换为pms
|
2023-05-08 14:31:51 +08:00 |
|
hanyong
|
596bef8252
|
pom文件替换为pq
|
2023-05-08 10:58:06 +08:00 |
|
hanyong
|
f389106d0d
|
pom文件替换为pms
|
2023-05-08 10:33:31 +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 |
|
hanyong
|
98eb8c3643
|
pom文件替换为pq
|
2023-05-06 09:43:13 +08:00 |
|
hanyong
|
c447c51e78
|
pom文件替换为pms
|
2023-05-06 09:06:37 +08:00 |
|
hanyong
|
ab20fa6d84
|
device的pom文件替换为pq
|
2023-05-05 16:42:13 +08:00 |
|
hanyong
|
e331ad1a7e
|
device的pom替换为pms
|
2023-05-05 16:22:52 +08:00 |
|
zhangbaojian
|
bc603fdb5e
|
zbj//1.类名称调整
|
2023-05-05 11:11:42 +08:00 |
|
zhangbaojian
|
46179beb54
|
zbj//1.台账信息只有修改台账重要参数才需要记录日志 代码修改
|
2023-05-04 11:08:13 +08:00 |
|
wr
|
0a2c90e354
|
数据完整性超过100%问题
|
2023-04-28 15:03:57 +08:00 |
|
zhangbaojian
|
ea2e7d02b2
|
zbj//1.暂降热力图/暂降严重度 代码修改
|
2023-04-27 19:06:27 +08:00 |
|
wr
|
a009f21d61
|
1.解决pms概览告警占比Bug
2.解决pms用户无法添加问题
|
2023-04-27 13:51:06 +08:00 |
|
hanyong
|
26286a7aed
|
device的pom配置替换
|
2023-04-26 20:53:48 +08:00 |
|
hanyong
|
4b3cb76165
|
device的pom文件替换
|
2023-04-26 20:36:18 +08:00 |
|
zhuxinyu
|
499c920196
|
问题单修复
|
2023-04-26 20:14:07 +08:00 |
|
wr
|
7bd648587b
|
修改部门下监测点，返回信息和查询入参的修改
|
2023-04-26 16:03:32 +08:00 |
|
zhangbaojian
|
b7007fb9f4
|
zbj//1.新增导出台账模板(离线装置)接口
|
2023-04-26 14:12:15 +08:00 |
|
zhangbaojian
|
3b8774d7e4
|
zbj//1.将台账数据导入终端相关表接口改动
|
2023-04-26 13:57:44 +08:00 |
|
wr
|
26bc511536
|
pms获取部门下面所有监测点
|
2023-04-26 13:50:02 +08:00 |
|
|
|
98185dc1b2
|
预处理污区
|
2023-04-26 13:23:45 +08:00 |
|
zhuxinyu
|
1819b87c6a
|
暂降事件推送日志
|
2023-04-26 09:51:39 +08:00 |
|
|
|
8ef30d0f22
|
预处理污区
|
2023-04-25 16:15:52 +08:00 |
|
huangzj
|
5b118aed7a
|
代码提交
|
2023-04-25 10:57:26 +08:00 |
|
