Commit Graph

152 Commits

Author SHA1 Message Date
wr
dd83655a1b 1.修改pqbug
2.添加统计类型下监测点数量
2023-05-31 13:52:10 +08:00
zhangbaojian
d2a1694242 zbj//1.代码调整 2023-05-30 16:27:36 +08:00
wr
34cc8bd8d1 1.审计管理修改
2.数据中心bug修改
2023-05-30 10:05:51 +08:00
zhangbaojian
2291b360f7 zbj//1.修改资源 2.删除资源 2023-05-29 09:46:00 +08:00
wr
c7e063a6ae 1.冀北分布式光伏代码提交
2.审计日志管理代码提交修改
3.暂降推送日志,筛选添加
2023-05-26 08:52:00 +08:00
zhangbaojian
e4d09ac7c8 zbj//1.资源管理(上传资源) 2023-05-25 16:23:50 +08:00
zhangbaojian
33a52beaad zbj//
1.程序版本查询增加搜索框入参,使用实体接收参数 代码调整
2.终端运维管理终端流量使用详情接口 cld_dev_fuction表新增数据(test测试类删除)
2023-05-24 14:17:15 +08:00
zhangbaojian
da9e1c0e98 zbj//1.大屏中间暂态 代码调整 2023-05-22 16:25:26 +08:00
zhangbaojian
ded7f0f447 zbj//1.大屏接口 代码调整 2023-05-22 15:13:31 +08:00
wr
b4938a8345 添加暂态事件id 2023-05-17 20:16:59 +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
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
0e4bdb62fd 1.pms谐波模块保留俩位小数
2.冀北分布式光伏概览代码提交
2023-05-11 09:26:52 +08:00
zhuxinyu
5ba93f799e 问题单修复 2023-05-06 16:33:34 +08:00
zhuxinyu
fe0426520b 问题单修复 2023-05-06 14:52:44 +08:00
zhuxinyu
669e843d16 终端异常统计优化 2023-05-06 11:29:10 +08:00
zhangbaojian
ea2e7d02b2 zbj//1.暂降热力图/暂降严重度 代码修改 2023-04-27 19:06:27 +08:00
zhuxinyu
499c920196 问题单修复 2023-04-26 20:14:07 +08:00
zhuxinyu
1819b87c6a 暂降事件推送日志 2023-04-26 09:51:39 +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
bc54c20e1d 页面报错 2023-04-23 11:54:54 +08:00
zhuxinyu
1a8f874f9e 流量详情influxdb表切换 2023-04-21 15:00:15 +08:00
huangzj
75624b0b19 监测点评价_日统计接口开发 2023-04-20 20:16:48 +08:00
zhuxinyu
e4e8e991cc 报告模版配置联调 2023-04-20 15:33:07 +08:00
15b8d1a15e 删除重复字段 2023-04-19 09:11:18 +08:00
dc3c4a8321 代码调整,bug修改 2023-04-18 15:59:52 +08:00
zhangbaojian
3a1f1f9795 zbj//1.大屏中间三个接口增加总条数返回字段 2023-04-18 14:00:42 +08:00
zhangbaojian
e3ce5b4300 zbj//1.大屏中间三个接口增加分页查询 2023-04-17 20:00:00 +08:00
zhangbaojian
1cc3ce4c3b zbj//1.功率负荷排名 2023-04-14 15:16:47 +08:00
zhangbaojian
249b1cf025 zbj//1.运维日志页面展示 2023-04-14 12:31:48 +08:00
zhangbaojian
975f8af044 zbj//1.设备修改套餐日志与新增用户日志修改 2023-04-13 19:10:30 +08:00
zhangbaojian
cba065d25c zbj//1.web新增用户信息添加日志 2023-04-13 14:27:24 +08:00
77ee5f7d81 Merge remote-tracking branch 'origin/master' 2023-04-13 11:34:58 +08:00
da2bbb9d94 数据中心修改 2023-04-13 11:34:48 +08:00
zhangbaojian
54c0f8c828 zbj//1.终端运行状态修改添加日志 2023-04-13 10:45:15 +08:00
zhangbaojian
e0a3155f6e zbj//1.终端修改操作修改监测点信息写入日志 2023-04-12 19:02:36 +08:00
826778a2b8 代码调整 2023-04-11 15:56:41 +08:00
zhuxinyu
b97d13d813 流量统计接口开发 2023-04-11 14:16:31 +08:00
zhuxinyu
9199a7c763 每月流量统计 2023-04-10 20:31:45 +08:00
zhangbaojian
3f0c3df939 zbj//1.数据规模 2023-04-10 17:54:13 +08:00
Lee
d66d2eefdc Merge remote-tracking branch 'origin/master' 2023-04-10 16:36:36 +08:00
Lee
9fc0e6bb41 修改暂降严重度和暂降热力图接口 2023-04-10 16:35:47 +08:00
zhangbaojian
b1bc826e73 zbj//1.灿能云用户规模 2023-04-10 14:45:34 +08:00