1.app远程接口代码提交

2023-11-09 16:49:02 +08:00
parent 2f674a1f53
commit b657c31e4b
35 changed files with 598 additions and 14 deletions
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeptLineController.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeptLineController.java
@@ -125,4 +125,14 @@ public class DeptLineController extends BaseController {
        DeptLine lineByLineIds = deptLineService.getLineByLineIds(ids);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, lineByLineIds, methodDescribe);
    }
+
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @PostMapping("/getLineNodeByDeptId")
+    @ApiOperation("部门Id获取所有子集部门绑定监测点")
+    @ApiImplicitParam(name = "id", value = "部门id", required = true)
+    public HttpResult<List<String>> getLineNodeByDeptId(@RequestParam("id") String id) {
+        String methodDescribe = getMethodDescribe("getLineNodeByDeptId");
+        List<String> list = deptLineService.getLineNodeByDeptId(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
 }
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/GeneralDeviceInfoController.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/GeneralDeviceInfoController.java
@@ -11,10 +11,8 @@ import com.njcn.device.pq.pojo.bo.BaseLineInfo;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.param.OnlineRateParam;
-import com.njcn.device.pq.pojo.vo.DeptDeviceDetailVO;
-import com.njcn.device.pq.pojo.vo.DeptSubstationDetailVO;
-import com.njcn.device.pq.pojo.vo.ExceptionDeviceInfoVO;
-import com.njcn.device.pq.pojo.vo.RStatOnlinerateVO;
+import com.njcn.device.pq.pojo.po.TopMsgPO;
+import com.njcn.device.pq.pojo.vo.*;
 import com.njcn.device.pq.service.TerminalBaseService;
 import com.njcn.device.pq.service.impl.GeneralDeviceService;
 import com.njcn.web.controller.BaseController;
@@ -301,7 +299,34 @@ public class GeneralDeviceInfoController extends BaseController {
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,runLineIds,methodDescribe);
    }

+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/deptGetRunDev")
+    @ApiOperation("根据单位获取终端id")
+    @ApiImplicitParam(name = "deptId", value = "单位部门索引", required = true)
+    public HttpResult<List<String>> deptGetRunDev(@RequestParam("deptId")String deptId) {
+        String methodDescribe = getMethodDescribe("deptGetRunDev");
+        List<String> runLineIds = generalDeviceService.deptGetRunDev(deptId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,runLineIds,methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getDevInfoByIds")
+    @ApiOperation("根据终端id集合获取终端信息")
+    @ApiImplicitParam(name = "deptId", value = "单位部门索引", required = true)
+    public HttpResult<List<DevDetail>> getDevInfoByIds(@RequestBody List<String> devIds) {
+        String methodDescribe = getMethodDescribe("getDevInfoByIds");
+        List<DevDetail> runLineIds = generalDeviceService.getDevInfoByIds(devIds);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,runLineIds,methodDescribe);
+    }


-
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getTopMsgInfoByIds")
+    @ApiOperation("根据终端id集合获取终端信息")
+    @ApiImplicitParam(name = "deptId", value = "单位部门索引", required = true)
+    public HttpResult<List<TopMsgPO>> getTopMsgInfoByIds(@RequestBody List<String> topIds) {
+        String methodDescribe = getMethodDescribe("getTopMsgInfoByIds");
+        List<TopMsgPO> runLineIds = generalDeviceService.getTopMsgInfoByIds(topIds);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,runLineIds,methodDescribe);
+    }
 }
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java
@@ -433,4 +433,13 @@ public class LineController extends BaseController {
        Page<HalfReportVO> halfReportVOS = lineService.halfReport(param);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,halfReportVOS,methodDescribe);
    }
