合并代码

2022-12-08 18:58:51 +08:00
parent 0615189afe
commit 9b8af7945a
94 changed files with 4917 additions and 103 deletions
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsGeneratrixController.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsGeneratrixController.java
@@ -9,7 +9,9 @@ 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.dto.GeneratrixAndPowerStationDTO;
+import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO;
 import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
+import com.njcn.device.pms.pojo.param.ConditionParam;
 import com.njcn.device.pms.pojo.param.GeneratrixParam;
 import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
 import com.njcn.device.pms.pojo.po.Generatrix;
@@ -84,6 +86,27 @@ public class PmsGeneratrixController extends BaseController {
        }
    }

+    /** 
+    * @Description: 普测计划页面调用根据条件查询母线信息 
+    * @Param: [param] 
+    * @return: com.njcn.common.pojo.response.HttpResult<java.util.List<com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO>> 
+    * @Author: clam
+    * @Date: 2022/12/5 
+    */ 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getGeneratrixByCondition")
+    @ApiOperation("普测计划页面调用根据条件查询母线信息")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<GeneratrixAndPowerStationSonDTO>> getGeneratrixByCondition(@RequestBody @Validated ConditionParam param) {
+        String methodDescribe = getMethodDescribe("getGeneratrixByCondition");
+        List<GeneratrixAndPowerStationSonDTO> monitorInfo = pmsGeneratrixService.getGeneratrixByCondition(param);
+        if (CollectionUtil.isEmpty(monitorInfo)) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorInfo, methodDescribe);
+        }
+    }
+
    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
    @PostMapping("/addGeneratrix")
    @ApiOperation("新增母线")
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsGeneratrixMapper.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsGeneratrixMapper.java
@@ -2,7 +2,9 @@ package com.njcn.device.pms.mapper.majornetwork;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO;
+import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO;
 import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
+import com.njcn.device.pms.pojo.param.ConditionParam;
 import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
 import com.njcn.device.pms.pojo.po.Generatrix;
 import org.apache.ibatis.annotations.Mapper;
@@ -34,4 +36,12 @@ public interface PmsGeneratrixMapper extends BaseMapper<Generatrix> {
     * @date 2022/11/3
     */
    List<GeneratrixAndPowerStationDTO> getGeneratrixAndPowerStationInfo(@Param("param") PmsGeneratrixParam param);
+    /** 
+    * @Description: 普测计划页面调用根据条件查询母线信息
+    * @Param: [data, param] 
+    * @return: java.util.List<com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO> 
+    * @Author: clam
+    * @Date: 2022/12/5 
+    */ 
+    List<GeneratrixAndPowerStationSonDTO> getGeneratrixByCondition(@Param("orgList")List<String> data, @Param("param")ConditionParam param);
 }
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixMapper.xml
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixMapper.xml
@@ -37,7 +37,38 @@
    </select>

    <!--获取母线与电站关联信息-->
-    <select id="getGeneratrixAndPowerStationInfo"
+    <select id="getGeneratrixByCondition"
+            resultType="com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO">
+        SELECT
+        pss.Org_Id  AS orgid,
+        pss.Org_Name AS orgName,
+        pg.Generatrix_Id AS busbarId,
+        pg.Generatrix_Name AS busbarName,
+        pg.Scale AS generatrixVoltageLevel,
+        pss.Power_Id AS subId,
+        pss.Power_Name AS subName,
+        pss.Voltage_Level AS voltageLevel
+
+        FROM
+        pms_generatrix AS pg
+        LEFT JOIN pms_statation_stat AS pss ON pg.Statation_Id = pss.Power_Id
+        WHERE
+        pg.`Status` = 1
+        AND pss.`Status` = 1
+        <if test="param.powerStationId != null and param.powerStationId !=''">
+                    AND pss.Power_Id = #{param.powerStationId}
+        </if>
+        <if test="param.powerStationVoltageLevel != null and param.powerStationVoltageLevel !=''  ">
+               AND pss.Voltage_Level  = #{param.powerStationVoltageLevel}
+        </if>
+            AND pss.org_id  IN
+            <foreach collection="orgList" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+
+    </select>
+
+     <select id="getGeneratrixAndPowerStationInfo"
            resultType="com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO">
        SELECT
        pg.Generatrix_Id AS generatrixId,
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPmsGeneratrixService.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPmsGeneratrixService.java
@@ -3,7 +3,9 @@ package com.njcn.device.pms.service.majornetwork;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO;
+import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO;
 import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
+import com.njcn.device.pms.pojo.param.ConditionParam;
 import com.njcn.device.pms.pojo.param.GeneratrixParam;
 import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
 import com.njcn.device.pms.pojo.po.Generatrix;
