huangzj
|
708af80624
|
冲突修改
|
2023-05-16 09:51:37 +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
|
1ff7080bc9
|
终端统计及appbug修改
|
2023-05-16 08:47:49 +08:00 |
|
|
|
a33b9590e6
|
代码调整
|
2023-05-15 20:00:41 +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 |
|
wr
|
40a88596dc
|
1.解决【区域统计】：数据不对应bug
2.在线监测点bug
|
2023-05-12 14:42:11 +08:00 |
|
zhuxinyu
|
bcf5791010
|
冀北主网监测点统计
|
2023-05-12 12:37:49 +08:00 |
|
|
|
84a32302aa
|
代码调整
|
2023-05-12 10:13:57 +08:00 |
|
wr
|
6019d49ad0
|
1.冀北分布式光伏:一类监测点只查询监测点标签为分布式光伏的监测点
|
2023-05-12 09:50:12 +08:00 |
|
|
|
1b854f6f4c
|
系统配置指标功能
|
2023-05-11 16:46:48 +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 |
|
|
|
2e71088c8d
|
influxDB测试
|
2023-05-10 20:02:15 +08:00 |
|
|
|
ba8c4541f1
|
代码调整
|
2023-05-10 16:39:04 +08:00 |
|
|
|
6f0a19adf9
|
代码调整
|
2023-05-10 16:26:12 +08:00 |
|
zhuxinyu
|
bf52617a24
|
冀北地图信息开发
|
2023-05-10 16:06:11 +08:00 |
|
|
|
1458f9425b
|
监测点指标告警月统计算法
|
2023-05-10 14:18:44 +08:00 |
|
|
|
d2f53a9872
|
监测点指标告警日统计算法
|
2023-05-09 18:26:18 +08:00 |
|
zhuxinyu
|
ba0de03a93
|
问题单修复
|
2023-05-09 11:04:15 +08:00 |
|
|
|
056c19195a
|
代码调整
|
2023-05-09 09:33:18 +08:00 |
|
|
|
39fe78f948
|
代码调整
|
2023-05-09 09:22:49 +08:00 |
|
|
|
fb593ae053
|
代码调整;监测点指标告警日统计部分算法
|
2023-05-08 20:38:23 +08:00 |
|
|
|
c2745b6536
|
指标差值日统计算法提交
|
2023-05-08 18:13:39 +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 |
|
|
|
04b042c901
|
报表模板bug
|
2023-05-06 16:37:24 +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 |
|
wr
|
1ff04d0338
|
解决稳态超标占比数据错误bug
|
2023-05-06 13:46:52 +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 |
|
zhuxinyu
|
5e5fc60968
|
测试代码删除
|
2023-05-06 08:52:43 +08:00 |
|
hanyong
|
ab20fa6d84
|
device的pom文件替换为pq
|
2023-05-05 16:42:13 +08:00 |
|
zhuxinyu
|
017f9205d2
|
终端异常统计定时任务优化
|
2023-05-05 16:36:23 +08:00 |
|
|
|
d654b49ff9
|
新增自定义谐波指标次数获取方法
|
2023-05-05 16:25:53 +08:00 |
|
hanyong
|
e331ad1a7e
|
device的pom替换为pms
|
2023-05-05 16:22:52 +08:00 |
|
