1.调整变电站台账模糊搜索功能

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

@@ -533,4 +533,13 @@ public class LineController extends BaseController {
         List<ReportLineInfoVo> result = lineService.getReportLineInfo(ids);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("根据监测点名称和电网侧变电站名称模糊搜索")
+    @PostMapping("/getByName")
+    HttpResult<List<LineDetail>> getByName(@RequestParam("name") String name){
+        String methodDescribe = getMethodDescribe("getByName");
+        List<LineDetail> list = lineService.getByName(name);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
 }

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

@@ -557,4 +557,7 @@ public interface LineMapper extends BaseMapper<Line> {
     List<ReportLineInfoVo> getReportLineInfo(@Param("ids")List<String> ids);
 
     List<Line> getSubByCondition(@Param("subIds") List<String> subIds, @Param("scale") List<SimpleDTO> scale);
+
+    List<LineDetail> selectByName(@Param("name") String name);
+
 }

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

@@ -1744,4 +1744,18 @@
             </foreach>
         </if>
     </select>
+    <select id="selectByName" resultType="com.njcn.device.pq.pojo.po.LineDetail">
+        select
+            t2.*
+        from
+            pq_line t1 ,
+            pq_line_detail t2
+        <where>
+            t1.id = t2.id
+            <if test="name!=null and name!=''">
+                AND (t1.name like CONCAT('%', #{name}, '%') or t2.Power_Substation_Name like CONCAT('%', #{name}, '%'))
+            </if>
+
+        </where>
+    </select>
 </mapper>

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

@@ -13,6 +13,7 @@ import com.njcn.device.pq.pojo.param.PqsParam;
 import com.njcn.device.pq.pojo.param.TerminalMainQueryParam;
 import com.njcn.device.pq.pojo.po.Line;
 import com.njcn.device.biz.pojo.po.Overlimit;
+import com.njcn.device.pq.pojo.po.LineDetail;
 import com.njcn.device.pq.pojo.po.TopMsgPO;
 import com.njcn.device.pq.pojo.vo.*;
 import com.njcn.web.pojo.param.BaseParam;
@@ -224,4 +225,6 @@ public interface LineService extends IService<Line> {
     List<LineDetailVO.noDataLineInfo> getNoDataLine();
 
     List<ReportLineInfoVo> getReportLineInfo(List<String> ids);
+
+    List<LineDetail> getByName(String name);
 }

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

@@ -694,6 +694,11 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
         return this.baseMapper.getReportLineInfo(ids);
     }
 
+    @Override
+    public List<LineDetail> getByName(String name) {
+        return this.baseMapper.selectByName(name);
+    }
+
     @Override
     public List<Overlimit> getOverLimitByList(PollutionParamDTO pollutionParamDTO) {
         return overlimitMapper.selectBatchIds(pollutionParamDTO.getLineList());