+
+    @PostMapping("/getLineDetailByIds")
+    @ApiOperation("根据监测点id获取监测点集合")
+    @ApiImplicitParam(name = "param", value = "参数实体", required = true)
+    public HttpResult<List<LineDetailVO.Detail>> getLineDetailByIds(@RequestBody List<String> ids) {
+        String methodDescribe = getMethodDescribe("getLineDetailByIds");
+        List<LineDetailVO.Detail> line = lineService.getLineDetailByIds(ids);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,line,methodDescribe);
+    }
 }
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeviceMapper.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeviceMapper.java
@@ -3,6 +3,7 @@ package com.njcn.device.pq.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.device.pq.pojo.po.Device;
+import com.njcn.device.pq.pojo.vo.DevDetail;
 import com.njcn.device.pq.pojo.vo.LineInfluxDbOnlineVO;
 import com.njcn.device.pq.pojo.vo.RunManageVO;
 import com.njcn.device.pq.pojo.vo.RunTimeVO;
@@ -63,4 +64,13 @@ public interface DeviceMapper extends BaseMapper<Device> {
    List<LineInfluxDbOnlineVO> getOnlineEvaluate(@Param("list") List<String> devIndexes,
                                                 @Param("begin") String searchBeginTime,
                                                 @Param("end") String searchEndTime);
+
+    /**
+     * @Description: 获取终端集合信息
+     * @param ids
+     * @return: java.util.List<com.njcn.cloud.pojo.vo.app.DevDetail>
+     * @Author: wr
+     * @Date: 2023/11/7 15:40
+     */
+    List<DevDetail> selectDevByIds(@Param("ids") List<String> ids);
 }
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java
@@ -532,4 +532,13 @@ public interface LineMapper extends BaseMapper<Line> {


    Map<String,String> getCustomDetailByLineId(@Param("lineId")String lineId);
+
+
+    /**
+      * @Description: 获取监测点集合信息
+      * @Author: wr
+      * @Date: 2023/11/3 14:37
+      */
+    List<LineDetailVO.Detail> selectByIds(@Param("ids") List<String> ids);
+
 }
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TopMsgMapper.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TopMsgMapper.java
@@ -13,7 +13,5 @@ public interface TopMsgMapper {
   Page<TopMsgPO> dailyDeviceAbnormalStatistics(Page<TopMsgPO> page,@Param("lineGrade") String lineGrade, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime);

   List<TopMsgPO> dailyDeviceAbnormal(@Param("lineGrade") String lineGrade,@Param("startTime") DateTime startTime);
-
-
-
+   List<TopMsgPO> selectByIds(@Param("ids") List<String> ids);
 }
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml
@@ -214,4 +214,37 @@

        GROUP BY r.dev_index
    </select>
+    <select id="selectDevByIds" resultType="com.njcn.device.pq.pojo.vo.DevDetail">
+        SELECT
+            gd.NAME as gdName,
+            substation.NAME as bdzName,
+            device.id as devIndex,
+            device.NAME as devName,
+            lineDetail.Line_Grade AS lineGrade,
+            deviceDetail.Update_Time AS timeID,
+            deviceDetail.ip as ip,
+            deviceDetail.Com_Flag as comFlag
+        FROM
+            pq_line line,
+            pq_line voltage,
+            pq_line device,
+            pq_line substation,
+            pq_line gd,
+            pq_device deviceDetail,
+            pq_line_detail lineDetail
+        WHERE
+        <if test="ids!=null and ids.size()!=0">
+            device.id IN
+            <foreach collection="ids" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        AND line.pid = voltage.id
+        AND voltage.pid = device.id
+        AND device.pid = substation.id
+        AND substation.pid = gd.id
+        AND device.id = deviceDetail.id
+        AND line.id = lineDetail.id
+
+    </select>
 </mapper>
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
@@ -1424,5 +1424,51 @@
          and sub.id = dev.pid
          AND line.id = #{lineId}
    </select>
