【CHG】修改智能查询对锚。

railway-admin/src/main/java/com/railway/web/controller/business/baseinfo/BusFjxgmdController.java

@@ -1,6 +1,7 @@
 package com.railway.web.controller.business.baseinfo;
 
 import com.railway.business.baseinfo.domain.BusFjxgmd;
+import com.railway.business.baseinfo.domain.vo.BusFjxgmdQueryVo;
 import com.railway.business.baseinfo.service.IBusFjxgmdService;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
@@ -68,15 +69,15 @@ public class BusFjxgmdController extends BaseController {
 
     @ApiOperation(value = "通过支柱信息获取对锚列表", notes = "通过支柱信息获取对锚列表,需要传查询条件", response = AjaxResult.class)
     @GetMapping("/getListByZz")
-    public TableDataInfo getListByZz(BusFjxgmd busFjxgmd) {
+    public TableDataInfo getListByZz(BusFjxgmdQueryVo busFjxgmdQueryVo) {
         startPage();
         List<BusFjxgmd> list = new ArrayList<BusFjxgmd>();
-        if (busFjxgmd != null && StringUtils.isNoneBlank(busFjxgmd.getXingbie())
-                && StringUtils.isNoneBlank(busFjxgmd.getLineId())) {
-            list = busFjxgmdService.getListByZz(busFjxgmd);
+        if (busFjxgmdQueryVo != null && StringUtils.isNoneBlank(busFjxgmdQueryVo.getXingbie())
+                && busFjxgmdQueryVo.getLineId() != null) {
+            list = busFjxgmdService.getListByZz(busFjxgmdQueryVo);
         }
         else {
-            list = busFjxgmdService.getList(busFjxgmd);
+            list = busFjxgmdService.getList(new BusFjxgmd());
         }
         return getDataTable(list);
     }

railway-business/src/main/java/com/railway/business/baseinfo/domain/vo/BusFjxgmdQueryVo.java

@@ -0,0 +1,33 @@
+package com.railway.business.baseinfo.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 智能查询-对锚查询
+ */
+@Data
+public class BusFjxgmdQueryVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "部门id")
+    private String deptId;
+
+    @ApiModelProperty(value = "线路id")
+    private Long lineId;
+
+    @ApiModelProperty(value = "行别")
+    private String xingbie;
+
+    @ApiModelProperty(value = "支柱号")
+    private String pillarCode;
+
+    @ApiModelProperty(value = "公里标")
+    private String marker;
+
+    @ApiModelProperty(value = "支柱范围")
+    private String pillarArea;
+}

railway-business/src/main/java/com/railway/business/baseinfo/mapper/BusFjxgmdMapper.java

@@ -2,6 +2,7 @@ package com.railway.business.baseinfo.mapper;
 
 import com.github.pagehelper.Page;
 import com.railway.business.baseinfo.domain.BusFjxgmd;
+import com.railway.business.baseinfo.domain.vo.BusFjxgmdQueryVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -43,8 +44,8 @@ public interface BusFjxgmdMapper {
 
     /**
      * 通过支柱信息获取对锚列表
-     * @param busFjxgmd
+     * @param busFjxgmdQueryVo
      * @return
      */
-    List<BusFjxgmd> getListByZz(@Param("query") BusFjxgmd busFjxgmd);
+    List<BusFjxgmd> getListByZz(@Param("query") BusFjxgmdQueryVo busFjxgmdQueryVo);
 }

railway-business/src/main/java/com/railway/business/baseinfo/service/IBusFjxgmdService.java

@@ -1,6 +1,7 @@
 package com.railway.business.baseinfo.service;
 
 import com.railway.business.baseinfo.domain.BusFjxgmd;
+import com.railway.business.baseinfo.domain.vo.BusFjxgmdQueryVo;
 
 import java.util.List;
 
@@ -41,8 +42,8 @@ public interface IBusFjxgmdService {
 
     /**
      * 通过支柱信息获取对锚列表
-     * @param busFjxgmd
+     * @param busFjxgmdQueryVo
      * @return
      */
-    List<BusFjxgmd> getListByZz(BusFjxgmd busFjxgmd);
+    List<BusFjxgmd> getListByZz(BusFjxgmdQueryVo busFjxgmdQueryVo);
 }

railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BusFjxgmdServiceImpl.java

@@ -1,6 +1,7 @@
 package com.railway.business.baseinfo.service.impl;
 
 import com.railway.business.baseinfo.domain.BusFjxgmd;
+import com.railway.business.baseinfo.domain.vo.BusFjxgmdQueryVo;
 import com.railway.common.enums.DelFlagEnum;
 import com.railway.business.baseinfo.mapper.BusFjxgmdMapper;
 import com.railway.business.baseinfo.service.IBusFjxgmdService;
@@ -80,14 +81,14 @@ public class BusFjxgmdServiceImpl implements IBusFjxgmdService{
 
     /**
      * 通过支柱信息获取对锚列表
-     * @param busFjxgmd 支柱信息
-     * @return 对锚列表
+     * @param busFjxgmdQueryVo
+     * @return
      */
     @Override
-    public List<BusFjxgmd> getListByZz(BusFjxgmd busFjxgmd) {
-        if (busFjxgmd.getPillarArea() == null) {
-            busFjxgmd.setPillarArea("500");
+    public List<BusFjxgmd> getListByZz(BusFjxgmdQueryVo busFjxgmdQueryVo) {
+        if (busFjxgmdQueryVo.getPillarArea() == null) {
+            busFjxgmdQueryVo.setPillarArea("500");
         }
-        return busFjxgmdMapper.getListByZz(busFjxgmd);
+        return busFjxgmdMapper.getListByZz(busFjxgmdQueryVo);
     }
 }

railway-business/src/main/resources/mapper/baseinfo/BusFjxgmdMapper.xml

@@ -243,36 +243,31 @@
       WHERE a.del_flag = '0'
     ) D ,
     (
-      SELECT zzdzxx.pillar_code
-      FROM base_pillar zzdzxx,
-      (
         SELECT zz.id,
           zz.pillar_code,
           zz.marker
         FROM base_pillar zz
         LEFT JOIN v_station v ON zz.station_id = v.station_id
         WHERE 1 = 1
-        <if test="query.qsgh != null and query.qsgh != ''">
-          AND zz.pillar_code = #{query.qsgh}
-        </if>
-        <if test="query.qsglb != null and query.qsglb != ''">
-          AND zz.marker = #{query.qsglb}
-        </if>
+
         <if test="query.deptId != null and query.deptId != ''">
           AND v.dept_id = #{query.deptId}
         </if>
         <if test="query.lineId != null and query.lineId != ''">
           AND v.line_id = #{query.lineId}
         </if>
-        <if test="query.stationId != null and query.stationId != ''">
-          AND v.station_id = #{query.stationId}
-        </if>
         <if test="query.xingbie != null and query.xingbie != ''">
           AND zz.xingbie = #{query.xingbie}
         </if>
-      ) B
-      WHERE (zzdzxx.marker + 0.0) BETWEEN (B.marker + 0.0) - (#{query.pillarArea} + 0.0) AND (B.marker + 0.0) +
-      (#{query.pillarArea} + 0.0)
+        <if test="query.pillarCode != null and query.pillarCode != ''">
+          AND zz.pillar_code = #{query.pillarCode}
+        </if>
+        <if test="query.marker != null and query.marker != ''">
+          AND zz.marker = #{query.marker}
+        </if>
+
+        AND (zz.marker + 0.0) BETWEEN (zz.marker + 0.0) - (#{query.pillarArea} + 0.0)
+        AND (zz.marker + 0.0) + (#{query.pillarArea} + 0.0)
     ) H
     WHERE D.qsgh = H.pillar_code
     ORDER BY (D.qsgh + 0)