Commit Graph

196 Commits

Author SHA1 Message Date
wr
b4938a8345 添加暂态事件id 2023-05-17 20:16:59 +08:00
wr
e8a543b184 解决暂降分析统计 2023-05-17 14:32:37 +08:00
wr
66906d15d9 1.解决统计类型:在线离线类型
2.解决设备运行,初始时间和结束时间bug
2023-05-17 11:02:53 +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
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
wr
40a88596dc 1.解决【区域统计】:数据不对应bug
2.在线监测点bug
2023-05-12 14:42:11 +08:00
wr
0e4bdb62fd 1.pms谐波模块保留俩位小数
2.冀北分布式光伏概览代码提交
2023-05-11 09:26:52 +08:00
zhuxinyu
fe0426520b 问题单修复 2023-05-06 14:52:44 +08:00
zhuxinyu
d4ba963d98 问题单整改 2023-05-05 13:02:44 +08:00
zhangbaojian
b93006bc3a zbj//1.获取电压暂态表及密度坐标图与表数据对应不上 bug修改 2023-05-05 09:33:13 +08:00
zhangbaojian
5e9afdc942 zbj//1.暂降事件点图返回对象调整 2023-05-04 15:49:36 +08:00
zhuxinyu
1b9864a9b9 定时任务问题修复 2023-04-28 16:28:33 +08:00
33c9678661 登录用户部门排序问题 2023-04-28 16:00:35 +08:00
zhangbaojian
c8d766e8ad zbj//1.暂态报告 暂降/暂升/中断 分页代码修改 2023-04-28 11:34:21 +08:00
zhangbaojian
846232b948 zbj//1.暂态报告 暂降/暂升/中断 添加返回总条数 2023-04-28 10:54:01 +08:00
wr
26c3c88169 pms解决暂态指标,数值异常bug 2023-04-28 10:50:31 +08:00
zhangbaojian
d887dc4c62 zbj//1.暂态报告 暂升/暂降次数统计 代码修改 2023-04-28 10:35:26 +08:00
4944488562 Merge remote-tracking branch 'origin/master' 2023-04-28 10:18:13 +08:00
241929cab2 波形下载bug 2023-04-28 10:17:57 +08:00
zhangbaojian
bdb67d068e zbj//1.暂态报告 中断次数统计 代码更改 2023-04-28 09:43:29 +08:00
zhuxinyu
99cc962de0 问题单修复 2023-04-27 20:14:32 +08:00
zhuxinyu
220ac02c65 暂态事件列表查询 2023-04-27 19:09:33 +08:00
zhangbaojian
ea2e7d02b2 zbj//1.暂降热力图/暂降严重度 代码修改 2023-04-27 19:06:27 +08:00
zhuxinyu
2f98232cfa 区域暂态列表优化 2023-04-27 17:07:10 +08:00
abab034523 bug修改 2023-04-27 13:52:29 +08:00
zhuxinyu
499c920196 问题单修复 2023-04-26 20:14:07 +08:00
1c3b68e0ee bug修改 2023-04-26 19:50:15 +08:00
98185dc1b2 预处理污区 2023-04-26 13:23:45 +08:00
zhuxinyu
1819b87c6a 暂降事件推送日志 2023-04-26 09:51:39 +08:00
zhuxinyu
ed67b465e4 问题单修复 2023-04-25 10:12:04 +08:00
zhuxinyu
7ba970bc56 问题单修复 2023-04-25 09:49:28 +08:00
zhangbaojian
a8a97f0f4c zbj//1.离线波形计算pt值和ct值 2023-04-25 09:41:20 +08:00
wr
8a42cf07d6 谐波监测-详细分析:告警变电站统计 和 区域稳态指标超标明细代码优化 2023-04-24 20:31:16 +08:00
f32790abba 台账模块调整 2023-04-24 20:11:35 +08:00
wr
29f67c694c 修改暂态波形,方法命名 2023-04-24 16:17:09 +08:00
zhangbaojian
85dc7b0152 zbj//1.上传文件并且展示波形 2023-04-24 14:19:39 +08:00
36afca9f96 暂态模块格式化时间处理 2023-04-21 11:39:34 +08:00
4b3ff6e3ff 暂态模块格式化时间处理 2023-04-20 10:44:18 +08:00
zhangbaojian
b4bd03c545 zbj//1.大屏获取暂降事件最新50条数据sql更改 2.资源管理 删除资源/下载资源/修改资源 2023-04-19 14:23:25 +08:00
90c83a0c6b Merge remote-tracking branch 'origin/master' 2023-04-19 14:09:20 +08:00
db12b3b0f7 代码调整 2023-04-19 14:09:13 +08:00
zhangbaojian
3a1f1f9795 zbj//1.大屏中间三个接口增加总条数返回字段 2023-04-18 14:00:42 +08:00
zhuxinyu
41af9bb765 区域暂态列表接口异常修复 2023-04-18 11:23:44 +08:00
ed3eb2e312 代码调整 2023-04-18 10:54:37 +08:00
e2691ba8f3 代码调整 2023-04-18 10:50:12 +08:00
18a5156894 代码调整 2023-04-18 10:41:36 +08:00
700ddb2a87 代码调整 2023-04-18 10:38:26 +08:00