@@ -94,4 +96,12 @@ public interface IPmsGeneratrixService extends IService<Generatrix> {
     * @date 2022/11/3
     */
    List<GeneratrixAndPowerStationDTO> getGeneratrixAndPowerStationInfo(PmsGeneratrixParam param);
+    /** 
+    * @Description: 普测计划页面调用根据条件查询母线信息 
+    * @Param: [param] 
+    * @return: java.util.List<com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO> 
+    * @Author: clam
+    * @Date: 2022/12/5 
+    */ 
+    List<GeneratrixAndPowerStationSonDTO> getGeneratrixByCondition(ConditionParam param);
 }
--- 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
@@ -104,8 +104,11 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
                .in(CollUtil.isNotEmpty(pmsMonitorParam.getVoltageLevels()), Monitor::getVoltageLevel, pmsMonitorParam.getVoltageLevels())
                .in(CollUtil.isNotEmpty(pmsMonitorParam.getPowerrIds()),Monitor::getPowerrId,pmsMonitorParam.getPowerrIds())
                .like(StringUtils.isNotBlank(pmsMonitorParam.getPowerrName()), Monitor::getPowerrName, pmsMonitorParam.getPowerrName())
+                .eq(Objects.nonNull(pmsMonitorParam.getIsSpecialMonitor()), Monitor::getIsSpecialMonitor, pmsMonitorParam.getIsSpecialMonitor())
                .eq(StringUtils.isNotBlank(pmsMonitorParam.getMonitorType()), Monitor::getMonitorType, pmsMonitorParam.getMonitorType())
-                .eq(StringUtils.isNotBlank(pmsMonitorParam.getMonitorState()), Monitor::getMonitorState, pmsMonitorParam.getMonitorState());
+                .eq(StringUtils.isNotBlank(pmsMonitorParam.getMonitorState()), Monitor::getMonitorState, pmsMonitorParam.getMonitorState())
+                .eq(StringUtils.isNotBlank(pmsMonitorParam.getMonitorTag()), Monitor::getMonitorTag, pmsMonitorParam.getMonitorTag());
+
        List<Monitor> list = this.list(lambdaQueryWrapper);
        List<PmsMonitorDTO> dtoList = list.stream().map(item -> {
            PmsMonitorDTO dto = new PmsMonitorDTO();
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneratrixServiceImpl.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneratrixServiceImpl.java
@@ -11,7 +11,9 @@ import com.njcn.device.pms.enums.PmsDeviceResponseEnum;
 import com.njcn.device.pms.mapper.majornetwork.PmsGeneratrixMapper;
 import com.njcn.device.pms.mapper.majornetwork.StatationStatMapper;
 import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO;
+import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO;
 import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
+import com.njcn.device.pms.pojo.param.ConditionParam;
 import com.njcn.device.pms.pojo.param.GeneratrixParam;
 import com.njcn.device.pms.pojo.param.GeneratrixWireParam;
 import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
@@ -20,6 +22,7 @@ import com.njcn.device.pms.pojo.po.GeneratrixWire;
 import com.njcn.device.pms.pojo.po.StatationStat;
 import com.njcn.device.pms.service.majornetwork.IPmsGeneratrixService;

+import com.njcn.user.api.DeptFeignClient;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.pojo.param.BaseParam;
 import lombok.RequiredArgsConstructor;
@@ -43,6 +46,8 @@ public class PmsGeneratrixServiceImpl extends ServiceImpl<PmsGeneratrixMapper, G

    private final StatationStatMapper statationStatMapper;

+    private final DeptFeignClient deptFeignClient;
+
    /**
     * 获取母线信息
     *
@@ -124,6 +129,22 @@ public class PmsGeneratrixServiceImpl extends ServiceImpl<PmsGeneratrixMapper, G
        return pmsGeneratrixMapper.getGeneratrixAndPowerStationInfo(param);
    }

+    /**
+     * @param param
+     * @Description: 普测计划页面调用根据条件查询母线信息
+     * @Param: [param]
+     * @return: java.util.List<com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO>
+     * @Author: clam
+     * @Date: 2022/12/5
+     */
+    @Override
+    public List<GeneratrixAndPowerStationSonDTO> getGeneratrixByCondition(ConditionParam param) {
+
+        List<String> data = deptFeignClient.getDepSonSelfCodetByDeptId (param.getDeptId ( )).getData ( );
+
+        return pmsGeneratrixMapper.getGeneratrixByCondition(data,param);
+    }
+

    private void checkName(GeneratrixParam generatrixParam, Boolean updateFlag){