+    <select id="selectByIds" resultType="com.njcn.device.pq.pojo.vo.LineDetailVO$Detail">
+        SELECT DISTINCT
+            area.name as areaId,
+            gd.NAME gdName,
+            substation.NAME subName,
+            device.id devId,
+            device.NAME devName,
+            line.id as lineId,
+            line.NAME lineName,
+            lineDetail.Time_Interval as timeInterval,
+            lineDetail.PT_Type as ptType,
+            lineDetail.Line_Grade,
+            lineDetail.PT1 as PT1,
+            lineDetail.PT2 as PT2,
+            lineDetail.CT1 as CT1,
+            lineDetail.CT2 as CT2,
+            deviceDetail.Update_Time AS timeID,
+            deviceDetail.ip ip,
+            deviceDetail.Com_Flag as comFlag,
+            vg.Scale as voltageLevel
+        FROM
+            pq_line line,
+            pq_line voltage,
+            pq_line device,
+            pq_line substation,
+            pq_line gd,
+            pq_line area,
+            pq_device deviceDetail,
+            pq_line_detail lineDetail,
+            pq_voltage vg
+        WHERE
+            line.pid = voltage.id
+            AND voltage.pid = device.id
+            AND device.pid = substation.id
+            AND substation.pid = gd.id
+            AND gd.pid = area.id
+            AND device.id = deviceDetail.id
+            AND line.id = lineDetail.id
+            AND vg.Id = voltage.id
+        <if test="ids!=null and ids.size()!=0">
+            AND line.id IN
+            <foreach collection="ids" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+    </select>

 </mapper>
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TopMagMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TopMagMapper.xml
@@ -52,4 +52,40 @@
            AND pld.Line_Grade=#{lineGrade}
        </if>
    </select>
+    <select id="selectByIds" resultType="com.njcn.device.pq.pojo.po.TopMsgPO">
+        SELECT
+            top_id as topId,
+            dev.Id AS devId,
+            city.NAME AS cityName,
+            sub.NAME AS subName,
+            dev.NAME AS deviceName,
+            device.ip AS ip,
+            ptm.Time_Id AS time,
+            CAST(
+            ptm.Integrity_Value AS DECIMAL ( 13, 2 )) AS integrityValue,
+            ptm.Integrity_Flag AS integrityFlag,
+            ptm.Comout_Count AS comOutCount,
+            ptm.Comout_Desc AS comOutDesc,
+            ptm.Alarm_Count AS alarmCount,
+            ptm.Alarm_Desc AS alarmDesc,
+            CAST(
+            ptm.Flow_Value AS DECIMAL ( 13, 2 )) AS flowValue,
+            ptm.OnlineRate_Flag AS onlineRateFlag,
+            CAST(
+            ptm.OnlineRate_Value AS DECIMAL ( 13, 2 )) AS onlineRateValue
+        FROM
+            pq_line dev
+        INNER JOIN pq_line sub ON dev.pid = sub.id
+        INNER JOIN pq_line city ON sub.pid = city.id
+        INNER JOIN pqs_top_msg ptm ON ptm.Dev_Id = dev.Id
+        INNER JOIN pq_device device ON dev.id = device.Id
+        <where>
+            <if test="ids!=null and ids.size()!=0">
+                ptm.Top_Id IN
+                <foreach collection="ids" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
 </mapper>
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java
@@ -63,6 +63,18 @@ public interface DeptLineService extends IService<DeptLine> {
     * @date 2022/1/25 9:28
     */
    List<String> getLineByDeptId(String id);
+
+
+
+    /**
+     * @Description: 根据部门id获取所有子集部门所包含的部门信息
+     * @param id
+     * @return: java.util.List<java.lang.String>
+     * @Author: wr
+     * @Date: 2023/11/8 14:54
+     */
+    List<String> getLineNodeByDeptId(String id);
+
    /**
    * @Description: 获取部门和监测点的关系（分稳态暂态）
    * @Param: [devDataType]
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java
@@ -196,4 +196,13 @@ public interface LineService {
     * 根据监测点批量获取监测点信息
     */
    List<LineDTO> getLineDetailBatch(List<String> ids);
+
+    /**
+     * @Description: 获取监测点集合(APP)
+     * @param ids
+     * @return: java.util.List<com.njcn.device.pq.pojo.vo.LineDetailVO.Detail>
+     * @Author: wr
+     * @Date: 2023/11/8 15:46
+     */
+    List<LineDetailVO.Detail> getLineDetailByIds(List<String> ids);
 }
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java
@@ -8,7 +8,10 @@ import com.njcn.device.pq.mapper.DeptLineMapper;
 import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
 import com.njcn.device.pq.pojo.po.DeptLine;
 import com.njcn.device.pq.service.DeptLineService;
