Merge remote-tracking branch 'origin/master'

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

@@ -1,23 +1,18 @@
 package com.railway.web.controller.business.baseinfo;
 
+import com.railway.business.baseinfo.domain.BaseSubstation;
+import com.railway.business.baseinfo.domain.vo.BaseDeptSubstationVo;
+import com.railway.business.baseinfo.service.IBaseSubstationService;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
-import com.railway.business.baseinfo.domain.BaseSubstation;
-import com.railway.business.baseinfo.service.IBaseSubstationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.util.List;
-import javax.validation.Valid;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-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.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * @author zhaomn
@@ -69,4 +64,12 @@ public class BaseSubstationController extends BaseController {
     return getDataTable(list);
   }
 
+  @ApiOperation(value = "通过线别id查询变电所列表")
+  @GetMapping(value = "getDeptSubList")
+  public TableDataInfo getDeptSubList(BaseSubstation baseSubstation) {
+    startPage();
+    List<BaseDeptSubstationVo> list = busSubstationService.getDeptSubList(baseSubstation.getLineId());
+    return getDataTable(list);
+  }
+
 }

railway-business/src/main/java/com/railway/business/baseinfo/domain/BaseSubstation.java

@@ -27,7 +27,7 @@ public class BaseSubstation extends BaseEntity {
   private String deptName;
 
   @ApiModelProperty(value = "line_id")
-  private Integer lineId;
+  private Long lineId;
 
   @ApiModelProperty(value = "line_name")
   @Length(min = 1, max = 255, message = "【line_name】长度必须介于 {min} 和 {max} 之间")

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

@@ -0,0 +1,15 @@
+package com.railway.business.baseinfo.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class BaseDeptSubstationVo {
+
+    private Long substationId;
+
+    private String substationName;
+
+    private Long lineId;
+
+    private String lineName;
+}

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

@@ -2,6 +2,7 @@ package com.railway.business.baseinfo.mapper;
 
 import com.github.pagehelper.Page;
 import com.railway.business.baseinfo.domain.BaseSubstation;
+import com.railway.business.baseinfo.domain.vo.BaseDeptSubstationVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -41,4 +42,11 @@ public interface BaseSubstationMapper {
    */
   Page<BaseSubstation> getList(BaseSubstation baseSubstation);
 
+  /**
+   *
+   * @param lineId
+   * @return
+   */
+  Page<BaseDeptSubstationVo> getDeptSubList(@Param("lineId") Long lineId);
+
 }

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

@@ -1,6 +1,8 @@
 package com.railway.business.baseinfo.service;
 
 import com.railway.business.baseinfo.domain.BaseSubstation;
+import com.railway.business.baseinfo.domain.vo.BaseDeptSubstationVo;
+
 import java.util.List;
 
 /**
@@ -36,4 +38,5 @@ public interface IBaseSubstationService {
    */
   List<BaseSubstation> getList(BaseSubstation baseSubstation);
 
+  List<BaseDeptSubstationVo> getDeptSubList(Long lineId);
 }

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

@@ -1,6 +1,7 @@
 package com.railway.business.baseinfo.service.impl;
 
 import com.railway.business.baseinfo.domain.BaseSubstation;
+import com.railway.business.baseinfo.domain.vo.BaseDeptSubstationVo;
 import com.railway.business.baseinfo.mapper.BaseSubstationMapper;
 import com.railway.business.baseinfo.service.IBaseSubstationService;
 import com.railway.common.utils.SecurityUtils;
@@ -76,4 +77,9 @@ public class BaseSubstationServiceImpl implements IBaseSubstationService {
   public List<BaseSubstation> getList(BaseSubstation baseSubstation) {
     return baseSubstationMapper.getList(baseSubstation);
   }
+
+  @Override
+  public List<BaseDeptSubstationVo> getDeptSubList(Long lineId) {
+    return baseSubstationMapper.getDeptSubList(lineId);
+  }
 }

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

@@ -239,4 +239,22 @@
     </where>
   </select>
 
+  <select id="getDeptSubList" resultType="com.railway.business.baseinfo.domain.vo.BaseDeptSubstationVo">
+    SELECT
+      bdsu.substation_id AS substationId,
+      bsu.substation_name AS substationName,
+      bdsu.line_id AS lineId,
+      bl.line_name AS lineName
+    FROM
+      base_dept_substation bdsu
+        LEFT JOIN base_substation bsu ON bdsu.substation_id = bsu.substation_id
+        LEFT JOIN base_line bl on bdsu.line_id = bl.line_id
+    <where>
+      <if test="lineId!=null and lineId!=''">
+        bdsu.line_id = #{lineId}
+      </if>
+    </where>
+    ORDER BY bdsu.line_id
+  </select>
+
 </mapper>

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

@@ -222,6 +222,8 @@
 
       SELECT
         a.id,
+        v.dept_id,
+        v.dept_name,
         v.line_name,
         v.station_name,
         a.qsgh,
@@ -229,17 +231,20 @@
         a.station_id,
         a.xingbie,
         a.fjlx,
+        dict1.dict_label as xingbie_text,
         dict2.dict_label AS fjlx_text,
         ${query.pillarArea} AS pillar_area
       FROM base_fjxgmd a
       LEFT JOIN v_station v ON a.station_id = v.dept_station_id
+      LEFT JOIN sys_dict_data dict1 ON (a.xingbie = dict1.dict_value AND dict1.dict_type = 'xingbie')
       LEFT JOIN sys_dict_data dict2 ON (a.fjlx = dict2.dict_value AND dict2.dict_type = 'fjlx')
       WHERE a.del_flag = '0'
+            and dict1.status =  '0'
+            and dict2.status =  '0'
       <if test="query.lineId != null and query.lineId != ''">
         AND v.line_id = #{query.lineId}
       </if>
       <if test="query.xingbie != null and query.xingbie != ''">
-        AND v.xingbie = #{query.xingbie}
         AND a.xingbie = #{query.xingbie}
       </if>
       <if test="query.marker != null and query.marker != ''">