1.调整终端管理下，终端和监测点模糊搜索

2.技术监督全景展示接口调整
2024-06-19 18:20:55 +08:00
parent 55b4501694
commit 1f3ea231ad
11 changed files with 178 additions and 48 deletions
--- 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
@@ -15,16 +15,14 @@ import com.njcn.device.pq.mapper.LineDetailMapper;
 import com.njcn.device.pq.mapper.LineMapper;
 import com.njcn.device.pq.mapper.RStatIntegrityDMapper;
 import com.njcn.device.pq.pojo.dto.*;
-import com.njcn.device.pq.pojo.param.DeviceInfoParam;
-import com.njcn.device.pq.pojo.param.LineBaseQueryParam;
-import com.njcn.device.pq.pojo.param.OnlineRateParam;
-import com.njcn.device.pq.pojo.param.TerminalMainQueryParam;
+import com.njcn.device.pq.pojo.param.*;
 import com.njcn.device.pq.pojo.po.Device;
 import com.njcn.device.pq.pojo.po.Line;
 import com.njcn.device.pq.pojo.po.LineDetail;
 import com.njcn.device.pq.pojo.vo.*;
 import com.njcn.device.pq.service.LineService;
 import com.njcn.web.controller.BaseController;
+import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -508,4 +506,14 @@ public class LineController extends BaseController {
        List<LineDetailVO.Detail> line = lineService.getLineDetailByIds(ids);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,line,methodDescribe);
    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("根据装置部门和模糊搜索获取装置详情")
+    @ApiImplicitParam(name = "id", value = "装置id", required = true)
+    @PostMapping("/getDeptDeviceDetailData")
+    HttpResult<List<LineDetailVO.Detail>> getDeptDeviceDetailData(@RequestBody DataParam param){
+        String methodDescribe = getMethodDescribe("getDeptDeviceDetailData");
+        List<LineDetailVO.Detail> deptDeviceDetailData = lineService.getDeptDeviceDetailData(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, deptDeviceDetailData, methodDescribe);
+    }
 }
--- 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
@@ -546,5 +546,9 @@ public interface LineMapper extends BaseMapper<Line> {

    DeviceVO getDeviceDetailData(@Param("id")String id);

+    List<LineDetailVO.Detail> getDeptDeviceDetailData(@Param("ids")List<String> ids,
+                                           @Param("searchValue")String searchValue,
+                                           @Param("type")Integer type);
+
    LineDetailVO getLineInfoVO(@Param("id")String id);
 }
--- 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
@@ -1515,7 +1515,8 @@
            deviceDetail.Update_Time AS timeID,
            deviceDetail.ip ip,
            deviceDetail.Com_Flag as comFlag,
-            vg.Scale as voltageLevel
+            vg.Scale as voltageLevel,
+            voltage.name as volName
        FROM
            pq_line line,
            pq_line voltage,
@@ -1605,5 +1606,66 @@
          AND substation.pid = gd.id
          AND pq_line.id = #{id}
    </select>
+    <select id="getDeptDeviceDetailData" resultType="com.njcn.device.pq.pojo.vo.LineDetailVO$Detail">
+        SELECT DISTINCT
+                line.id as lineId,
+                area.name as areaId,
+                gd.NAME gdName,
+                substation.NAME subName,
+                device.id devId,
+                device.NAME devName,
+                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,
+                voltage.name as volName
+        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>
+        <if test="searchValue!=null and searchValue!='' and type==2">
+            and (
+            lineName like CONCAT('%', #{searchValue}, '%')
+            or subName like CONCAT('%', #{searchValue}, '%')
+            )
+        </if>
+            <if test="searchValue!=null and searchValue!='' and type==1">
+                and (
+                devName like CONCAT('%', #{searchValue}, '%')
+                or subName like CONCAT('%', #{searchValue}, '%')
+                )
+            </if>
+        </where>
+    </select>

 </mapper>
--- 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
@@ -7,6 +7,7 @@ import com.njcn.device.biz.pojo.dto.LineALLInfoDTO;
 import com.njcn.device.pq.pojo.dto.PollutionLineDTO;
 import com.njcn.device.pq.pojo.dto.PollutionParamDTO;
 import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO;
+import com.njcn.device.pq.pojo.param.DataParam;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.param.PqsParam;
 import com.njcn.device.pq.pojo.param.TerminalMainQueryParam;
@@ -14,6 +15,8 @@ import com.njcn.device.pq.pojo.po.Line;
 import com.njcn.device.biz.pojo.po.Overlimit;
 import com.njcn.device.pq.pojo.po.TopMsgPO;
 import com.njcn.device.pq.pojo.vo.*;
+import com.njcn.web.pojo.param.BaseParam;
+
 import java.util.List;
 import java.util.Map;

@@ -215,4 +218,6 @@ public interface LineService extends IService<Line> {
    List<Line> getSubIndexLineDetail(String id);

    List<LineALLInfoDTO> getLineAllDetailList(List<String> ids);
+
+    List<LineDetailVO.Detail> getDeptDeviceDetailData(DataParam param);
 }
--- 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
@@ -24,12 +24,14 @@ import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.dto.PollutionLineDTO;
 import com.njcn.device.pq.pojo.dto.PollutionParamDTO;
 import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO;
+import com.njcn.device.pq.pojo.param.DataParam;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.param.PqsParam;
 import com.njcn.device.pq.pojo.param.TerminalMainQueryParam;
 import com.njcn.device.pq.pojo.po.*;
 import com.njcn.device.pq.pojo.vo.*;
 import com.njcn.device.pq.mapper.*;
+import com.njcn.device.pq.service.DeptLineService;
 import com.njcn.device.pq.service.LineService;
 import com.njcn.influx.constant.InfluxDbSqlConstant;
 import com.njcn.influx.imapper.PqsCommunicateMapper;
@@ -42,6 +44,7 @@ import com.njcn.system.pojo.po.Area;
 import com.njcn.system.pojo.po.DictData;
 import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.pojo.dto.DeptDTO;
+import com.njcn.web.pojo.param.BaseParam;
 import com.njcn.web.pojo.vo.LineDataVO;
 import com.njcn.web.utils.GeneralUtil;
 import com.njcn.web.utils.RequestUtil;
@@ -94,7 +97,7 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li

    private final TerminalMaintainMapper terminalMaintainMapper;
    private final DeptFeignClient deptFeignClient;
-
+    private final DeptLineService deptLineService;
    @Override
    public LineDetailDataVO getLineDetailData(String id) {
        //根据id查询当前信息的pids
@@ -662,6 +665,17 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
        return collect;
    }

+    @Override
+    public List<LineDetailVO.Detail> getDeptDeviceDetailData(DataParam param) {
+        List<String> ids = deptFeignClient.getDepSonIdtByDeptId(param.getOrgId()).getData();
+        List<DeptLine> deptLines = deptLineService.selectDeptBindLines(ids);
+        List<String> lineIDs = deptLines.stream().map(DeptLine::getLineId).collect(Collectors.toList());
+        if(CollUtil.isNotEmpty(lineIDs)){
+            return this.baseMapper.getDeptDeviceDetailData(lineIDs, param.getSearchValue(),param.getType());
+        }
+        return new ArrayList<>();
+    }
+
    @Override
    public List<Overlimit> getOverLimitByList(PollutionParamDTO pollutionParamDTO) {
        return overlimitMapper.selectBatchIds(pollutionParamDTO.getLineList());