Commit Graph

95 Commits

Author SHA1 Message Date
dfa8eedd23 添加字段 2023-05-29 10:55:07 +08:00
wr
e57b1c6125 pms swagger显示修改 2023-05-29 10:45:15 +08:00
c6f36235b5 添加字段 2023-05-26 10:19:43 +08:00
wr
c7e063a6ae 1.冀北分布式光伏代码提交
2.审计日志管理代码提交修改
3.暂降推送日志,筛选添加
2023-05-26 08:52:00 +08:00
2925d46a07 代码调整 2023-05-23 19:31:11 +08:00
16c933d631 bug修改 2023-05-18 15:00:49 +08:00
13b6ae6f13 pms单位修改同步修改台账中的单位信息
bug
2023-05-17 20:23:40 +08:00
c7b6d4022c 限值提交 2023-05-17 17:17:15 +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
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
wr
a009f21d61 1.解决pms概览告警占比Bug
2.解决pms用户无法添加问题
2023-04-27 13:51:06 +08:00
wr
7bd648587b 修改部门下监测点,返回信息和查询入参的修改 2023-04-26 16:03:32 +08:00
wr
26bc511536 pms获取部门下面所有监测点 2023-04-26 13:50:02 +08:00
bc54c20e1d 页面报错 2023-04-23 11:54:54 +08:00
5b81bf940c 代码调整 2023-04-10 13:45:28 +08:00
0eb101dc70 数据中心台账修改 2023-04-07 13:36:14 +08:00
7f6db2b66c pms台账修改 2023-04-03 16:31:22 +08:00
wurui
ba4f6124b6 1.修改变压器代码
2.优化策略,策略添加和修改的验证
2023-03-24 16:30:21 +08:00
wurui
ca1c43af30 ... 2023-03-23 19:53:30 +08:00
wurui
49744fdf85 波形代码提交 2023-03-23 14:51:15 +08:00
wurui
4bb8482bfa Merge remote-tracking branch 'origin/master' 2023-03-22 18:18:47 +08:00
c3b89343fd 删除pms母线代码 2023-03-22 18:06:00 +08:00
wurui
f36bb0dc4d 策略代码提交 2023-03-21 16:28:46 +08:00
wurui
fabd4a0180 pmsBUG提交 2023-03-17 17:19:44 +08:00
657a68e007 bug修改 2023-03-14 09:18:20 +08:00
wurui
e3cfe218d5 分布式光伏-电气化铁路地图bug 2023-03-13 18:33:09 +08:00
wurui
f1f1d523e0 修改分布式光伏概览-部门监测点信息bug 2023-03-09 15:46:24 +08:00
57ac6fd4f7 bug修改 2023-03-09 08:57:30 +08:00
d11964455b Merge branch 'pms' 2023-03-08 10:38:17 +08:00
59f803733a 台账bug修改 2023-03-07 13:55:39 +08:00
c2c3fd9fd6 项目集成华为obs查看波形文件 2023-03-06 16:03:57 +08:00
wurui
f3f04ae66e 1.台账查询bug提交
2.污区图代码更新
2023-03-06 11:40:04 +08:00
c20ef391d7 bug修改 2023-03-06 09:37:11 +08:00
7bf9322d3d pms台账bug提交,台账日志操作 2023-03-02 20:33:47 +08:00