bug修改

2023-05-18 15:00:49 +08:00
parent 13b6ae6f13
commit 16c933d631
7 changed files with 147 additions and 41 deletions
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsLedgerDeptController.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsLedgerDeptController.java
@@ -6,14 +6,9 @@ import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.device.pms.pojo.po.Monitor;
-import com.njcn.device.pms.pojo.po.PowerClient;
-import com.njcn.device.pms.pojo.po.PowerDistributionarea;
-import com.njcn.device.pms.pojo.po.PowerGenerationUser;
-import com.njcn.device.pms.service.majornetwork.IMonitorService;
-import com.njcn.device.pms.service.majornetwork.IPowerClientService;
-import com.njcn.device.pms.service.majornetwork.IPowerDistributionareaService;
-import com.njcn.device.pms.service.majornetwork.IPowerGenerationUserService;
+import com.njcn.device.pms.mapper.majornetwork.StatationStatMapper;
+import com.njcn.device.pms.pojo.po.*;
+import com.njcn.device.pms.service.majornetwork.*;
 import com.njcn.user.pojo.po.Dept;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.utils.RequestUtil;
@@ -23,6 +18,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;

 import java.util.List;
 import java.util.stream.Collectors;
@@ -47,8 +43,13 @@ public class PmsLedgerDeptController extends BaseController {

    private final IPowerClientService iPowerClientService;

+    private final IStatationStatService iStatationStatService;
+
+    private final ITerminalService iTerminalService;
+

    @PostMapping("update")
+    @ApiIgnore
    public HttpResult<Object> updateLedger(@RequestBody Dept dept){
        String methodDescribe = getMethodDescribe("updateLedger");

@@ -81,7 +82,7 @@ public class PmsLedgerDeptController extends BaseController {
                powerDistributionarea.setOperationName(dept.getName());
                return powerDistributionarea;
            }).collect(Collectors.toList());
-            iPowerDistributionareaService.saveBatch(powerDistributionareaListP);
+            iPowerDistributionareaService.updateBatchById(powerDistributionareaListP);
        }

        //发电用户
@@ -97,7 +98,7 @@ public class PmsLedgerDeptController extends BaseController {
                powerClient.setOperationName(dept.getName());
                return powerClient;
            }).collect(Collectors.toList());
-            iPowerClientService.saveBatch(powerClientListP);
+            iPowerClientService.updateBatchById(powerClientListP);
        }

        //用电用户
@@ -113,10 +114,44 @@ public class PmsLedgerDeptController extends BaseController {
                powerGenerationUser.setOperationName(dept.getName());
                return powerGenerationUser;
            }).collect(Collectors.toList());
-            iPowerGenerationUserService.saveBatch(powerGenerationUserListP);
+            iPowerGenerationUserService.updateBatchById(powerGenerationUserListP);
        }
+        //电站
+        LambdaQueryWrapper<StatationStat> statationStatLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        statationStatLambdaQueryWrapper.eq(StatationStat::getStatus, DataStateEnum.ENABLE.getCode())
+                .eq(StatationStat::getOrgId,dept.getCode());
+        List<StatationStat> statationStatList = iStatationStatService.list(statationStatLambdaQueryWrapper);
+        if(CollectionUtil.isNotEmpty(statationStatList)){
+            List<StatationStat> statationStatListP = statationStatList.stream().map(it->{
+                StatationStat statationStat = new StatationStat();
+                statationStat.setPowerId(it.getPowerId());
+                statationStat.setOrgName(dept.getName());
+                return statationStat;
+            }).collect(Collectors.toList());
+            iStatationStatService.updateBatchById(statationStatListP);
+        }
+
+        //装置
+        LambdaQueryWrapper<PmsTerminal> terminalLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        terminalLambdaQueryWrapper.eq(PmsTerminal::getStatus, DataStateEnum.ENABLE.getCode())
+                .and(item->item.eq(PmsTerminal::getOrgId,dept.getCode()).or().eq(PmsTerminal::getOperationId,dept.getCode()));
+        List<PmsTerminal> pmsTerminalList = iTerminalService.list(terminalLambdaQueryWrapper);
+        if(CollectionUtil.isNotEmpty(pmsTerminalList)){
+            List<PmsTerminal> pmsTerminalListP = pmsTerminalList.stream().map(it->{
+                PmsTerminal pmsTerminal = new PmsTerminal();
+                pmsTerminal.setId(it.getId());
+                pmsTerminal.setOrgName(dept.getName());
+                pmsTerminal.setOperationName(dept.getName());
+                return pmsTerminal;
+            }).collect(Collectors.toList());
+            iTerminalService.updateBatchById(pmsTerminalListP);
+        }
+
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);

