【BUG】修复智能查询，历史故障，对锚在支柱没查到时直接返回空

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

@@ -2,7 +2,7 @@ package com.railway.web.controller.business.baseinfo;
 
 import com.railway.business.baseinfo.domain.BaseDeptStation;
 import com.railway.business.baseinfo.domain.BusFjxgmd;
-import com.railway.business.baseinfo.domain.vo.BusFjxgmdQueryVo;
+import com.railway.business.baseinfo.domain.vo.BusSmartQueryVo;
 import com.railway.business.baseinfo.service.IBaseStationService;
 import com.railway.business.baseinfo.service.IBusFjxgmdService;
 import com.railway.common.core.controller.BaseController;
@@ -10,11 +10,15 @@ import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.util.ArrayList;
-
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -80,15 +84,9 @@ public class BusFjxgmdController extends BaseController {
 
   @ApiOperation(value = "通过支柱信息获取对锚列表", notes = "通过支柱信息获取对锚列表,需要传查询条件", response = AjaxResult.class)
   @GetMapping("/getListByZz")
-  public TableDataInfo getListByZz(BusFjxgmdQueryVo busFjxgmdQueryVo) {
+  public TableDataInfo getListByZz(BusSmartQueryVo busSmartQueryVo) {
     startPage();
-    List<BusFjxgmd> list = new ArrayList<BusFjxgmd>();
-    if (busFjxgmdQueryVo != null && StringUtils.isNoneBlank(busFjxgmdQueryVo.getXingbie())
-        && busFjxgmdQueryVo.getLineId() != null) {
-      list = busFjxgmdService.getListByZz(busFjxgmdQueryVo);
-    } else {
-      list = busFjxgmdService.getList(new BusFjxgmd());
-    }
+    List<BusFjxgmd> list = busFjxgmdService.getListByZz(busSmartQueryVo);
     return getDataTable(list);
   }
 

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJlgzController.java

@@ -1,9 +1,9 @@
 package com.railway.web.controller.business.catenary;
 
 import com.railway.business.baseinfo.domain.BaseSubstation;
+import com.railway.business.baseinfo.domain.vo.BusSmartQueryVo;
 import com.railway.business.catenary.domain.BusJlgz;
 import com.railway.business.catenary.domain.vo.BusJlgzListByZzVo;
-import com.railway.business.catenary.domain.vo.BusJlgzQueryVo;
 import com.railway.business.catenary.domain.vo.JlgzLineVo;
 import com.railway.business.catenary.domain.vo.JlgzSubstationVo;
 import com.railway.business.catenary.service.IBusJlgzService;
@@ -77,8 +77,8 @@ public class BusJlgzController extends BaseController {
 
     @ApiOperation(value = "通过支柱信息获取历史故障统计", notes = "通过支柱信息获取历史故障统计", response = AjaxResult.class)
     @GetMapping("/getListByZz")
-    public AjaxResult getListByZz(BusJlgzQueryVo busJlgzQueryVo) {
-        List<BusJlgzListByZzVo> list = budJlgzService.getListByZz(busJlgzQueryVo);
+    public AjaxResult getListByZz(BusSmartQueryVo busSmartQueryVo) {
+        List<BusJlgzListByZzVo> list = budJlgzService.getListByZz(busSmartQueryVo);
         AjaxResult ajax = AjaxResult.success();
         ajax.put("info",list);
         return ajax;

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

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

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

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

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

@@ -2,14 +2,12 @@ package com.railway.business.baseinfo.service.impl;
 
 import com.railway.business.baseinfo.domain.BusFjxgmd;
 import com.railway.business.baseinfo.domain.BusZzdzxx;
-import com.railway.business.baseinfo.domain.vo.BusFjxgmdQueryVo;
 import com.railway.business.baseinfo.domain.vo.BusSmartQueryVo;
-import com.railway.business.baseinfo.mapper.BusZzdzxxMapper;
-import com.railway.common.enums.DelFlagEnum;
 import com.railway.business.baseinfo.mapper.BusFjxgmdMapper;
+import com.railway.business.baseinfo.mapper.BusZzdzxxMapper;
 import com.railway.business.baseinfo.service.IBusFjxgmdService;
+import com.railway.common.enums.DelFlagEnum;
 import com.railway.common.utils.SecurityUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -88,31 +86,17 @@ public class BusFjxgmdServiceImpl implements IBusFjxgmdService{
 
     /**
      * 通过支柱信息获取对锚列表
-     * @param busFjxgmdQueryVo
+     * @param busSmartQueryVo
      * @return
      */
     @Override
-    public List<BusFjxgmd> getListByZz(BusFjxgmdQueryVo busFjxgmdQueryVo) {
-        if (StringUtils.isBlank(busFjxgmdQueryVo.getPillarArea())) {
-            busFjxgmdQueryVo.setPillarArea("500");
+    public List<BusFjxgmd> getListByZz(BusSmartQueryVo busSmartQueryVo) {
+        if (busSmartQueryVo.getPillarArea() == null) {
+            busSmartQueryVo.setPillarArea("500");
         }
-        // 有站场区间，支柱号 查询支柱公里标
-        if (StringUtils.isNoneBlank(busFjxgmdQueryVo.getPillarCode())
-            && busFjxgmdQueryVo.getStationId() != null) {
-            BusSmartQueryVo vo = new BusSmartQueryVo();
-            vo.setPillarCode(busFjxgmdQueryVo.getPillarCode());
-            vo.setStationId(busFjxgmdQueryVo.getStationId());
-            vo.setLineId(busFjxgmdQueryVo.getLineId());
-            vo.setXingbie(busFjxgmdQueryVo.getXingbie());
-            List<BusZzdzxx> zzList = busZzdzxxMapper.smartQuery(vo);
-            if (zzList != null && zzList.size() == 1) {
-                BusZzdzxx zz = zzList.get(0);
-                busFjxgmdQueryVo.setMarker(zz.getMarker());
-                return busFjxgmdMapper.getListByZz(busFjxgmdQueryVo);
-            }
-            else {
-                return new ArrayList<BusFjxgmd>();
-            }
+        List<BusZzdzxx> zzList = busZzdzxxMapper.smartQuery(busSmartQueryVo);
+        if (zzList != null && zzList.size() == 1) {
+            return busFjxgmdMapper.getListByZz(busSmartQueryVo);
         }
         else {
             return new ArrayList<BusFjxgmd>();

railway-business/src/main/java/com/railway/business/catenary/mapper/BusJlgzMapper.java

@@ -1,9 +1,9 @@
 package com.railway.business.catenary.mapper;
 
 import com.github.pagehelper.Page;
+import com.railway.business.baseinfo.domain.vo.BusSmartQueryVo;
 import com.railway.business.catenary.domain.BusJlgz;
 import com.railway.business.catenary.domain.vo.BusJlgzListByZzVo;
-import com.railway.business.catenary.domain.vo.BusJlgzQueryVo;
 import com.railway.business.catenary.domain.vo.JlgzLineVo;
 import com.railway.business.catenary.domain.vo.JlgzSubstationVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -46,7 +46,7 @@ public interface BusJlgzMapper {
     */
     Page<BusJlgz> getList(BusJlgz busJlgz);
 
-    List<BusJlgzListByZzVo> getListByZz(@Param("query") BusJlgzQueryVo busJlgzQueryVo);
+    List<BusJlgzListByZzVo> getListByZz(@Param("query") BusSmartQueryVo busSmartQueryVo);
 
     List<JlgzLineVo> getJlgzLine();
 

railway-business/src/main/java/com/railway/business/catenary/service/IBusJlgzService.java

@@ -1,8 +1,8 @@
 package com.railway.business.catenary.service;
 
+import com.railway.business.baseinfo.domain.vo.BusSmartQueryVo;
 import com.railway.business.catenary.domain.BusJlgz;
 import com.railway.business.catenary.domain.vo.BusJlgzListByZzVo;
-import com.railway.business.catenary.domain.vo.BusJlgzQueryVo;
 import com.railway.business.catenary.domain.vo.JlgzLineVo;
 import com.railway.business.catenary.domain.vo.JlgzSubstationVo;
 
@@ -41,10 +41,10 @@ public interface IBusJlgzService {
 
     /**
      * 智能查询-历史故障统计
-     * @param busJlgzQueryVo
+     * @param busSmartQueryVo
      * @return
      */
-    List<BusJlgzListByZzVo> getListByZz(BusJlgzQueryVo busJlgzQueryVo);
+    List<BusJlgzListByZzVo> getListByZz(BusSmartQueryVo busSmartQueryVo);
 
     /**
      * 获取记录故障的线别

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJlgzServiceImpl.java

@@ -6,16 +6,17 @@ import com.railway.business.baseinfo.mapper.BusZzdzxxMapper;
 import com.railway.business.catenary.domain.BusJlgz;
 import com.railway.business.catenary.domain.BusJlgzPic;
 import com.railway.business.catenary.domain.vo.BusJlgzListByZzVo;
-import com.railway.business.catenary.domain.vo.BusJlgzQueryVo;
 import com.railway.business.catenary.domain.vo.JlgzLineVo;
 import com.railway.business.catenary.domain.vo.JlgzSubstationVo;
 import com.railway.business.catenary.mapper.BusJlgzMapper;
 import com.railway.business.catenary.mapper.BusJlgzPicMapper;
 import com.railway.business.catenary.service.IBusJlgzService;
+import com.railway.common.core.domain.entity.SysDictData;
 import com.railway.common.enums.DelFlagEnum;
 import com.railway.common.utils.SecurityUtils;
 import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.sql.SqlUtil;
+import com.railway.system.mapper.SysDictDataMapper;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,11 +36,13 @@ public class BusJlgzServiceImpl implements IBusJlgzService {
 	private final BusJlgzMapper busJlgzMapper;
 	private final BusJlgzPicMapper busJlgzPicMapper;
 	private final BusZzdzxxMapper busZzdzxxMapper;
+	private final SysDictDataMapper sysDictDataMapper;
 
-	public BusJlgzServiceImpl(BusJlgzMapper busJlgzMapper, BusJlgzPicMapper busJlgzPicMapper, BusZzdzxxMapper busZzdzxxMapper) {
+	public BusJlgzServiceImpl(BusJlgzMapper busJlgzMapper, BusJlgzPicMapper busJlgzPicMapper, BusZzdzxxMapper busZzdzxxMapper, SysDictDataMapper sysDictDataMapper) {
 		this.busJlgzMapper = busJlgzMapper;
 		this.busJlgzPicMapper = busJlgzPicMapper;
 		this.busZzdzxxMapper = busZzdzxxMapper;
+		this.sysDictDataMapper = sysDictDataMapper;
 	}
 
 	/**
@@ -153,30 +156,25 @@ public class BusJlgzServiceImpl implements IBusJlgzService {
 	}
 
 	@Override
-	public List<BusJlgzListByZzVo> getListByZz(BusJlgzQueryVo busJlgzQueryVo) {
-		if (busJlgzQueryVo.getPillarArea() == null) {
-			busJlgzQueryVo.setPillarArea("500");
+	public List<BusJlgzListByZzVo> getListByZz(BusSmartQueryVo busSmartQueryVo) {
+		if (busSmartQueryVo.getPillarArea() == null) {
+			busSmartQueryVo.setPillarArea("500");
 		}
-		// 有站场区间，支柱号 查询支柱公里标
-		if (StringUtils.isNoneBlank(busJlgzQueryVo.getPillarCode())
-				&& busJlgzQueryVo.getStationId() != null) {
-			BusSmartQueryVo vo = new BusSmartQueryVo();
-			vo.setPillarCode(busJlgzQueryVo.getPillarCode());
-			vo.setStationId(busJlgzQueryVo.getStationId());
-			vo.setLineId(busJlgzQueryVo.getLineId());
-			vo.setXingbie(busJlgzQueryVo.getXingbie());
-			List<BusZzdzxx> zzList = busZzdzxxMapper.smartQuery(vo);
-			if(zzList != null && zzList.size() == 1){
-				BusZzdzxx zz = zzList.get(0);
-				busJlgzQueryVo.setMarker(zz.getMarker());
-				return busJlgzMapper.getListByZz(busJlgzQueryVo);
-			}
-			else {
-				return new ArrayList<BusJlgzListByZzVo>();
-			}
+		List<BusZzdzxx> zzList = busZzdzxxMapper.smartQuery(busSmartQueryVo);
+		if(zzList != null && zzList.size() == 1){
+			return busJlgzMapper.getListByZz(busSmartQueryVo);
 		}
 		else {
-			return new ArrayList<BusJlgzListByZzVo>();
+			List<BusJlgzListByZzVo> list = new ArrayList<BusJlgzListByZzVo>();
+			List<SysDictData> gzyy = sysDictDataMapper.selectDictDataByType("gzyy");
+			for (SysDictData d : gzyy) {
+				BusJlgzListByZzVo vo = new BusJlgzListByZzVo();
+				vo.setYylx(d.getDictValue());
+				vo.setYylxText(d.getDictLabel());
+				vo.setTotal(0);
+				list.add(vo);
+			}
+			return list;
 		}
 	}