Commit Graph

332 Commits

Author SHA1 Message Date
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
74d5856b1e Merge remote-tracking branch 'origin/master'
# 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/impl/SubstationExpendServiceImpl.java
#	pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/WaveTypeParam.java
2023-05-16 09:40:05 +08:00
wr
412cbc4124 代码重新提交 2023-05-16 09:39:08 +08:00
656da9ff21 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ISubstationExpendService.java
2023-05-16 09:12:30 +08:00
wr
889039f2b4 测试提交 2023-05-16 09:11:46 +08:00
5b5cd670fe 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-16 09:07:49 +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
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
zhangbaojian
46179beb54 zbj//1.台账信息只有修改台账重要参数才需要记录日志 代码修改 2023-05-04 11:08:13 +08:00
wr
0a2c90e354 数据完整性超过100%问题 2023-04-28 15:03:57 +08:00
zhuxinyu
499c920196 问题单修复 2023-04-26 20:14:07 +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
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
zhuxinyu
ed67b465e4 问题单修复 2023-04-25 10:12:04 +08:00
zhuxinyu
21cd4033d9 Merge remote-tracking branch 'origin/master' 2023-04-25 09:49:55 +08:00
zhuxinyu
7ba970bc56 问题单修复 2023-04-25 09:49:28 +08:00
d87d95eae4 解决get请求数据量过大报错问题 2023-04-25 09:49:24 +08:00
f32790abba 台账模块调整 2023-04-24 20:11:35 +08:00
zhuxinyu
943933d447 问题单修复 2023-04-24 16:36:15 +08:00
zhuxinyu
04bd5d47c4 问题单修复 2023-04-24 14:52:48 +08:00
zhuxinyu
8e6c94c58d 定时任务问题修复 2023-04-24 10:17:05 +08:00
9018705e0f 页面报错 2023-04-23 12:44:21 +08:00
wr
0beccc3d0b 限制俩位小数点:数据完整性 2023-04-23 09:26:04 +08:00
zhuxinyu
dfa8b6e751 重复数据优化 2023-04-21 14:45:36 +08:00
zhuxinyu
85e362adc6 终端运维管理优化 2023-04-21 13:47:56 +08:00
36afca9f96 暂态模块格式化时间处理 2023-04-21 11:39:34 +08:00
zhuxinyu
85eaddda3f 问题单修复 2023-04-21 09:49:53 +08:00
zhuxinyu
4457b0c076 区域报告接口 2023-04-21 00:38:42 +08:00
zhuxinyu
a431ce07a6 报告模版配置 2023-04-20 15:35:51 +08:00
zhuxinyu
e4e8e991cc 报告模版配置联调 2023-04-20 15:33:07 +08:00
zhuxinyu
bdffafbf56 稳态指标超标明细 2023-04-19 23:11:53 +08:00
zhuxinyu
ed1e288ec2 问题单修复&&报告模版配置接口联调 2023-04-19 17:50:16 +08:00
wr
d2183a5818 修改数据占比可能超过100%问题 2023-04-19 16:40:21 +08:00
zhuxinyu
592615691c 终端异常统计接口响应慢修复 2023-04-19 15:41:23 +08:00