+
    }
+
+
 }

--- 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
@@ -1,5 +1,6 @@
 package com.njcn.device.pms.service.majornetwork.impl;

+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,9 +12,7 @@ import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO;
 import com.njcn.device.pms.pojo.param.PmsBaseParam;
 import com.njcn.device.pms.pojo.param.StatationStatParam;
 import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam;
-import com.njcn.device.pms.pojo.po.GeneratrixWire;
-import com.njcn.device.pms.pojo.po.PmsTerminal;
-import com.njcn.device.pms.pojo.po.StatationStat;
+import com.njcn.device.pms.pojo.po.*;
 import com.njcn.device.pms.pojo.vo.StatationStatVO;
 import com.njcn.device.pms.service.majornetwork.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -22,11 +21,13 @@ import com.njcn.user.pojo.po.Dept;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.pojo.param.BaseParam;
 import lombok.RequiredArgsConstructor;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;

 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;

 /**
 * <p>
@@ -48,11 +49,13 @@ public class StatationStatServiceImpl extends ServiceImpl<StatationStatMapper, S

    private final PmsGeneratrixWireMapper pmsGeneratrixWireMapper;

-    private final MonitorMapper monitorMapper;
+    private final IMonitorService iMonitorService;
+
+    private final PowerDistributionareaMapper powerDistributionareaMapper;
+
+

-    private final DistributionMonitorMapper distributionMonitorMapper;

-    private final ITerminalLogService iTerminalLogService;

    /**
     * 获取指定的变电站信息
@@ -102,9 +105,55 @@ public class StatationStatServiceImpl extends ServiceImpl<StatationStatMapper, S

        StatationStat statationStat = new StatationStat();
        BeanUtils.copyProperties(statationStatParam, statationStat);
-        return this.updateById(statationStat);
+        this.updateById(statationStat);
+
+        //修改单位名称时候要确保其他台账中的电站名同时修改
+        LambdaQueryWrapper<Monitor> monitorLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        monitorLambdaQueryWrapper.eq(Monitor::getStatus,DataStateEnum.ENABLE.getCode()).eq(Monitor::getPowerrId,statationStat.getPowerId());
+
+        //主网监测点
+        List<Monitor> monitorList = iMonitorService.list(monitorLambdaQueryWrapper);
+        if(CollectionUtil.isNotEmpty(monitorList)){
+            List<Monitor> monitorListP = monitorList.stream().map(item->{
+                Monitor monitor = new Monitor();
+                monitor.setPowerrName(statationStat.getPowerName());
+                monitor.setId(item.getId());
+                return monitor;
+            }).collect(Collectors.toList());
+            iMonitorService.updateBatchById(monitorListP);
+        }
+        //台区
+        LambdaQueryWrapper<PowerDistributionarea> powerDistributionareaLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        powerDistributionareaLambdaQueryWrapper.eq(PowerDistributionarea::getStatus,DataStateEnum.ENABLE.getCode()).eq(PowerDistributionarea::getPowerStationId,statationStat.getPowerId());
+
+        List<PowerDistributionarea> powerDistributionareaList = powerDistributionareaMapper.selectList(powerDistributionareaLambdaQueryWrapper);
+        if(CollectionUtil.isNotEmpty(powerDistributionareaList)){
+            powerDistributionareaList.forEach(item->{
+                PowerDistributionarea powerDistributionarea = new PowerDistributionarea();
+                powerDistributionarea.setPowerrName(statationStat.getPowerName());
+                powerDistributionarea.setId(item.getId());
+                powerDistributionareaMapper.updateById(powerDistributionarea);
+            });
+        }
+        //装置
+        //台区
+        LambdaQueryWrapper<PmsTerminal> pmsTerminalLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        pmsTerminalLambdaQueryWrapper.eq(PmsTerminal::getStatus,DataStateEnum.ENABLE.getCode()).eq(PmsTerminal::getPowerStationId,statationStat.getPowerId());
+
+        List<PmsTerminal> pmsTerminalList = terminalMapper.selectList(pmsTerminalLambdaQueryWrapper);
+        if(CollectionUtil.isNotEmpty(pmsTerminalList)){
+            pmsTerminalList.forEach(item->{
+                PmsTerminal pmsTerminalP = new PmsTerminal();
+                pmsTerminalP.setPowerrName(statationStat.getPowerName());
+                pmsTerminalP.setId(item.getId());
+                terminalMapper.updateById(pmsTerminalP);
+            });
+        }
+        return true;
    }

+
+
    @Override
    public boolean delStatationStat(List<String> statationStatIds) {
        //删除前需要判断是否存在绑定关系