From abf9f61752d7fd48aa15224b6ce1ba04477491f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Tue, 19 Dec 2023 10:11:49 +0800 Subject: [PATCH] =?UTF-8?q?pms=E5=9B=BD=E7=BD=91=E4=B8=8A=E9=80=81?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/device/pms/pojo/po/Monitor.java | 2 ++ .../PmsStatationStatController.java | 14 ++++++++ .../majornetwork/IStatationStatService.java | 2 ++ .../majornetwork/impl/MonitorServiceImpl.java | 26 ++++++++++++++ .../impl/StatationStatServiceImpl.java | 34 +++++++++++++++++++ 5 files changed, 78 insertions(+) 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 e795d3386..29197b88a 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 @@ -28,6 +28,8 @@ public class Monitor extends BaseEntity { @TableId private String id; + private String monitorId; + /** * 监测点名称 */ diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsStatationStatController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsStatationStatController.java index a78620952..621266b58 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsStatationStatController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsStatationStatController.java @@ -186,6 +186,20 @@ public class PmsStatationStatController extends BaseController { } + /** + * 批量同步中台电站id + * @author cdf + * @date 2023/12/19 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/batchSync") + @ApiOperation("批量同步中台电站id") + public HttpResult batchSync() { + String methodDescribe = getMethodDescribe("batchSync"); + statationStatService.batchSync(); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe); + } + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IStatationStatService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IStatationStatService.java index 649abc995..7f7b09056 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IStatationStatService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IStatationStatService.java @@ -144,4 +144,6 @@ public interface IStatationStatService extends IService { List getStationByDeptCode(String deptCode); + Boolean batchSync(); + } 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 799204056..580690e07 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 @@ -895,6 +895,32 @@ public class MonitorServiceImpl extends ServiceImpl impl //当前电站下面没有监测点，可以新增 Monitor monitorPO = new Monitor(); + + String monitorId = "04"; + String one =""; + if(deptDTO.getName().contains("石家庄")){ + one= "01"; + }else if(deptDTO.getName().contains("邯郸")){ + one= "02"; + }else if(deptDTO.getName().contains("保定")){ + one= "03"; + }else if(deptDTO.getName().contains("沧州")){ + one= "04"; + }else if(deptDTO.getName().contains("邢台")){ + one= "05"; + }else if(deptDTO.getName().contains("衡水")){ + one= "06"; + }else if(deptDTO.getName().contains("超高压")){ + one= "07"; + }else { + one= "3.14159"; + } + + String last = String.format("M%05d",oracleTerminalExcel.getId()); + + monitorPO.setMonitorId(monitorId+one+last); + + monitorPO.setName(oracleTerminalExcel.getLineName()); monitorPO.setPowerrName(stationName); monitorPO.setPowerrId(stationId); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java index e760edaa4..aa10551fc 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; @@ -415,6 +416,39 @@ public class StatationStatServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(PmsMidLedger::getLevel,0).eq(PmsMidLedger::getState,DataStateEnum.ENABLE.getCode()); + List pmsMidLedgerList = pmsMidLedgerMapper.selectList(lambdaQueryWrapper); + + List statationStatList = statationStatMapper.selectList(new LambdaQueryWrapper<>()); + + for(StatationStat statationStat :statationStatList){ + + for(PmsMidLedger pmsMidLedger :pmsMidLedgerList){ + if(statationStat.getOrgId().equals(pmsMidLedger.getSectionId())){ + if(pmsMidLedger.getName().equals(statationStat.getPowerName())){ + statationStat.setMidStationId(pmsMidLedger.getId()); + break; + } + } + } + } + + List poList = statationStatList.stream().filter(item->Objects.nonNull(item.getMidStationId())).collect(Collectors.toList()); + + for(StatationStat statationStat : poList){ + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper(); + lambdaUpdateWrapper.set(StatationStat::getMidStationId,statationStat.getMidStationId()).eq(StatationStat::getPowerId,statationStat.getPowerId()); + this.update(lambdaUpdateWrapper); + } + System.out.println("5555"); + + + return true; + } + private Map voltageLevel() { //获取电压指定电压id Map voltageIDs = new HashMap<>();