终端模块新增对外接口

pqs-device/device-boot/src/main/java/com/njcn/device/controller/DeptLineController.java

@@ -91,9 +91,9 @@ public class DeptLineController extends BaseController {
     @PostMapping("/removeBind")
     @ApiOperation("部门解除绑定监测点")
     @ApiImplicitParam(name = "id", value = "部门id", required = true)
-    public Integer removeBind(@RequestParam("id") String id) {
+    public HttpResult<Integer> removeBind(@RequestParam("id") String id) {
         String methodDescribe = getMethodDescribe("removeBind");
-        return deptLineService.removeBind(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, deptLineService.removeBind(id), methodDescribe);
     }
 
 

pqs-device/device-boot/src/main/java/com/njcn/device/controller/LineController.java

@@ -3,13 +3,16 @@ package com.njcn.device.controller;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.common.utils.LogUtil;
+import com.njcn.device.enums.DeviceResponseEnum;
 import com.njcn.device.mapper.DeviceMapper;
 import com.njcn.device.mapper.LineDetailMapper;
 import com.njcn.device.mapper.LineMapper;
 import com.njcn.device.pojo.dto.*;
+import com.njcn.device.pojo.param.LineBaseQueryParam;
 import com.njcn.device.pojo.po.Device;
 import com.njcn.device.pojo.po.Line;
 import com.njcn.device.pojo.po.LineDetail;
@@ -25,6 +28,7 @@ import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author denghuajun
@@ -245,9 +249,23 @@ public class LineController extends BaseController {
     })
     public HttpResult<List<AreaLineInfoVO>> getBaseLineAreaInfo(@RequestBody List<String> lineIndex) {
         String methodDescribe = getMethodDescribe("getBaseLineAreaInfo");
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, lineService.getBaseLineAreaInfo(lineIndex), methodDescribe);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, lineService.getBaseLineAreaInfo(lineIndex,null,null), methodDescribe);
     }
 
+    /**
+     * 获取丰富的监测点信息(扩展模糊查询)
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getRichLineInfo")
+    @ApiOperation("获取丰富的监测点信息(扩展模糊查询)")
+    @ApiImplicitParam(name = "lineBaseQueryParam", value = "监测点参数", required = true)
+    public HttpResult<List<AreaLineInfoVO>> getRichLineInfo(@RequestBody @Validated LineBaseQueryParam lineBaseQueryParam) {
+        String methodDescribe = getMethodDescribe("getRichLineInfo");
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, lineService.getBaseLineAreaInfo(lineBaseQueryParam.getLineIds(),lineBaseQueryParam.getSearchValue(),lineBaseQueryParam.getComFlag()), methodDescribe);
+    }
+
+
+
     /**
      * 根据监测点ids获取监测点基本信息
      * @author cdf
@@ -255,7 +273,7 @@ public class LineController extends BaseController {
      */
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getBaseLineList")
-    @ApiOperation("根据监测点ids获取监测点基本信息")
+    @ApiOperation("获取最基础的监测点信息")
     @ApiImplicitParam(name = "lineIndex", value = "监测点集合", required = true)
     public HttpResult<List<Line>> getBaseLineList(@RequestBody List<String> lineIndex) {
         String methodDescribe = getMethodDescribe("getBaseLineList");
@@ -305,4 +323,26 @@ public class LineController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, lineMapper.getOnLineCount(lineIds), methodDescribe);
     }
 
+    /**
+     * 获取当前状态在线和离线的监测点
+     * @param lineBaseQueryParam 监测点查询参数
+     * @return  在线的监测点id集
+     * @author cdf
+     * @date 2022/8/1
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getOnOrUnLine")
+    @ApiOperation("获取当前状态在线和离线的监测点")
+    @ApiImplicitParam(name = "lineBaseQueryParam", value = "监测点查询参数", required = true)
+    public HttpResult<List<String>> getOnOrUnLine(@RequestBody @Validated LineBaseQueryParam lineBaseQueryParam) {
+        String methodDescribe = getMethodDescribe("getOnOrUnLine");
+        if(Objects.isNull(lineBaseQueryParam.getComFlag())){
+            throw new BusinessException(DeviceResponseEnum.PARAM_VAL_ERR);
+        }
+        List<String> idsRes = lineMapper.getOnOrUnLine(lineBaseQueryParam.getLineIds(),lineBaseQueryParam.getComFlag());
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,idsRes, methodDescribe);
+    }
+
+
+
 }

pqs-device/device-boot/src/main/java/com/njcn/device/mapper/LineMapper.java

@@ -193,7 +193,7 @@ public interface LineMapper extends BaseMapper<Line> {
      * @param lineIndex 监测点结合
      * @date 2022/6/29
      */