+import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.pojo.dto.DeptDTO;
 import com.njcn.web.pojo.param.DeptLineParam;
+import com.njcn.web.utils.WebUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -30,6 +33,8 @@ public class DeptLineServiceImpl extends ServiceImpl<DeptLineMapper, DeptLine> i

    private final DeptLineMapper deptLineMapper;

+    private final DeptFeignClient deptFeignClient;
+
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deptBindLine(DeptLineParam deptLineParam) {
@@ -78,6 +83,16 @@ public class DeptLineServiceImpl extends ServiceImpl<DeptLineMapper, DeptLine> i
        return this.lambdaQuery().in(DeptLine::getId, id).list().stream().map(DeptLine::getLineId).distinct().collect(Collectors.toList());
    }

+    @Override
+    public List<String> getLineNodeByDeptId(String id) {
+        List<DeptDTO> deptInfos = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData();
+        List<String> deptIds = deptInfos.stream().map(DeptDTO::getId).distinct().collect(Collectors.toList());
+        List<DeptLine> userLine = this.list(new LambdaQueryWrapper<DeptLine>()
+                .in(DeptLine::getId, deptIds)
+        );
+        return userLine.stream().map(DeptLine::getLineId).distinct().collect(Collectors.toList());
+    }
+
    /**
     * @param devDataType
     * @Description: 获取部门和监测点的关系（分稳态暂态）
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java
@@ -3,6 +3,7 @@ package com.njcn.device.pq.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.njcn.common.pojo.dto.SimpleDTO;
 import com.njcn.common.pojo.enums.common.ServerEnum;
@@ -10,16 +11,15 @@ import com.njcn.common.utils.EnumUtils;
 import com.njcn.device.pq.enums.LineBaseEnum;
 import com.njcn.device.pq.mapper.DeviceMapper;
 import com.njcn.device.pq.mapper.LineMapper;
+import com.njcn.device.pq.mapper.TopMsgMapper;
 import com.njcn.device.pq.pojo.bo.BaseLineInfo;
 import com.njcn.device.pq.pojo.bo.DeviceType;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
-import com.njcn.device.pq.pojo.po.DeptLine;
-import com.njcn.device.pq.pojo.po.Device;
-import com.njcn.device.pq.pojo.po.Line;
-import com.njcn.device.pq.pojo.po.Substation;
+import com.njcn.device.pq.pojo.po.*;
 import com.njcn.device.pq.pojo.vo.DeptDeviceDetailVO;
 import com.njcn.device.pq.pojo.vo.DeptSubstationDetailVO;
+import com.njcn.device.pq.pojo.vo.DevDetail;
 import com.njcn.device.pq.pojo.vo.ExceptionDeviceInfoVO;
 import com.njcn.device.pq.service.DeptLineService;
 import com.njcn.device.pq.service.TerminalBaseService;
@@ -68,6 +68,7 @@ public class GeneralDeviceService {
    private final DeviceMapper deviceMapper;

    private final LineMapper lineMapper;
+    private final TopMsgMapper topMsgMapper;


    /**
@@ -743,4 +744,43 @@ public class GeneralDeviceService {
        }
        return new ArrayList<>();
    }
+
+
+    /**
+     * @param deptId 部门id
+     * @author cdf
+     * @date 2023/7/20
+     */
+    public List<String> deptGetRunDev(String deptId) {
+        List<String> runLineIds = this.deptGetRunLine(deptId,Stream.of(0).collect(Collectors.toList()),Stream.of(0,2).collect(Collectors.toList()));
+        List<Line> lines = lineMapper.selectList(new LambdaQueryWrapper<Line>()
+                        .select(Line::getPids)
+                        .in(Line::getId,runLineIds)
+        );
+        if(CollUtil.isNotEmpty(lines)){
+            return lines.stream().map(line -> {
+                String[] idsArray = line.getPids().split(",");
+                return idsArray[4];
+            }).distinct().collect(Collectors.toList());
+        }
+        return new ArrayList<>();
+    }
+
+    public List<DevDetail> getDevInfoByIds(List<String> devIds) {
+        List<DictData> gradeType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_GRADE.getCode()).getData();
+        Map<String, Integer> gradeMap = gradeType.stream().collect(Collectors.toMap(DictData::getId, DictData::getAlgoDescribe));
+
+        List<DevDetail> devDetails = deviceMapper.selectDevByIds(devIds);
+        for (DevDetail devDetail : devDetails) {
+            //终端等级
+            if(gradeMap.containsKey(devDetail.getLineGrade())){
+                devDetail.setLineGrade(String.valueOf(gradeMap.get(devDetail.getLineGrade())));
+            }
+        }
+        return devDetails;
+    }
+
+    public List<TopMsgPO> getTopMsgInfoByIds(List<String> topIds) {
+        return topMsgMapper.selectByIds(topIds);
+    }
 }
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
@@ -37,6 +37,7 @@ import com.njcn.influx.query.InfluxQueryWrapper;
 import com.njcn.system.api.AreaFeignClient;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.Area;
 import com.njcn.system.pojo.po.DictData;
 import com.njcn.web.pojo.vo.LineDataVO;
 import com.njcn.web.utils.GeneralUtil;
