From 265c603a730a4a12fbae266c6f6300a5d24b8dec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Thu, 28 Dec 2023 09:47:08 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0pms=E5=9B=BD=E7=BD=91?= =?UTF-8?q?=E4=B8=8A=E9=80=81=E5=AE=9A=E6=97=B6=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/pms/pojo/param/MonitorParam.java | 4 +++ .../com/njcn/device/pms/pojo/po/Monitor.java | 5 ++- .../mapping/StatationStatMapper.xml | 2 +- .../gwPush/impl/GwMonitorPushServiceImpl.java | 2 +- .../majornetwork/impl/MonitorServiceImpl.java | 33 ++++++++++++++----- .../impl/TerminalServiceImpl.java | 2 +- 6 files changed, 35 insertions(+), 13 deletions(-) diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java index 297ac1f1f..5fb0d880b 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java @@ -176,6 +176,10 @@ public class MonitorParam { */ private String objType; + /** + * 101 电网侧，102 用户侧 + */ + private String powerFlag; /** * 监测对象编号 diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java index 9d2149cc0..6c70dbafb 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java @@ -154,7 +154,10 @@ public class Monitor extends BaseEntity { */ private String objType; - + /** + * 101 电网侧，102 用户侧 + */ + private String powerFlag; /** * 监测对象编号 diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/StatationStatMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/StatationStatMapper.xml index 62b27e5ab..6075e38fa 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/StatationStatMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/StatationStatMapper.xml @@ -57,7 +57,7 @@ or b.name like concat('%',#{baseParam.searchValue},'%') ) - order by a.Power_Name asc + order by a.org_name,a.Power_Name asc diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/GwMonitorPushServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/GwMonitorPushServiceImpl.java index 4df8aa727..e1df1e61f 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/GwMonitorPushServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/GwMonitorPushServiceImpl.java @@ -173,7 +173,7 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService { SysDicTreePO sysDicTreeParent = dictTreeFeignClient.queryById(sysDicTreePO.getPid()).getData(); pushMonitorDTO.setObjTypePrePre(sysDicTreeParent.getCode()); } - pushMonitorDTO.setObjectType("0"); + pushMonitorDTO.setObjectType(item.getPowerFlag()); if (statusMap.containsKey(item.getMonitorState())) { pushMonitorDTO.setStatus(statusMap.get(item.getMonitorState()).getValue()); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java index 3e4579eb8..abb438e31 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java @@ -35,6 +35,7 @@ import com.njcn.device.pms.pojo.vo.MonitorVO; import com.njcn.device.pms.pojo.vo.PmsMonitorVO; import com.njcn.device.pms.service.majornetwork.IDistributionMonitorService; import com.njcn.device.pms.service.majornetwork.IMonitorService; +import com.njcn.device.pms.service.majornetwork.ITractionStationService; import com.njcn.device.pq.pojo.bo.excel.OracleTerminalExcel; import com.njcn.device.pq.pojo.po.LineBak; import com.njcn.poi.excel.ExcelUtil; @@ -104,6 +105,7 @@ public class MonitorServiceImpl extends ServiceImpl impl private final DictTreeFeignClient dictTreeFeignClient; + @Override public List getMonitorByCondition(List deptIdList, PmsDeviceInfoParam pmsDeviceInfoParam) { return this.baseMapper.getMonitorByCondition(deptIdList, pmsDeviceInfoParam); @@ -206,7 +208,7 @@ public class MonitorServiceImpl extends ServiceImpl impl .or() .like(Monitor::getOrgName, baseParam.getSearchValue())) .eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()) - .orderByDesc(Monitor::getCreateTime); + .orderByAsc(Monitor::getOrgName,Monitor::getPowerrName); Page page = this.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper); List dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData(); @@ -226,6 +228,7 @@ public class MonitorServiceImpl extends ServiceImpl impl Map mapBus = generatrixWireList.stream().collect(Collectors.toMap(GeneratrixWire::getId, Function.identity())); + temList = temList.stream().peek(item -> { if (mapTerminal.containsKey(item.getTerminalId())) { item.setTerminalCode(mapTerminal.get(item.getTerminalId()).getTerminalCode()); @@ -882,13 +885,15 @@ public class MonitorServiceImpl extends ServiceImpl impl terminalMapper.updateById(pmsTerminalPO); devId = pmsTerminal.getId(); } else if (Objects.isNull(pmsTerminal)) { - terminalMapper.deleteById(deviceBak.getId()); pmsTerminalPO.setId(deviceBak.getId()); terminalMapper.insert(pmsTerminalPO); devId = pmsTerminalPO.getId(); } else { devId = pmsTerminal.getId(); + pmsTerminalPO.setId(devId); + terminalMapper.updateById(pmsTerminalPO); + } } @@ -1042,13 +1047,13 @@ public class MonitorServiceImpl extends ServiceImpl impl } //行业类型 - if (businessDicMap.containsKey(oracleTerminalExcel.getBusinessType())) { + /* if (businessDicMap.containsKey(oracleTerminalExcel.getBusinessType())) { String busTypeId = businessDicMap.get(oracleTerminalExcel.getBusinessType()).getId(); monitorPO.setTradeCode(busTypeId); } else { oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, oracleTerminalExcel.getBusinessType()+"字典行业类型不存在，请确认后重试")); continue; - } + }*/ //TODO 监测点对象名称 @@ -1074,7 +1079,7 @@ public class MonitorServiceImpl extends ServiceImpl impl oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "字典接线方式不存在，请确认后重试")); continue; } - monitorPO.setIsUpToGrid(0); + monitorPO.setStatus(DataStateEnum.ENABLE.getCode()); monitorPO.setIsSpecialMonitor(0); monitorPO.setPt1(oracleTerminalExcel.getPt1()); @@ -1083,9 +1088,21 @@ public class MonitorServiceImpl extends ServiceImpl impl monitorPO.setCt2(oracleTerminalExcel.getCt2()); + if(oracleTerminalExcel.getLoadType().equals("光伏电站") || oracleTerminalExcel.getLoadType().equals("风电场")){ + monitorPO.setFieldStation("01"); + } + + if(oracleTerminalExcel.getPowerFlag() == 0){ + monitorPO.setPowerFlag("101"); + }else if(oracleTerminalExcel.getPowerFlag() == 1){ + monitorPO.setPowerFlag("102"); + } + + if (Objects.isNull(lineBak) && Objects.isNull(monitor)) { + monitorPO.setIsUpToGrid(0); monitorMapper.insert(monitorPO); Overlimit overlimit = COverlimitUtil.globalAssemble(Float.parseFloat(scale.getValue()), oracleTerminalExcel.getDealCapacity(), oracleTerminalExcel.getDevCapacity(), oracleTerminalExcel.getShortCapacity(), 0, 0); overlimit.setId(monitorPO.getId()); @@ -1108,15 +1125,13 @@ public class MonitorServiceImpl extends ServiceImpl impl lineBakMapper.insert(lineBakPO); monitorMapper.updateById(monitorPO); } else if (Objects.isNull(monitor)) { + monitorPO.setIsUpToGrid(0); monitorMapper.deleteById(lineBak.getId()); - overlimitMapper.deleteById(lineBak.getId()); monitorPO.setId(lineBak.getId()); monitorMapper.insert(monitorPO); } else { - monitorMapper.deleteById(monitor.getId()); - overlimitMapper.deleteById(monitor.getId()); monitorPO.setId(lineBak.getId()); - monitorMapper.insert(monitorPO); + monitorMapper.updateById(monitorPO); } Overlimit overlimit = COverlimitUtil.globalAssemble(Float.parseFloat(scale.getValue()), oracleTerminalExcel.getDealCapacity(), oracleTerminalExcel.getDevCapacity(), oracleTerminalExcel.getShortCapacity(), 0, 0); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalServiceImpl.java index bd11bd97d..758ff4e25 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalServiceImpl.java @@ -70,7 +70,7 @@ public class TerminalServiceImpl extends ServiceImpl(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper); }