-    List<AreaLineInfoVO> getBaseLineAreaInfo(@Param("list")List<String> lineIndex);
+    List<AreaLineInfoVO> getBaseLineAreaInfo(@Param("list")List<String> lineIndex,@Param("searchValue")String searchValue,@Param("comFlag")Integer comFlag);
 
     /**
      * 返回监测点信息及通讯状态
@@ -321,7 +321,13 @@ public interface LineMapper extends BaseMapper<Line> {
 
     /**
      * 获取当前状态在线的监测点数量
-     * @return 装置Id
+     * @return Integer 在线监测点数量
      */
     Integer getOnLineCount(@Param("lineIds")List<String> lineIds);
+
+    /**
+     * 获取当前状态在线和离线的监测点
+     * @return 在线或离线监测点ids
+     */
+    List<String> getOnOrUnLine(@Param("list")List<String> lineIds,@Param("comFlag")Integer comFlag);
 }

pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LineMapper.xml

@@ -493,7 +493,9 @@
         detail.ct1,
         detail.ct2,
         detail.pt1,
-        detail.pt2
+        detail.pt2,
+        detail.obj_name,
+        loadtype.name loadType
         FROM
         pq_line line,
         pq_line_detail detail,
@@ -520,11 +522,29 @@
         AND substation.id = pqsubstation.id
         AND pqsubstation.Scale = subscale.id
         AND substation.pid = gd.id
+        AND detail.load_type = loadtype.id
         AND line.Id IN
         <foreach item="item" collection="list" separator="," open="(" close=")">
             #{item}
         </foreach>
-        GROUP BY line.id
+        <if test="searchValue!=null and searchValue!=''">
+           and (line.name like  CONCAT('%', #{searchValue},'%')
+            or voltage.name like  CONCAT('%', #{searchValue},'%')
+            or device.name like  CONCAT('%', #{searchValue},'%')
+            or substation.name like  CONCAT('%', #{searchValue},'%')
+            or gd.name like  CONCAT('%', #{searchValue},'%'))
+        </if>
+        <if test="searchValue!=null and searchValue!=''">
+            and (line.name like  CONCAT('%', #{searchValue},'%')
+            or voltage.name like  CONCAT('%', #{searchValue},'%')
+            or device.name like  CONCAT('%', #{searchValue},'%')
+            or substation.name like  CONCAT('%', #{searchValue},'%')
+            or gd.name like  CONCAT('%', #{searchValue},'%'))
+        </if>
+        <if test="comFlag!=null">
+            and pqdevice.com_flag = #{comFlag}
+        </if>
+
     </select>
 
     <select id="getLineDeviceStateVO" resultType="com.njcn.device.pojo.vo.LineDeviceStateVO">
@@ -906,4 +926,17 @@ FROM
             #{item}
         </foreach>
     </select>
+
+    <select id="getOnOrUnLine" resultType="String">
+        select a.id from pq_line a
+        inner join pq_line b on a.pid = b.id
+        inner join pq_line c on b.pid =c.id
+        inner join pq_device d on c.id = d.id
+        where a.id in
+        <foreach collection="list" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        and d.com_flag = #{comFlag}
+        and a.state = 1
+    </select>
 </mapper>

pqs-device/device-boot/src/main/java/com/njcn/device/service/LineService.java

@@ -132,7 +132,7 @@ public interface LineService {
      * @param lineIndex 监测点结合
      * @date 2022/6/29
      */
-    List<AreaLineInfoVO> getBaseLineAreaInfo(List<String> lineIndex);
+    List<AreaLineInfoVO> getBaseLineAreaInfo(List<String> lineIndex,String searchValue,Integer comFlag);
 
     /**
      * 获取监测点基本信息

pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/LineServiceImpl.java

@@ -661,8 +661,8 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
 
 
     @Override
-    public List<AreaLineInfoVO> getBaseLineAreaInfo(List<String> lineIndex) {
-        return this.baseMapper.getBaseLineAreaInfo(lineIndex);
+    public List<AreaLineInfoVO> getBaseLineAreaInfo(List<String> lineIndex,String searchValue,Integer comFlag) {
+        return this.baseMapper.getBaseLineAreaInfo(lineIndex,searchValue,comFlag);
     }
 
     @Override

pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/TerminalTreeServiceImpl.java

@@ -105,7 +105,7 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
      */
     @Override
     public List<TerminalTree> getTerminalTreeForFive(DeviceInfoParam deviceInfoParam) {
-        deviceInfoParam.setDeptIndex(RequestUtil.getDeptIndex());
+        //deviceInfoParam.setDeptIndex(RequestUtil.getDeptIndex());
         List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfo(deviceInfoParam, Stream.of(0).collect(Collectors.toList()), Stream.of(1).collect(Collectors.toList()));
         if (CollectionUtil.isNotEmpty(generalDeviceDTOList)) {
             List<TerminalTree> taiZhang = new ArrayList<>();