@@ -504,6 +505,37 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
        return lineDTOS;
    }

+    @Override
+    public List<LineDetailVO.Detail> getLineDetailByIds(List<String> ids) {
+        List<LineDetailVO.Detail> details = this.baseMapper.selectByIds(ids);
+        //获取行政区域
+        List<String> areaIds = details.stream().map(LineDetailVO.Detail::getAreaId).distinct().collect(Collectors.toList());
+        List<Area> data = areaFeignClient.areaNameByList(areaIds).getData();
+        Map<String, String> areaMap = data.stream().collect(Collectors.toMap(Area::getId, Area::getName));
+        //获取电压字典
+        List<DictData> dictType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE_STAND.getCode()).getData();
+        Map<String, String> dictMap = dictType.stream().collect(Collectors.toMap(DictData::getId, DictData::getName));
+        //获取终端等级
+        List<DictData> gradeType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_GRADE.getCode()).getData();
+        Map<String, Integer> gradeMap = gradeType.stream().collect(Collectors.toMap(DictData::getId, DictData::getAlgoDescribe));
+
+        for (LineDetailVO.Detail detail : details) {
+            //获取行政区域名称
+            if(areaMap.containsKey(detail.getAreaId())){
+                detail.setAreaName(areaMap.get(detail.getAreaId()));
+            }
+            //电压
+            if(dictMap.containsKey(detail.getVoltageLevel())){
+                detail.setVoltageLevel(dictMap.get(detail.getVoltageLevel()));
+            }
+            //终端等级
+            if(gradeMap.containsKey(detail.getLineGrade())){
+                detail.setLineGrade(String.valueOf(gradeMap.get(detail.getLineGrade())));
+            }
+        }
+        return details;
+    }
+
    @Override
    public List<Overlimit> getOverLimitByList(PollutionParamDTO pollutionParamDTO) {
        return overlimitMapper.selectBatchIds(pollutionParamDTO.getLineList());