Explorar el Código

【ADD】基础数据接口

ZhaoMn hace 4 años
padre
commit
68861eef58
Se han modificado 36 ficheros con 1950 adiciones y 27 borrados
  1. 68 0
      railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusInspectListController.java
  2. 1 1
      railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbDmcgyqController.java
  3. 1 1
      railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbFdfxjyqController.java
  4. 1 1
      railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbGlkgController.java
  5. 72 0
      railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusLineController.java
  6. 72 0
      railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusStationController.java
  7. 72 0
      railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusSubstationController.java
  8. 1 1
      railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusZzdzxxController.java
  9. 1 1
      railway-admin/src/main/java/com/railway/web/controller/common/CaptchaController.java
  10. 0 4
      railway-admin/src/main/java/com/railway/web/controller/monitor/CacheController.java
  11. 0 4
      railway-admin/src/main/java/com/railway/web/controller/monitor/ServerController.java
  12. 4 1
      railway-admin/src/main/java/com/railway/web/controller/monitor/SysOperlogController.java
  13. 0 2
      railway-admin/src/main/java/com/railway/web/controller/monitor/SysUserOnlineController.java
  14. 10 1
      railway-admin/src/main/java/com/railway/web/controller/system/SysDeptController.java
  15. 1 1
      railway-admin/src/main/java/com/railway/web/controller/system/SysDictDataController.java
  16. 1 1
      railway-admin/src/main/java/com/railway/web/controller/system/SysDictTypeController.java
  17. 1 1
      railway-admin/src/main/java/com/railway/web/controller/system/SysLoginController.java
  18. 1 1
      railway-admin/src/main/java/com/railway/web/controller/system/SysPostController.java
  19. 1 1
      railway-admin/src/main/java/com/railway/web/controller/system/SysUserController.java
  20. 100 0
      railway-business/src/main/java/com/railway/business/catenary/domain/BusLine.java
  21. 66 0
      railway-business/src/main/java/com/railway/business/catenary/domain/BusStation.java
  22. 72 0
      railway-business/src/main/java/com/railway/business/catenary/domain/BusSubstation.java
  23. 44 0
      railway-business/src/main/java/com/railway/business/catenary/mapper/BusLineMapper.java
  24. 44 0
      railway-business/src/main/java/com/railway/business/catenary/mapper/BusStationMapper.java
  25. 44 0
      railway-business/src/main/java/com/railway/business/catenary/mapper/BusSubstationMapper.java
  26. 39 0
      railway-business/src/main/java/com/railway/business/catenary/service/IBusLineService.java
  27. 39 0
      railway-business/src/main/java/com/railway/business/catenary/service/IBusStationService.java
  28. 39 0
      railway-business/src/main/java/com/railway/business/catenary/service/IBusSubstationService.java
  29. 79 0
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusLineServiceImpl.java
  30. 79 0
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusStationServiceImpl.java
  31. 79 0
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusSubstationServiceImpl.java
  32. 356 0
      railway-business/src/main/resources/mapper/business/BusLineMapper.xml
  33. 260 0
      railway-business/src/main/resources/mapper/business/BusStationMapper.xml
  34. 272 0
      railway-business/src/main/resources/mapper/business/BusSubstationMapper.xml
  35. 10 0
      railway-common/src/main/java/com/railway/common/core/domain/entity/SysDept.java
  36. 20 5
      railway-system/src/main/java/com/railway/system/domain/SysOperLog.java

+ 68 - 0
railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusInspectListController.java

@@ -0,0 +1,68 @@
+package com.railway.web.controller.business.catenary;
+
+
+import com.railway.business.catenary.domain.BusJcbDmcgyq;
+import com.railway.business.catenary.domain.BusJcbFdfxjyq;
+import com.railway.business.catenary.domain.BusJcbGlkg;
+import com.railway.business.catenary.service.IBusJcbDmcgyqService;
+import com.railway.business.catenary.service.IBusJcbFdfxjyqService;
+import com.railway.business.catenary.service.IBusJcbGlkgService;
+import com.railway.common.core.controller.BaseController;
+import com.railway.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 检查表记录
+ *
+ * @author railway
+ * @since 2021-10-11
+ */
+@Api(tags = "检查表 - 检查表记录")
+@RestController
+@RequestMapping(value = "business/catenary/bus/inspect")
+public class BusInspectListController extends BaseController {
+
+  private final IBusJcbFdfxjyqService busJcbFdfxjyqService;
+  private final IBusJcbGlkgService busJcbGlkgService;
+  private final IBusJcbDmcgyqService busJcbDmcgyqService;
+
+  public BusInspectListController(
+      IBusJcbFdfxjyqService busJcbFdfxjyqService,
+      IBusJcbGlkgService busJcbGlkgService,
+      IBusJcbDmcgyqService busJcbDmcgyqService) {
+    this.busJcbFdfxjyqService = busJcbFdfxjyqService;
+    this.busJcbGlkgService = busJcbGlkgService;
+    this.busJcbDmcgyqService = busJcbDmcgyqService;
+  }
+
+  @ApiOperation(value = "dxf分选绝缘器检查表")
+  @GetMapping(value = "listFdfxjyq")
+  public TableDataInfo listFdfxjyq(BusJcbFdfxjyq busJcbFdfxjyq) {
+    startPage();
+    List<BusJcbFdfxjyq> list = busJcbFdfxjyqService.getList(busJcbFdfxjyq);
+    return getDataTable(list);
+  }
+
+  @ApiOperation(value = "隔离开关检查表")
+  @GetMapping(value = "listGlkg")
+  public TableDataInfo listGlkg(BusJcbGlkg busJcbGlkg) {
+    startPage();
+    List<BusJcbGlkg> list = busJcbGlkgService.getList(busJcbGlkg);
+    return getDataTable(list);
+  }
+
+  @ApiOperation(value = "地面磁感应器")
+  @GetMapping(value = "/listDmcgyq")
+  public TableDataInfo listDmcgyq(BusJcbDmcgyq busJcbDmcgyq) {
+    startPage();
+    List<BusJcbDmcgyq> list = busJcbDmcgyqService.getList(busJcbDmcgyq);
+    return getDataTable(list);
+  }
+
+}
+

+ 1 - 1
railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbDmcgyqController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.util.List;
 
-@Api(value = "rest/bus/jcb/dmcgyq", tags = "检查表-地面磁感应器")
+@Api(value = "rest/bus/jcb/dmcgyq", tags = "检查表 - 地面磁感应器")
 @RestController
 @Validated
 @RequestMapping(value = "bus/jcb/dmcgyq")

+ 1 - 1
railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbFdfxjyqController.java

@@ -18,7 +18,7 @@ import java.util.List;
 
 import javax.validation.Valid;
 
-@Api(value = "rest/catenary/bus/jcb/fdfxjyq", tags = "dxf分选绝缘器检查表 ")
+@Api(value = "rest/catenary/bus/jcb/fdfxjyq", tags = "检查表 - dxf分选绝缘器检查表 ")
 @RestController
 @Validated
 @RequestMapping(value = "business/catenary/bus/jcb/fdfxjyq")

+ 1 - 1
railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbGlkgController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.util.List;
 
-@Api(value = "rest/catenary/bus/jcb/glkg", tags = "APP-隔离开关检查表")
+@Api(value = "rest/catenary/bus/jcb/glkg", tags = "检查表 - 隔离开关检查表")
 @RestController
 @Validated
 @RequestMapping(value = "business/catenary/bus/jcb/glkg")

+ 72 - 0
railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusLineController.java

@@ -0,0 +1,72 @@
+package com.railway.web.controller.business.catenary;
+
+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.catenary.domain.BusLine;
+import com.railway.business.catenary.service.IBusLineService;
+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;
+
+/**
+ * @author zhaomn
+ */
+@Api(tags = "基础管理 - 线路信息")
+@RestController
+@Validated
+@RequestMapping(value = "business/catenary/bus/line")
+public class BusLineController extends BaseController {
+
+  private final IBusLineService busLineService;
+
+  public BusLineController(IBusLineService busLineService) {
+    this.busLineService = busLineService;
+  }
+
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody BusLine busLine) {
+    return toAjax(busLineService.create(busLine));
+  }
+
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{lineIds}")
+  public AjaxResult delete(@RequestParam String[] lineIds) {
+    return toAjax(busLineService.delete(lineIds));
+  }
+
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid BusLine busLine) {
+    return toAjax(busLineService.update(busLine));
+  }
+
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{lineId}"})
+  public AjaxResult getInfo(String lineId) {
+    BusLine info = busLineService.getInfo(lineId);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
+
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(BusLine busLine) {
+    startPage();
+    List<BusLine> list = busLineService.getList(busLine);
+    return getDataTable(list);
+  }
+
+}

+ 72 - 0
railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusStationController.java

@@ -0,0 +1,72 @@
+package com.railway.web.controller.business.catenary;
+
+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.catenary.domain.BusStation;
+import com.railway.business.catenary.service.IBusStationService;
+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;
+
+/**
+ * @author zhaomn
+ */
+@Api(tags = "基础管理 - 区间站场信息")
+@RestController
+@Validated
+@RequestMapping(value = "business/catenary/bus/station")
+public class BusStationController extends BaseController {
+
+  private final IBusStationService busStationService;
+
+  public BusStationController(IBusStationService busStationService) {
+    this.busStationService = busStationService;
+  }
+
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody BusStation busStation) {
+    return toAjax(busStationService.create(busStation));
+  }
+
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{stationIds}")
+  public AjaxResult delete(@RequestParam String[] stationIds) {
+    return toAjax(busStationService.delete(stationIds));
+  }
+
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid BusStation busStation) {
+    return toAjax(busStationService.update(busStation));
+  }
+
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{stationId}"})
+  public AjaxResult getInfo(String stationId) {
+    BusStation info = busStationService.getInfo(stationId);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
+
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(BusStation busStation) {
+    startPage();
+    List<BusStation> list = busStationService.getList(busStation);
+    return getDataTable(list);
+  }
+
+}

+ 72 - 0
railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusSubstationController.java

@@ -0,0 +1,72 @@
+package com.railway.web.controller.business.catenary;
+
+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.catenary.domain.BusSubstation;
+import com.railway.business.catenary.service.IBusSubstationService;
+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;
+
+/**
+ * @author zhaomn
+ */
+@Api(tags = "基础管理 - 变电所信息")
+@RestController
+@Validated
+@RequestMapping(value = "business/catenary/bus/substation")
+public class BusSubstationController extends BaseController {
+
+  private final IBusSubstationService busSubstationService;
+
+  public BusSubstationController(IBusSubstationService busSubstationService) {
+    this.busSubstationService = busSubstationService;
+  }
+
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody BusSubstation busSubstation) {
+    return toAjax(busSubstationService.create(busSubstation));
+  }
+
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{substationIds}")
+  public AjaxResult delete(@RequestParam String[] substationIds) {
+    return toAjax(busSubstationService.delete(substationIds));
+  }
+
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid BusSubstation busSubstation) {
+    return toAjax(busSubstationService.update(busSubstation));
+  }
+
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{substationId}"})
+  public AjaxResult getInfo(String substationId) {
+    BusSubstation info = busSubstationService.getInfo(substationId);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
+
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(BusSubstation busSubstation) {
+    startPage();
+    List<BusSubstation> list = busSubstationService.getList(busSubstation);
+    return getDataTable(list);
+  }
+
+}

+ 1 - 1
railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusZzdzxxController.java

@@ -17,7 +17,7 @@ import java.util.List;
 
 import javax.validation.Valid;
 
-@Api(value = "rest/catenary/bus/zzdzxx", tags = "支柱吊柱信息")
+@Api(value = "rest/catenary/bus/zzdzxx", tags = "基础管理 - 支柱吊柱信息")
 @RestController
 @Validated
 @RequestMapping(value = "business/catenary/bus/zzdzxx")

+ 1 - 1
railway-admin/src/main/java/com/railway/web/controller/common/CaptchaController.java

@@ -27,7 +27,7 @@ import org.springframework.web.servlet.ModelAndView;
  *
  * @author railway
  */
-@Api(tags = "验证码")
+@Api(tags = "权限认证 - 验证码")
 @RestController
 public class CaptchaController extends BaseController {
 

+ 0 - 4
railway-admin/src/main/java/com/railway/web/controller/monitor/CacheController.java

@@ -2,8 +2,6 @@ package com.railway.web.controller.monitor;
 
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.utils.StringUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -22,7 +20,6 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author railway
  */
-@Api(tags = "缓存监控")
 @RestController
 @RequestMapping("/monitor/cache")
 public class CacheController {
@@ -34,7 +31,6 @@ public class CacheController {
     this.redisTemplate = redisTemplate;
   }
 
-  @ApiOperation(value = "获取缓存信息", notes = "获取缓存信息", response = AjaxResult.class)
   @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
   @GetMapping()
   public AjaxResult getInfo() {

+ 0 - 4
railway-admin/src/main/java/com/railway/web/controller/monitor/ServerController.java

@@ -3,8 +3,6 @@ package com.railway.web.controller.monitor;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.framework.web.domain.Server;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,12 +13,10 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author railway
  */
-@Api(tags = "服务器监控")
 @RestController
 @RequestMapping("/monitor/server")
 public class ServerController extends BaseController {
 
-  @ApiOperation(value = "获取服务器信息", notes = "获取服务器信息", response = AjaxResult.class)
   @PreAuthorize("@ss.hasPermi('monitor:server:list')")
   @GetMapping()
   public AjaxResult getInfo() throws Exception {

+ 4 - 1
railway-admin/src/main/java/com/railway/web/controller/monitor/SysOperlogController.java

@@ -9,6 +9,7 @@ import com.railway.common.utils.poi.ExcelUtil;
 import com.railway.system.domain.SysOperLog;
 import com.railway.system.service.ISysOperLogService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import java.util.List;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -22,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author railway
  */
-@Api(tags = "操作日志")
+@Api(tags = "系统管理 - 操作日志")
 @RestController
 @RequestMapping("/monitor/operlog")
 public class SysOperlogController extends BaseController {
@@ -33,6 +34,7 @@ public class SysOperlogController extends BaseController {
     this.operLogService = operLogService;
   }
 
+  @ApiOperation(value = "操作日志列表")
   @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
   @GetMapping("/list")
   public TableDataInfo list(SysOperLog operLog) {
@@ -41,6 +43,7 @@ public class SysOperlogController extends BaseController {
     return getDataTable(list);
   }
 
+  @ApiOperation(value = "导出操作日志")
   @Log(title = "操作日志", businessType = BusinessType.EXPORT)
   @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
   @GetMapping("/export")

+ 0 - 2
railway-admin/src/main/java/com/railway/web/controller/monitor/SysUserOnlineController.java

@@ -11,7 +11,6 @@ import com.railway.common.enums.BusinessType;
 import com.railway.common.utils.StringUtils;
 import com.railway.system.domain.SysUserOnline;
 import com.railway.system.service.ISysUserOnlineService;
-import io.swagger.annotations.Api;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -28,7 +27,6 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author railway
  */
-@Api(tags = "在线用户监控")
 @RestController
 @RequestMapping("/monitor/online")
 public class SysUserOnlineController extends BaseController {

+ 10 - 1
railway-admin/src/main/java/com/railway/web/controller/system/SysDeptController.java

@@ -9,6 +9,7 @@ import com.railway.common.enums.BusinessType;
 import com.railway.common.utils.StringUtils;
 import com.railway.system.service.ISysDeptService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import java.util.List;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -27,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author railway
  */
-@Api(tags = "部门")
+@Api(tags = "系统管理 - 部门管理")
 @RestController
 @RequestMapping("/system/dept")
 public class SysDeptController extends BaseController {
@@ -41,6 +42,7 @@ public class SysDeptController extends BaseController {
   /**
    * 获取部门列表
    */
+  @ApiOperation(value = "获取部门列表")
   @PreAuthorize("@ss.hasPermi('system:dept:list')")
   @GetMapping("/list")
   public AjaxResult list(SysDept dept) {
@@ -51,6 +53,7 @@ public class SysDeptController extends BaseController {
   /**
    * 查询部门列表(排除节点)
    */
+  @ApiOperation(value = "查询部门列表(排除节点)")
   @PreAuthorize("@ss.hasPermi('system:dept:list')")
   @GetMapping("/list/exclude/{deptId}")
   public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) {
@@ -63,6 +66,7 @@ public class SysDeptController extends BaseController {
   /**
    * 根据部门编号获取详细信息
    */
+  @ApiOperation(value = "根据部门编号获取详细信息")
   @PreAuthorize("@ss.hasPermi('system:dept:query')")
   @GetMapping(value = "/{deptId}")
   public AjaxResult getInfo(@PathVariable Long deptId) {
@@ -73,6 +77,7 @@ public class SysDeptController extends BaseController {
   /**
    * 获取部门下拉树列表
    */
+  @ApiOperation(value = "获取部门下拉树列表")
   @GetMapping("/treeselect")
   public AjaxResult treeselect(SysDept dept) {
     List<SysDept> depts = deptService.selectDeptList(dept);
@@ -82,6 +87,7 @@ public class SysDeptController extends BaseController {
   /**
    * 加载对应角色部门列表树
    */
+  @ApiOperation(value = "加载对应角色部门列表树")
   @GetMapping(value = "/roleDeptTreeselect/{roleId}")
   public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId) {
     List<SysDept> depts = deptService.selectDeptList(new SysDept());
@@ -94,6 +100,7 @@ public class SysDeptController extends BaseController {
   /**
    * 新增部门
    */
+  @ApiOperation(value = "新增部门")
   @PreAuthorize("@ss.hasPermi('system:dept:add')")
   @Log(title = "部门管理", businessType = BusinessType.INSERT)
   @PostMapping
@@ -108,6 +115,7 @@ public class SysDeptController extends BaseController {
   /**
    * 修改部门
    */
+  @ApiOperation(value = "修改部门")
   @PreAuthorize("@ss.hasPermi('system:dept:edit')")
   @Log(title = "部门管理", businessType = BusinessType.UPDATE)
   @PutMapping
@@ -127,6 +135,7 @@ public class SysDeptController extends BaseController {
   /**
    * 删除部门
    */
+  @ApiOperation(value = "删除部门")
   @PreAuthorize("@ss.hasPermi('system:dept:remove')")
   @Log(title = "部门管理", businessType = BusinessType.DELETE)
   @DeleteMapping("/{deptId}")

+ 1 - 1
railway-admin/src/main/java/com/railway/web/controller/system/SysDictDataController.java

@@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author railway
  */
-@Api(tags = "数据字典")
+@Api(tags = "系统管理 - 字典管理")
 @RestController
 @RequestMapping("/system/dict/data")
 public class SysDictDataController extends BaseController {

+ 1 - 1
railway-admin/src/main/java/com/railway/web/controller/system/SysDictTypeController.java

@@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author railway
  */
-@Api(tags = "数据字典类型")
+@Api(tags = "系统管理 - 字典类型管理")
 @RestController
 @RequestMapping("/system/dict/type")
 public class SysDictTypeController extends BaseController {

+ 1 - 1
railway-admin/src/main/java/com/railway/web/controller/system/SysLoginController.java

@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author railway
  */
-@Api(tags = "登录验证")
+@Api(tags = "权限认证 - 登录验证")
 @RestController
 public class SysLoginController {
 

+ 1 - 1
railway-admin/src/main/java/com/railway/web/controller/system/SysPostController.java

@@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author railway
  */
-@Api(tags = "岗位信息")
+@Api(tags = "系统管理 - 职务管理")
 @RestController
 @RequestMapping("/system/post")
 public class SysPostController extends BaseController {

+ 1 - 1
railway-admin/src/main/java/com/railway/web/controller/system/SysUserController.java

@@ -35,7 +35,7 @@ import org.springframework.web.multipart.MultipartFile;
  *
  * @author railway
  */
-@Api(tags = "用户信息")
+@Api(tags = "系统管理 - 用户管理")
 @RestController
 @RequestMapping("/system/user")
 public class SysUserController extends BaseController {

+ 100 - 0
railway-business/src/main/java/com/railway/business/catenary/domain/BusLine.java

@@ -0,0 +1,100 @@
+package com.railway.business.catenary.domain;
+
+import com.railway.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+/**
+ * @author railway
+ */
+@Data
+@ApiModel("线路信息")
+@EqualsAndHashCode(callSuper = true)
+public class BusLine extends BaseEntity {
+
+  @ApiModelProperty(value = "主键", hidden = true)
+  private String lineId;
+
+  @ApiModelProperty(value = "资产所属单位id")
+  private Long deptId;
+
+  @ApiModelProperty(value = "车间名称(冗余)")
+  @Length(min = 1, max = 30, message = "【车间名称(冗余)】长度必须介于 {min} 和 {max} 之间")
+  private String deptName;
+
+  @ApiModelProperty(value = "线路名称")
+  @Length(min = 1, max = 30, message = "【线路名称】长度必须介于 {min} 和 {max} 之间")
+  private String lineName;
+
+  @ApiModelProperty(value = "速度等级")
+  @Length(min = 1, max = 20, message = "【速度等级】长度必须介于 {min} 和 {max} 之间")
+  private String lineSddj;
+
+  @ApiModelProperty(value = "线路类型")
+  @Length(min = 1, max = 20, message = "【线路类型】长度必须介于 {min} 和 {max} 之间")
+  private String lineType;
+
+  @ApiModelProperty(value = "线路等级")
+  @Length(min = 1, max = 20, message = "【线路等级】长度必须介于 {min} 和 {max} 之间")
+  private String lineDj;
+
+  @ApiModelProperty(value = "电化开通日期")
+  @Length(min = 1, max = 20, message = "【电化开通日期】长度必须介于 {min} 和 {max} 之间")
+  private String lineKtrq;
+
+  @ApiModelProperty(value = "运营里程")
+  @Length(min = 1, max = 20, message = "【运营里程】长度必须介于 {min} 和 {max} 之间")
+  private String lineYylc;
+
+  @ApiModelProperty(value = "开始公里标(冗余)")
+  @Length(min = 1, max = 32, message = "【开始公里标(冗余)】长度必须介于 {min} 和 {max} 之间")
+  private String lineStartMarker;
+
+  @ApiModelProperty(value = "结束公里标(冗余)")
+  @Length(min = 1, max = 32, message = "【结束公里标(冗余)】长度必须介于 {min} 和 {max} 之间")
+  private String lineEndMarker;
+
+  @ApiModelProperty(value = "上行起始公里标")
+  private Integer upStartMarker;
+
+  @ApiModelProperty(value = "上行结束公里标")
+  private Integer upEndMarker;
+
+  @ApiModelProperty(value = "下行起始公里标")
+  private Integer downStartMarker;
+
+  @ApiModelProperty(value = "下行结束公里标")
+  private Integer downEndMarker;
+
+  @ApiModelProperty(value = "供电方式")
+  @Length(min = 1, max = 20, message = "【供电方式】长度必须介于 {min} 和 {max} 之间")
+  private String lineGdfs;
+
+  @ApiModelProperty(value = "悬挂类型")
+  @Length(min = 1, max = 20, message = "【悬挂类型】长度必须介于 {min} 和 {max} 之间")
+  private String lineXglx;
+
+  @ApiModelProperty(value = "其他")
+  @Length(min = 1, max = 255, message = "【其他】长度必须介于 {min} 和 {max} 之间")
+  private String lineQt;
+
+  @ApiModelProperty(value = "数据编号")
+  @Length(min = 1, max = 255, message = "【数据编号】长度必须介于 {min} 和 {max} 之间")
+  private String lineSjbh;
+
+  @ApiModelProperty(value = "显示顺序")
+  private Integer orderNum;
+
+  @ApiModelProperty(value = "线路状态(0正常 1停用)")
+  @Length(min = 1, max = 1, message = "【线路状态(0正常 1停用)】长度必须介于 {min} 和 {max} 之间")
+  private String status;
+
+  @ApiModelProperty(value = "删除标志(0代表存在 1代表删除)")
+  @Length(min = 1, max = 1, message = "【删除标志(0代表存在 1代表删除)】长度必须介于 {min} 和 {max} 之间")
+  private String delFlag;
+
+}

+ 66 - 0
railway-business/src/main/java/com/railway/business/catenary/domain/BusStation.java

@@ -0,0 +1,66 @@
+package com.railway.business.catenary.domain;
+
+import com.railway.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+/**
+ * @author railway
+ */
+@Data
+@ApiModel("区间/站场")
+@EqualsAndHashCode(callSuper = true)
+public class BusStation extends BaseEntity {
+
+  @ApiModelProperty(value = "主键", hidden = true)
+  private String stationId;
+
+  @ApiModelProperty(value = "车间id")
+  private Long deptId;
+
+  @ApiModelProperty(value = "车间名称(冗余)")
+  @Length(min = 1, max = 30, message = "【车间名称(冗余)】长度必须介于 {min} 和 {max} 之间")
+  private String deptName;
+
+  @ApiModelProperty(value = "线路id")
+  private Long lineId;
+
+  @ApiModelProperty(value = "线路名称(冗余)")
+  @Length(min = 1, max = 30, message = "【线路名称(冗余)】长度必须介于 {min} 和 {max} 之间")
+  private String lineName;
+
+  @ApiModelProperty(value = "行别")
+  @Length(min = 1, max = 4, message = "【行别】长度必须介于 {min} 和 {max} 之间")
+  private String xingbie;
+
+  @ApiModelProperty(value = "区间站场名称")
+  @Length(min = 1, max = 64, message = "【区间站场名称】长度必须介于 {min} 和 {max} 之间")
+  private String stationName;
+
+  @ApiModelProperty(value = "区间站场类型")
+  @Length(min = 1, max = 4, message = "【区间站场类型】长度必须介于 {min} 和 {max} 之间")
+  private String stationType;
+
+  @ApiModelProperty(value = "区间里程")
+  private Integer qjlc;
+
+  @ApiModelProperty(value = "起始公里标")
+  private Integer startMarker;
+
+  @ApiModelProperty(value = "结束公里标")
+  private Integer endMarker;
+
+  @ApiModelProperty(value = "电化股道数")
+  private Integer dhgds;
+
+  @ApiModelProperty(value = "显示顺序")
+  private Integer orderNum;
+
+  @ApiModelProperty(value = "删除标志(0代表存在 1代表删除)")
+  @Length(min = 1, max = 1, message = "【删除标志(0代表存在 1代表删除)】长度必须介于 {min} 和 {max} 之间")
+  private String delFlag;
+
+}

+ 72 - 0
railway-business/src/main/java/com/railway/business/catenary/domain/BusSubstation.java

@@ -0,0 +1,72 @@
+package com.railway.business.catenary.domain;
+
+import com.railway.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+/**
+ * @author railway
+ */
+@Data
+@ApiModel("变电所信息")
+@EqualsAndHashCode(callSuper = true)
+public class BusSubstation extends BaseEntity {
+
+  @ApiModelProperty(value = "主键", hidden = true)
+  private String substationId;
+
+  @ApiModelProperty(value = "管理车间id")
+  private Long deptId;
+
+  @ApiModelProperty(value = "车间名称(冗余)")
+  @Length(min = 1, max = 30, message = "【车间名称(冗余)】长度必须介于 {min} 和 {max} 之间")
+  private String deptName;
+
+  @ApiModelProperty(value = "line_id")
+  private Integer lineId;
+
+  @ApiModelProperty(value = "line_name")
+  @Length(min = 1, max = 255, message = "【line_name】长度必须介于 {min} 和 {max} 之间")
+  private String lineName;
+
+  @ApiModelProperty(value = "管理工区")
+  @Length(min = 1, max = 30, message = "【管理工区】长度必须介于 {min} 和 {max} 之间")
+  private String workArea;
+
+  @ApiModelProperty(value = "所亭名称")
+  @Length(min = 1, max = 30, message = "【所亭名称】长度必须介于 {min} 和 {max} 之间")
+  private String substationName;
+
+  @ApiModelProperty(value = "显示顺序")
+  private Integer orderNum;
+
+  @ApiModelProperty(value = "公里标")
+  private Integer marker;
+
+  @ApiModelProperty(value = "经度")
+  private BigDecimal longitude;
+
+  @ApiModelProperty(value = "纬度")
+  private BigDecimal latitude;
+
+  @ApiModelProperty(value = "部门集群")
+  @Length(min = 1, max = 64, message = "【部门集群】长度必须介于 {min} 和 {max} 之间")
+  private String substationGroup;
+
+  @ApiModelProperty(value = "值班情况")
+  @Length(min = 1, max = 64, message = "【值班情况】长度必须介于 {min} 和 {max} 之间")
+  private String substationDuty;
+
+  @ApiModelProperty(value = "运行情况")
+  @Length(min = 1, max = 64, message = "【运行情况】长度必须介于 {min} 和 {max} 之间")
+  private String substationState;
+
+  @ApiModelProperty(value = "删除标志(0代表存在 1代表删除)")
+  @Length(min = 1, max = 1, message = "【删除标志(0代表存在 1代表删除)】长度必须介于 {min} 和 {max} 之间")
+  private String delFlag;
+
+}

+ 44 - 0
railway-business/src/main/java/com/railway/business/catenary/mapper/BusLineMapper.java

@@ -0,0 +1,44 @@
+package com.railway.business.catenary.mapper;
+
+import com.github.pagehelper.Page;
+import com.railway.business.catenary.domain.BusLine;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * primary key (line_id) using
+ *
+ * @author author
+ * @date 2021/10/16
+ */
+@Mapper
+@Repository
+public interface BusLineMapper {
+
+  /**
+   * 新增
+   */
+  int insert(BusLine busLine);
+
+  /**
+   * 删除
+   */
+  int delete(@Param("lineId") String lineId);
+
+  /**
+   * 更新
+   */
+  int update(BusLine busLine);
+
+  /**
+   * 获取单个
+   */
+  BusLine getInfo(@Param("lineId") String lineId);
+
+  /**
+   * 查询列表
+   */
+  Page<BusLine> getList(BusLine busLine);
+
+}

+ 44 - 0
railway-business/src/main/java/com/railway/business/catenary/mapper/BusStationMapper.java

@@ -0,0 +1,44 @@
+package com.railway.business.catenary.mapper;
+
+import com.github.pagehelper.Page;
+import com.railway.business.catenary.domain.BusStation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * primary key (station_id) using
+ *
+ * @author author
+ * @date 2021/10/16
+ */
+@Mapper
+@Repository
+public interface BusStationMapper {
+
+  /**
+   * 新增
+   */
+  int insert(BusStation busStation);
+
+  /**
+   * 删除
+   */
+  int delete(@Param("stationId") String stationId);
+
+  /**
+   * 更新
+   */
+  int update(BusStation busStation);
+
+  /**
+   * 获取单个
+   */
+  BusStation getInfo(@Param("stationId") String stationId);
+
+  /**
+   * 查询列表
+   */
+  Page<BusStation> getList(BusStation busStation);
+
+}

+ 44 - 0
railway-business/src/main/java/com/railway/business/catenary/mapper/BusSubstationMapper.java

@@ -0,0 +1,44 @@
+package com.railway.business.catenary.mapper;
+
+import com.github.pagehelper.Page;
+import com.railway.business.catenary.domain.BusSubstation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * primary key (substation_id) using
+ *
+ * @author author
+ * @date 2021/10/16
+ */
+@Mapper
+@Repository
+public interface BusSubstationMapper {
+
+  /**
+   * 新增
+   */
+  int insert(BusSubstation busSubstation);
+
+  /**
+   * 删除
+   */
+  int delete(@Param("substationId") String substationId);
+
+  /**
+   * 更新
+   */
+  int update(BusSubstation busSubstation);
+
+  /**
+   * 获取单个
+   */
+  BusSubstation getInfo(@Param("substationId") String substationId);
+
+  /**
+   * 查询列表
+   */
+  Page<BusSubstation> getList(BusSubstation busSubstation);
+
+}

+ 39 - 0
railway-business/src/main/java/com/railway/business/catenary/service/IBusLineService.java

@@ -0,0 +1,39 @@
+package com.railway.business.catenary.service;
+
+import com.railway.business.catenary.domain.BusLine;
+import java.util.List;
+
+/**
+ * primary key (line_id) using
+ *
+ * @author author
+ * @date 2021/10/16
+ */
+public interface IBusLineService {
+
+  /**
+   * 新增
+   */
+  int create(BusLine busLine);
+
+  /**
+   * 删除
+   */
+  int delete(String[] lineIds);
+
+  /**
+   * 更新
+   */
+  int update(BusLine busLine);
+
+  /**
+   * 获取单个
+   */
+  BusLine getInfo(String lineId);
+
+  /**
+   * 查询列表
+   */
+  List<BusLine> getList(BusLine busLine);
+
+}

+ 39 - 0
railway-business/src/main/java/com/railway/business/catenary/service/IBusStationService.java

@@ -0,0 +1,39 @@
+package com.railway.business.catenary.service;
+
+import com.railway.business.catenary.domain.BusStation;
+import java.util.List;
+
+/**
+ * primary key (station_id) using
+ *
+ * @author author
+ * @date 2021/10/16
+ */
+public interface IBusStationService {
+
+  /**
+   * 新增
+   */
+  int create(BusStation busStation);
+
+  /**
+   * 删除
+   */
+  int delete(String[] stationIds);
+
+  /**
+   * 更新
+   */
+  int update(BusStation busStation);
+
+  /**
+   * 获取单个
+   */
+  BusStation getInfo(String stationId);
+
+  /**
+   * 查询列表
+   */
+  List<BusStation> getList(BusStation busStation);
+
+}

+ 39 - 0
railway-business/src/main/java/com/railway/business/catenary/service/IBusSubstationService.java

@@ -0,0 +1,39 @@
+package com.railway.business.catenary.service;
+
+import com.railway.business.catenary.domain.BusSubstation;
+import java.util.List;
+
+/**
+ * primary key (substation_id) using
+ *
+ * @author author
+ * @date 2021/10/16
+ */
+public interface IBusSubstationService {
+
+  /**
+   * 新增
+   */
+  int create(BusSubstation busSubstation);
+
+  /**
+   * 删除
+   */
+  int delete(String[] substationIds);
+
+  /**
+   * 更新
+   */
+  int update(BusSubstation busSubstation);
+
+  /**
+   * 获取单个
+   */
+  BusSubstation getInfo(String substationId);
+
+  /**
+   * 查询列表
+   */
+  List<BusSubstation> getList(BusSubstation busSubstation);
+
+}

+ 79 - 0
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusLineServiceImpl.java

@@ -0,0 +1,79 @@
+package com.railway.business.catenary.service.impl;
+
+import com.railway.business.catenary.domain.BusLine;
+import com.railway.business.catenary.mapper.BusLineMapper;
+import com.railway.business.catenary.service.IBusLineService;
+import com.railway.common.utils.SecurityUtils;
+import java.util.Date;
+import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * primary key (line_id) using
+ *
+ * @author author
+ * @date 2021/10/16
+ */
+@Service
+@Transactional(readOnly = true)
+public class BusLineServiceImpl implements IBusLineService {
+
+  private final BusLineMapper busLineMapper;
+
+  public BusLineServiceImpl(BusLineMapper busLineMapper) {
+    this.busLineMapper = busLineMapper;
+  }
+
+  /**
+   *  新增
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int create(BusLine busLine) {
+    busLine.setCreateTime(new Date());
+    busLine.setCreateBy(SecurityUtils.getUsername());
+    return busLineMapper.insert(busLine);
+  }
+
+  /**
+   *  删除
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int delete(String[] lineIds) {
+    int r = 0;
+    for (String lineId : lineIds) {
+      int j = busLineMapper.delete(lineId);
+      r = r + j;
+    }
+    return r;
+  }
+
+  /**
+   *  更新
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int update(BusLine busLine) {
+    busLine.setUpdateTime(new Date());
+    busLine.setUpdateBy(SecurityUtils.getUsername());
+    return busLineMapper.update(busLine);
+  }
+
+  /**
+   *  获取单个
+   */
+  @Override
+  public BusLine getInfo(String lineId) {
+    return busLineMapper.getInfo(lineId);
+  }
+
+  /**
+   *  查询列表
+   */
+  @Override
+  public List<BusLine> getList(BusLine busLine) {
+    return busLineMapper.getList(busLine);
+  }
+}

+ 79 - 0
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusStationServiceImpl.java

@@ -0,0 +1,79 @@
+package com.railway.business.catenary.service.impl;
+
+import com.railway.business.catenary.domain.BusStation;
+import com.railway.business.catenary.mapper.BusStationMapper;
+import com.railway.business.catenary.service.IBusStationService;
+import com.railway.common.utils.SecurityUtils;
+import java.util.Date;
+import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * primary key (station_id) using
+ *
+ * @author author
+ * @date 2021/10/16
+ */
+@Service
+@Transactional(readOnly = true)
+public class BusStationServiceImpl implements IBusStationService {
+
+  private final BusStationMapper busStationMapper;
+
+  public BusStationServiceImpl(BusStationMapper busStationMapper) {
+    this.busStationMapper = busStationMapper;
+  }
+
+  /**
+   * 新增
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int create(BusStation busStation) {
+    busStation.setCreateTime(new Date());
+    busStation.setCreateBy(SecurityUtils.getUsername());
+    return busStationMapper.insert(busStation);
+  }
+
+  /**
+   * 删除
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int delete(String[] stationIds) {
+    int r = 0;
+    for (String stationId : stationIds) {
+      int j = busStationMapper.delete(stationId);
+      r = r + j;
+    }
+    return r;
+  }
+
+  /**
+   * 更新
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int update(BusStation busStation) {
+    busStation.setUpdateTime(new Date());
+    busStation.setUpdateBy(SecurityUtils.getUsername());
+    return busStationMapper.update(busStation);
+  }
+
+  /**
+   * 获取单个
+   */
+  @Override
+  public BusStation getInfo(String stationId) {
+    return busStationMapper.getInfo(stationId);
+  }
+
+  /**
+   * 查询列表
+   */
+  @Override
+  public List<BusStation> getList(BusStation busStation) {
+    return busStationMapper.getList(busStation);
+  }
+}

+ 79 - 0
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusSubstationServiceImpl.java

@@ -0,0 +1,79 @@
+package com.railway.business.catenary.service.impl;
+
+import com.railway.business.catenary.domain.BusSubstation;
+import com.railway.business.catenary.mapper.BusSubstationMapper;
+import com.railway.business.catenary.service.IBusSubstationService;
+import com.railway.common.utils.SecurityUtils;
+import java.util.Date;
+import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * primary key (substation_id) using
+ *
+ * @author author
+ * @date 2021/10/16
+ */
+@Service
+@Transactional(readOnly = true)
+public class BusSubstationServiceImpl implements IBusSubstationService {
+
+  private final BusSubstationMapper busSubstationMapper;
+
+  public BusSubstationServiceImpl(BusSubstationMapper busSubstationMapper) {
+    this.busSubstationMapper = busSubstationMapper;
+  }
+
+  /**
+   * 新增
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int create(BusSubstation busSubstation) {
+    busSubstation.setCreateTime(new Date());
+    busSubstation.setCreateBy(SecurityUtils.getUsername());
+    return busSubstationMapper.insert(busSubstation);
+  }
+
+  /**
+   * 删除
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int delete(String[] substationIds) {
+    int r = 0;
+    for (String substationId : substationIds) {
+      int j = busSubstationMapper.delete(substationId);
+      r = r + j;
+    }
+    return r;
+  }
+
+  /**
+   * 更新
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int update(BusSubstation busSubstation) {
+    busSubstation.setUpdateTime(new Date());
+    busSubstation.setUpdateBy(SecurityUtils.getUsername());
+    return busSubstationMapper.update(busSubstation);
+  }
+
+  /**
+   * 获取单个
+   */
+  @Override
+  public BusSubstation getInfo(String substationId) {
+    return busSubstationMapper.getInfo(substationId);
+  }
+
+  /**
+   * 查询列表
+   */
+  @Override
+  public List<BusSubstation> getList(BusSubstation busSubstation) {
+    return busSubstationMapper.getList(busSubstation);
+  }
+}

+ 356 - 0
railway-business/src/main/resources/mapper/business/BusLineMapper.xml

@@ -0,0 +1,356 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+  "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.railway.business.catenary.mapper.BusLineMapper">
+
+  <resultMap id="BaseResultMap" type="com.railway.business.catenary.domain.BusLine">
+    <result column="line_id" property="lineId"/>
+    <result column="dept_id" property="deptId"/>
+    <result column="dept_name" property="deptName"/>
+    <result column="line_name" property="lineName"/>
+    <result column="line_sddj" property="lineSddj"/>
+    <result column="line_type" property="lineType"/>
+    <result column="line_dj" property="lineDj"/>
+    <result column="line_ktrq" property="lineKtrq"/>
+    <result column="line_yylc" property="lineYylc"/>
+    <result column="line_start_marker" property="lineStartMarker"/>
+    <result column="line_end_marker" property="lineEndMarker"/>
+    <result column="up_start_marker" property="upStartMarker"/>
+    <result column="up_end_marker" property="upEndMarker"/>
+    <result column="down_start_marker" property="downStartMarker"/>
+    <result column="down_end_marker" property="downEndMarker"/>
+    <result column="line_gdfs" property="lineGdfs"/>
+    <result column="line_xglx" property="lineXglx"/>
+    <result column="line_qt" property="lineQt"/>
+    <result column="line_sjbh" property="lineSjbh"/>
+    <result column="order_num" property="orderNum"/>
+    <result column="status" property="status"/>
+    <result column="del_flag" property="delFlag"/>
+    <result column="create_by" property="createBy"/>
+    <result column="create_time" property="createTime"/>
+    <result column="update_by" property="updateBy"/>
+    <result column="update_time" property="updateTime"/>
+  </resultMap>
+
+  <sql id="Base_Column_List">
+    line_id,
+    dept_id,
+    dept_name,
+    line_name,
+    line_sddj,
+    line_type,
+    line_dj,
+    line_ktrq,
+    line_yylc,
+    line_start_marker,
+    line_end_marker,
+    up_start_marker,
+    up_end_marker,
+    down_start_marker,
+    down_end_marker,
+    line_gdfs,
+    line_xglx,
+    line_qt,
+    line_sjbh,
+    order_num,
+    status,
+    del_flag,
+    create_by,
+    create_time,
+    update_by,
+    update_time
+  </sql>
+
+  <insert id="insert" parameterType="com.railway.business.catenary.domain.BusLine">
+    <selectKey keyProperty="lineId" order="BEFORE" resultType="String">
+      select replace(uuid(), '-', '') from dual
+    </selectKey>
+    INSERT INTO sys_line
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test='null != deptId'>
+        dept_id,
+      </if>
+      <if test='null != deptName'>
+        dept_name,
+      </if>
+      <if test='null != lineName'>
+        line_name,
+      </if>
+      <if test='null != lineSddj'>
+        line_sddj,
+      </if>
+      <if test='null != lineType'>
+        line_type,
+      </if>
+      <if test='null != lineDj'>
+        line_dj,
+      </if>
+      <if test='null != lineKtrq'>
+        line_ktrq,
+      </if>
+      <if test='null != lineYylc'>
+        line_yylc,
+      </if>
+      <if test='null != lineStartMarker'>
+        line_start_marker,
+      </if>
+      <if test='null != lineEndMarker'>
+        line_end_marker,
+      </if>
+      <if test='null != upStartMarker'>
+        up_start_marker,
+      </if>
+      <if test='null != upEndMarker'>
+        up_end_marker,
+      </if>
+      <if test='null != downStartMarker'>
+        down_start_marker,
+      </if>
+      <if test='null != downEndMarker'>
+        down_end_marker,
+      </if>
+      <if test='null != lineGdfs'>
+        line_gdfs,
+      </if>
+      <if test='null != lineXglx'>
+        line_xglx,
+      </if>
+      <if test='null != lineQt'>
+        line_qt,
+      </if>
+      <if test='null != lineSjbh'>
+        line_sjbh,
+      </if>
+      <if test='null != orderNum'>
+        order_num,
+      </if>
+      <if test='null != status'>
+        status,
+      </if>
+      <if test='null != delFlag'>
+        del_flag,
+      </if>
+      <if test='null != createBy'>
+        create_by,
+      </if>
+      <if test='null != createTime'>
+        create_time,
+      </if>
+      <if test='null != updateBy'>
+        update_by,
+      </if>
+      <if test='null != updateTime'>
+        update_time
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test='null != deptId'>
+        #{deptId},
+      </if>
+      <if test='null != deptName'>
+        #{deptName},
+      </if>
+      <if test='null != lineName'>
+        #{lineName},
+      </if>
+      <if test='null != lineSddj'>
+        #{lineSddj},
+      </if>
+      <if test='null != lineType'>
+        #{lineType},
+      </if>
+      <if test='null != lineDj'>
+        #{lineDj},
+      </if>
+      <if test='null != lineKtrq'>
+        #{lineKtrq},
+      </if>
+      <if test='null != lineYylc'>
+        #{lineYylc},
+      </if>
+      <if test='null != lineStartMarker'>
+        #{lineStartMarker},
+      </if>
+      <if test='null != lineEndMarker'>
+        #{lineEndMarker},
+      </if>
+      <if test='null != upStartMarker'>
+        #{upStartMarker},
+      </if>
+      <if test='null != upEndMarker'>
+        #{upEndMarker},
+      </if>
+      <if test='null != downStartMarker'>
+        #{downStartMarker},
+      </if>
+      <if test='null != downEndMarker'>
+        #{downEndMarker},
+      </if>
+      <if test='null != lineGdfs'>
+        #{lineGdfs},
+      </if>
+      <if test='null != lineXglx'>
+        #{lineXglx},
+      </if>
+      <if test='null != lineQt'>
+        #{lineQt},
+      </if>
+      <if test='null != lineSjbh'>
+        #{lineSjbh},
+      </if>
+      <if test='null != orderNum'>
+        #{orderNum},
+      </if>
+      <if test='null != status'>
+        #{status},
+      </if>
+      <if test='null != delFlag'>
+        #{delFlag},
+      </if>
+      <if test='null != createBy'>
+        #{createBy},
+      </if>
+      <if test='null != createTime'>
+        #{createTime},
+      </if>
+      <if test='null != updateBy'>
+        #{updateBy},
+      </if>
+      <if test='null != updateTime'>
+        #{updateTime}
+      </if>
+    </trim>
+  </insert>
+
+  <delete id="delete">
+    UPDATE sys_line
+    set del_flag='1'
+    WHERE line_id = #{lineId}
+  </delete>
+
+  <update id="update" parameterType="com.railway.business.catenary.domain.BusLine">
+    UPDATE sys_line
+    <set>
+      <if test='null != deptId'>dept_id = #{deptId},</if>
+      <if test='null != deptName'>dept_name = #{deptName},</if>
+      <if test='null != lineName'>line_name = #{lineName},</if>
+      <if test='null != lineSddj'>line_sddj = #{lineSddj},</if>
+      <if test='null != lineType'>line_type = #{lineType},</if>
+      <if test='null != lineDj'>line_dj = #{lineDj},</if>
+      <if test='null != lineKtrq'>line_ktrq = #{lineKtrq},</if>
+      <if test='null != lineYylc'>line_yylc = #{lineYylc},</if>
+      <if test='null != lineStartMarker'>line_start_marker = #{lineStartMarker},</if>
+      <if test='null != lineEndMarker'>line_end_marker = #{lineEndMarker},</if>
+      <if test='null != upStartMarker'>up_start_marker = #{upStartMarker},</if>
+      <if test='null != upEndMarker'>up_end_marker = #{upEndMarker},</if>
+      <if test='null != downStartMarker'>down_start_marker = #{downStartMarker},</if>
+      <if test='null != downEndMarker'>down_end_marker = #{downEndMarker},</if>
+      <if test='null != lineGdfs'>line_gdfs = #{lineGdfs},</if>
+      <if test='null != lineXglx'>line_xglx = #{lineXglx},</if>
+      <if test='null != lineQt'>line_qt = #{lineQt},</if>
+      <if test='null != lineSjbh'>line_sjbh = #{lineSjbh},</if>
+      <if test='null != orderNum'>order_num = #{orderNum},</if>
+      <if test='null != status'>status = #{status},</if>
+      <if test='null != delFlag'>del_flag = #{delFlag},</if>
+      <if test='null != createBy'>create_by = #{createBy},</if>
+      <if test='null != createTime'>create_time = #{createTime},</if>
+      <if test='null != updateBy'>update_by = #{updateBy},</if>
+      <if test='null != updateTime'>update_time = #{updateTime}</if>
+    </set>
+    WHERE line_id = #{lineId}
+  </update>
+
+
+  <select id="getInfo" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    FROM sys_line
+    WHERE del_flag='0' and line_id = #{lineId}
+
+  </select>
+
+  <select id="getList" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    FROM sys_line
+    <where>
+      del_flag='0'
+      <if test="deptId!=null and deptId!=''">
+        and dept_id=#{deptId}
+      </if>
+      <if test="deptName!=null and deptName!=''">
+        and dept_name=#{deptName}
+      </if>
+      <if test="lineName!=null and lineName!=''">
+        and line_name=#{lineName}
+      </if>
+      <if test="lineSddj!=null and lineSddj!=''">
+        and line_sddj=#{lineSddj}
+      </if>
+      <if test="lineType!=null and lineType!=''">
+        and line_type=#{lineType}
+      </if>
+      <if test="lineDj!=null and lineDj!=''">
+        and line_dj=#{lineDj}
+      </if>
+      <if test="lineKtrq!=null and lineKtrq!=''">
+        and line_ktrq=#{lineKtrq}
+      </if>
+      <if test="lineYylc!=null and lineYylc!=''">
+        and line_yylc=#{lineYylc}
+      </if>
+      <if test="lineStartMarker!=null and lineStartMarker!=''">
+        and line_start_marker=#{lineStartMarker}
+      </if>
+      <if test="lineEndMarker!=null and lineEndMarker!=''">
+        and line_end_marker=#{lineEndMarker}
+      </if>
+      <if test="upStartMarker!=null and upStartMarker!=''">
+        and up_start_marker=#{upStartMarker}
+      </if>
+      <if test="upEndMarker!=null and upEndMarker!=''">
+        and up_end_marker=#{upEndMarker}
+      </if>
+      <if test="downStartMarker!=null and downStartMarker!=''">
+        and down_start_marker=#{downStartMarker}
+      </if>
+      <if test="downEndMarker!=null and downEndMarker!=''">
+        and down_end_marker=#{downEndMarker}
+      </if>
+      <if test="lineGdfs!=null and lineGdfs!=''">
+        and line_gdfs=#{lineGdfs}
+      </if>
+      <if test="lineXglx!=null and lineXglx!=''">
+        and line_xglx=#{lineXglx}
+      </if>
+      <if test="lineQt!=null and lineQt!=''">
+        and line_qt=#{lineQt}
+      </if>
+      <if test="lineSjbh!=null and lineSjbh!=''">
+        and line_sjbh=#{lineSjbh}
+      </if>
+      <if test="orderNum!=null and orderNum!=''">
+        and order_num=#{orderNum}
+      </if>
+      <if test="status!=null and status!=''">
+        and status=#{status}
+      </if>
+      <if test="delFlag!=null and delFlag!=''">
+        and del_flag=#{delFlag}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and create_by=#{createBy}
+      </if>
+      <if test="createTime!=null and createTime!=''">
+        and create_time=#{createTime}
+      </if>
+      <if test="updateBy!=null and updateBy!=''">
+        and update_by=#{updateBy}
+      </if>
+      <if test="updateTime!=null and updateTime!=''">
+        and update_time=#{updateTime}
+      </if>
+    </where>
+  </select>
+
+</mapper>

+ 260 - 0
railway-business/src/main/resources/mapper/business/BusStationMapper.xml

@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+  "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.railway.business.catenary.mapper.BusStationMapper">
+
+  <resultMap id="BaseResultMap" type="com.railway.business.catenary.domain.BusStation">
+    <result column="station_id" property="stationId"/>
+    <result column="dept_id" property="deptId"/>
+    <result column="dept_name" property="deptName"/>
+    <result column="line_id" property="lineId"/>
+    <result column="line_name" property="lineName"/>
+    <result column="xingbie" property="xingbie"/>
+    <result column="station_name" property="stationName"/>
+    <result column="station_type" property="stationType"/>
+    <result column="qjlc" property="qjlc"/>
+    <result column="start_marker" property="startMarker"/>
+    <result column="end_marker" property="endMarker"/>
+    <result column="dhgds" property="dhgds"/>
+    <result column="order_num" property="orderNum"/>
+    <result column="del_flag" property="delFlag"/>
+    <result column="create_by" property="createBy"/>
+    <result column="create_time" property="createTime"/>
+    <result column="update_by" property="updateBy"/>
+    <result column="update_time" property="updateTime"/>
+  </resultMap>
+
+  <sql id="Base_Column_List">
+    station_id,
+    dept_id,
+    dept_name,
+    line_id,
+    line_name,
+    xingbie,
+    station_name,
+    station_type,
+    qjlc,
+    start_marker,
+    end_marker,
+    dhgds,
+    order_num,
+    del_flag,
+    create_by,
+    create_time,
+    update_by,
+    update_time
+  </sql>
+
+  <insert id="insert" parameterType="com.railway.business.catenary.domain.BusStation">
+    <selectKey keyProperty="stationId" order="BEFORE" resultType="String">
+      select replace(uuid(), '-', '') from dual
+    </selectKey>
+    INSERT INTO sys_station
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test='null != deptId'>
+        dept_id,
+      </if>
+      <if test='null != deptName'>
+        dept_name,
+      </if>
+      <if test='null != lineId'>
+        line_id,
+      </if>
+      <if test='null != lineName'>
+        line_name,
+      </if>
+      <if test='null != xingbie'>
+        xingbie,
+      </if>
+      <if test='null != stationName'>
+        station_name,
+      </if>
+      <if test='null != stationType'>
+        station_type,
+      </if>
+      <if test='null != qjlc'>
+        qjlc,
+      </if>
+      <if test='null != startMarker'>
+        start_marker,
+      </if>
+      <if test='null != endMarker'>
+        end_marker,
+      </if>
+      <if test='null != dhgds'>
+        dhgds,
+      </if>
+      <if test='null != orderNum'>
+        order_num,
+      </if>
+      <if test='null != delFlag'>
+        del_flag,
+      </if>
+      <if test='null != createBy'>
+        create_by,
+      </if>
+      <if test='null != createTime'>
+        create_time,
+      </if>
+      <if test='null != updateBy'>
+        update_by,
+      </if>
+      <if test='null != updateTime'>
+        update_time
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test='null != deptId'>
+        #{deptId},
+      </if>
+      <if test='null != deptName'>
+        #{deptName},
+      </if>
+      <if test='null != lineId'>
+        #{lineId},
+      </if>
+      <if test='null != lineName'>
+        #{lineName},
+      </if>
+      <if test='null != xingbie'>
+        #{xingbie},
+      </if>
+      <if test='null != stationName'>
+        #{stationName},
+      </if>
+      <if test='null != stationType'>
+        #{stationType},
+      </if>
+      <if test='null != qjlc'>
+        #{qjlc},
+      </if>
+      <if test='null != startMarker'>
+        #{startMarker},
+      </if>
+      <if test='null != endMarker'>
+        #{endMarker},
+      </if>
+      <if test='null != dhgds'>
+        #{dhgds},
+      </if>
+      <if test='null != orderNum'>
+        #{orderNum},
+      </if>
+      <if test='null != delFlag'>
+        #{delFlag},
+      </if>
+      <if test='null != createBy'>
+        #{createBy},
+      </if>
+      <if test='null != createTime'>
+        #{createTime},
+      </if>
+      <if test='null != updateBy'>
+        #{updateBy},
+      </if>
+      <if test='null != updateTime'>
+        #{updateTime}
+      </if>
+    </trim>
+  </insert>
+
+  <delete id="delete">
+    UPDATE sys_station
+    set del_flag='1'
+    WHERE station_id = #{stationId}
+  </delete>
+
+  <update id="update" parameterType="com.railway.business.catenary.domain.BusStation">
+    UPDATE sys_station
+    <set>
+      <if test='null != deptId'>dept_id = #{deptId},</if>
+      <if test='null != deptName'>dept_name = #{deptName},</if>
+      <if test='null != lineId'>line_id = #{lineId},</if>
+      <if test='null != lineName'>line_name = #{lineName},</if>
+      <if test='null != xingbie'>xingbie = #{xingbie},</if>
+      <if test='null != stationName'>station_name = #{stationName},</if>
+      <if test='null != stationType'>station_type = #{stationType},</if>
+      <if test='null != qjlc'>qjlc = #{qjlc},</if>
+      <if test='null != startMarker'>start_marker = #{startMarker},</if>
+      <if test='null != endMarker'>end_marker = #{endMarker},</if>
+      <if test='null != dhgds'>dhgds = #{dhgds},</if>
+      <if test='null != orderNum'>order_num = #{orderNum},</if>
+      <if test='null != delFlag'>del_flag = #{delFlag},</if>
+      <if test='null != createBy'>create_by = #{createBy},</if>
+      <if test='null != createTime'>create_time = #{createTime},</if>
+      <if test='null != updateBy'>update_by = #{updateBy},</if>
+      <if test='null != updateTime'>update_time = #{updateTime}</if>
+    </set>
+    WHERE station_id = #{stationId}
+  </update>
+
+
+  <select id="getInfo" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    FROM sys_station
+    WHERE del_flag='0' and station_id = #{stationId}
+
+  </select>
+
+  <select id="getList" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    FROM sys_station
+    <where>
+      del_flag='0'
+      <if test="deptId!=null and deptId!=''">
+        and dept_id=#{deptId}
+      </if>
+      <if test="deptName!=null and deptName!=''">
+        and dept_name=#{deptName}
+      </if>
+      <if test="lineId!=null and lineId!=''">
+        and line_id=#{lineId}
+      </if>
+      <if test="lineName!=null and lineName!=''">
+        and line_name=#{lineName}
+      </if>
+      <if test="xingbie!=null and xingbie!=''">
+        and xingbie=#{xingbie}
+      </if>
+      <if test="stationName!=null and stationName!=''">
+        and station_name=#{stationName}
+      </if>
+      <if test="stationType!=null and stationType!=''">
+        and station_type=#{stationType}
+      </if>
+      <if test="qjlc!=null and qjlc!=''">
+        and qjlc=#{qjlc}
+      </if>
+      <if test="startMarker!=null and startMarker!=''">
+        and start_marker=#{startMarker}
+      </if>
+      <if test="endMarker!=null and endMarker!=''">
+        and end_marker=#{endMarker}
+      </if>
+      <if test="dhgds!=null and dhgds!=''">
+        and dhgds=#{dhgds}
+      </if>
+      <if test="orderNum!=null and orderNum!=''">
+        and order_num=#{orderNum}
+      </if>
+      <if test="delFlag!=null and delFlag!=''">
+        and del_flag=#{delFlag}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and create_by=#{createBy}
+      </if>
+      <if test="createTime!=null and createTime!=''">
+        and create_time=#{createTime}
+      </if>
+      <if test="updateBy!=null and updateBy!=''">
+        and update_by=#{updateBy}
+      </if>
+      <if test="updateTime!=null and updateTime!=''">
+        and update_time=#{updateTime}
+      </if>
+    </where>
+  </select>
+
+</mapper>

+ 272 - 0
railway-business/src/main/resources/mapper/business/BusSubstationMapper.xml

@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+  "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.railway.business.catenary.mapper.BusSubstationMapper">
+
+  <resultMap id="BaseResultMap" type="com.railway.business.catenary.domain.BusSubstation">
+    <result column="substation_id" property="substationId"/>
+    <result column="dept_id" property="deptId"/>
+    <result column="dept_name" property="deptName"/>
+    <result column="line_id" property="lineId"/>
+    <result column="line_name" property="lineName"/>
+    <result column="work_area" property="workArea"/>
+    <result column="substation_name" property="substationName"/>
+    <result column="order_num" property="orderNum"/>
+    <result column="marker" property="marker"/>
+    <result column="longitude" property="longitude"/>
+    <result column="latitude" property="latitude"/>
+    <result column="substation_group" property="substationGroup"/>
+    <result column="substation_duty" property="substationDuty"/>
+    <result column="substation_state" property="substationState"/>
+    <result column="del_flag" property="delFlag"/>
+    <result column="create_by" property="createBy"/>
+    <result column="create_time" property="createTime"/>
+    <result column="update_by" property="updateBy"/>
+    <result column="update_time" property="updateTime"/>
+  </resultMap>
+
+  <sql id="Base_Column_List">
+    substation_id,
+    dept_id,
+    dept_name,
+    line_id,
+    line_name,
+    work_area,
+    substation_name,
+    order_num,
+    marker,
+    longitude,
+    latitude,
+    substation_group,
+    substation_duty,
+    substation_state,
+    del_flag,
+    create_by,
+    create_time,
+    update_by,
+    update_time
+  </sql>
+
+  <insert id="insert" parameterType="com.railway.business.catenary.domain.BusSubstation">
+    <selectKey keyProperty="substationId" order="BEFORE" resultType="String">
+      select replace(uuid(), '-', '') from dual
+    </selectKey>
+    INSERT INTO sys_substation
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test='null != deptId'>
+        dept_id,
+      </if>
+      <if test='null != deptName'>
+        dept_name,
+      </if>
+      <if test='null != lineId'>
+        line_id,
+      </if>
+      <if test='null != lineName'>
+        line_name,
+      </if>
+      <if test='null != workArea'>
+        work_area,
+      </if>
+      <if test='null != substationName'>
+        substation_name,
+      </if>
+      <if test='null != orderNum'>
+        order_num,
+      </if>
+      <if test='null != marker'>
+        marker,
+      </if>
+      <if test='null != longitude'>
+        longitude,
+      </if>
+      <if test='null != latitude'>
+        latitude,
+      </if>
+      <if test='null != substationGroup'>
+        substation_group,
+      </if>
+      <if test='null != substationDuty'>
+        substation_duty,
+      </if>
+      <if test='null != substationState'>
+        substation_state,
+      </if>
+      <if test='null != delFlag'>
+        del_flag,
+      </if>
+      <if test='null != createBy'>
+        create_by,
+      </if>
+      <if test='null != createTime'>
+        create_time,
+      </if>
+      <if test='null != updateBy'>
+        update_by,
+      </if>
+      <if test='null != updateTime'>
+        update_time
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test='null != deptId'>
+        #{deptId},
+      </if>
+      <if test='null != deptName'>
+        #{deptName},
+      </if>
+      <if test='null != lineId'>
+        #{lineId},
+      </if>
+      <if test='null != lineName'>
+        #{lineName},
+      </if>
+      <if test='null != workArea'>
+        #{workArea},
+      </if>
+      <if test='null != substationName'>
+        #{substationName},
+      </if>
+      <if test='null != orderNum'>
+        #{orderNum},
+      </if>
+      <if test='null != marker'>
+        #{marker},
+      </if>
+      <if test='null != longitude'>
+        #{longitude},
+      </if>
+      <if test='null != latitude'>
+        #{latitude},
+      </if>
+      <if test='null != substationGroup'>
+        #{substationGroup},
+      </if>
+      <if test='null != substationDuty'>
+        #{substationDuty},
+      </if>
+      <if test='null != substationState'>
+        #{substationState},
+      </if>
+      <if test='null != delFlag'>
+        #{delFlag},
+      </if>
+      <if test='null != createBy'>
+        #{createBy},
+      </if>
+      <if test='null != createTime'>
+        #{createTime},
+      </if>
+      <if test='null != updateBy'>
+        #{updateBy},
+      </if>
+      <if test='null != updateTime'>
+        #{updateTime}
+      </if>
+    </trim>
+  </insert>
+
+  <delete id="delete">
+    UPDATE sys_substation
+    set del_flag='1'
+    WHERE substation_id = #{substationId}
+  </delete>
+
+  <update id="update" parameterType="com.railway.business.catenary.domain.BusSubstation">
+    UPDATE sys_substation
+    <set>
+      <if test='null != deptId'>dept_id = #{deptId},</if>
+      <if test='null != deptName'>dept_name = #{deptName},</if>
+      <if test='null != lineId'>line_id = #{lineId},</if>
+      <if test='null != lineName'>line_name = #{lineName},</if>
+      <if test='null != workArea'>work_area = #{workArea},</if>
+      <if test='null != substationName'>substation_name = #{substationName},</if>
+      <if test='null != orderNum'>order_num = #{orderNum},</if>
+      <if test='null != marker'>marker = #{marker},</if>
+      <if test='null != longitude'>longitude = #{longitude},</if>
+      <if test='null != latitude'>latitude = #{latitude},</if>
+      <if test='null != substationGroup'>substation_group = #{substationGroup},</if>
+      <if test='null != substationDuty'>substation_duty = #{substationDuty},</if>
+      <if test='null != substationState'>substation_state = #{substationState},</if>
+      <if test='null != delFlag'>del_flag = #{delFlag},</if>
+      <if test='null != createBy'>create_by = #{createBy},</if>
+      <if test='null != createTime'>create_time = #{createTime},</if>
+      <if test='null != updateBy'>update_by = #{updateBy},</if>
+      <if test='null != updateTime'>update_time = #{updateTime}</if>
+    </set>
+    WHERE substation_id = #{substationId}
+  </update>
+
+
+  <select id="getInfo" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    FROM sys_substation
+    WHERE del_flag='0' and substation_id = #{substationId}
+
+  </select>
+
+  <select id="getList" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    FROM sys_substation
+    <where>
+      del_flag='0'
+      <if test="deptId!=null and deptId!=''">
+        and dept_id=#{deptId}
+      </if>
+      <if test="deptName!=null and deptName!=''">
+        and dept_name=#{deptName}
+      </if>
+      <if test="lineId!=null and lineId!=''">
+        and line_id=#{lineId}
+      </if>
+      <if test="lineName!=null and lineName!=''">
+        and line_name=#{lineName}
+      </if>
+      <if test="workArea!=null and workArea!=''">
+        and work_area=#{workArea}
+      </if>
+      <if test="substationName!=null and substationName!=''">
+        and substation_name=#{substationName}
+      </if>
+      <if test="orderNum!=null and orderNum!=''">
+        and order_num=#{orderNum}
+      </if>
+      <if test="marker!=null and marker!=''">
+        and marker=#{marker}
+      </if>
+      <if test="longitude!=null and longitude!=''">
+        and longitude=#{longitude}
+      </if>
+      <if test="latitude!=null and latitude!=''">
+        and latitude=#{latitude}
+      </if>
+      <if test="substationGroup!=null and substationGroup!=''">
+        and substation_group=#{substationGroup}
+      </if>
+      <if test="substationDuty!=null and substationDuty!=''">
+        and substation_duty=#{substationDuty}
+      </if>
+      <if test="substationState!=null and substationState!=''">
+        and substation_state=#{substationState}
+      </if>
+      <if test="delFlag!=null and delFlag!=''">
+        and del_flag=#{delFlag}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and create_by=#{createBy}
+      </if>
+      <if test="createTime!=null and createTime!=''">
+        and create_time=#{createTime}
+      </if>
+      <if test="updateBy!=null and updateBy!=''">
+        and update_by=#{updateBy}
+      </if>
+      <if test="updateTime!=null and updateTime!=''">
+        and update_time=#{updateTime}
+      </if>
+    </where>
+  </select>
+
+</mapper>

+ 10 - 0
railway-common/src/main/java/com/railway/common/core/domain/entity/SysDept.java

@@ -1,5 +1,6 @@
 package com.railway.common.core.domain.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
 import java.util.List;
 import javax.validation.constraints.Email;
@@ -24,21 +25,25 @@ public class SysDept extends BaseEntity {
   /**
    * 部门ID
    */
+  @ApiModelProperty(value = "主键", hidden = true)
   private Long deptId;
 
   /**
    * 父部门ID
    */
+  @ApiModelProperty(value = "父部门id")
   private Long parentId;
 
   /**
    * 祖级列表
    */
+  @ApiModelProperty(value = "祖级列表")
   private String ancestors;
 
   /**
    * 部门名称
    */
+  @ApiModelProperty(value = "部门名称")
   @NotBlank(message = "部门名称不能为空")
   @Size(max = 30, message = "部门名称长度不能超过30个字符")
   private String deptName;
@@ -46,23 +51,27 @@ public class SysDept extends BaseEntity {
   /**
    * 显示顺序
    */
+  @ApiModelProperty(value = "显示顺序")
   @NotBlank(message = "显示顺序不能为空")
   private String orderNum;
 
   /**
    * 负责人
    */
+  @ApiModelProperty(value = "负责人")
   private String leader;
 
   /**
    * 联系电话
    */
+  @ApiModelProperty(value = "联系电话")
   @Size(max = 11, message = "联系电话长度不能超过11个字符")
   private String phone;
 
   /**
    * 邮箱
    */
+  @ApiModelProperty(value = "邮箱")
   @Email(message = "邮箱格式不正确")
   @Size(max = 50, message = "邮箱长度不能超过50个字符")
   private String email;
@@ -70,6 +79,7 @@ public class SysDept extends BaseEntity {
   /**
    * 部门状态:0正常,1停用
    */
+  @ApiModelProperty(value = "部门状态(0正常 1停用)")
   private String status;
 
   /**

+ 20 - 5
railway-system/src/main/java/com/railway/system/domain/SysOperLog.java

@@ -1,13 +1,12 @@
 package com.railway.system.domain;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import java.util.Date;
 import com.railway.common.annotation.Excel;
 import com.railway.common.annotation.Excel.ColumnType;
 import com.railway.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 操作日志记录表 oper_log
@@ -23,18 +22,21 @@ public class SysOperLog extends BaseEntity {
   /**
    * 日志主键
    */
+  @ApiModelProperty(value = "主键", hidden = true)
   @Excel(name = "操作序号", cellType = ColumnType.NUMERIC)
   private Long operId;
 
   /**
    * 操作模块
    */
+  @ApiModelProperty(value = "模块标题")
   @Excel(name = "操作模块")
   private String title;
 
   /**
    * 业务类型(0其它 1新增 2修改 3删除)
    */
+  @ApiModelProperty(value = "业务类型(0其它 1新增 2修改 3删除)")
   @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据")
   private Integer businessType;
 
@@ -46,78 +48,91 @@ public class SysOperLog extends BaseEntity {
   /**
    * 请求方法
    */
+  @ApiModelProperty(value = "方法名称")
   @Excel(name = "请求方法")
   private String method;
 
   /**
    * 请求方式
    */
+  @ApiModelProperty(value = "请求方式")
   @Excel(name = "请求方式")
   private String requestMethod;
 
   /**
    * 操作类别(0其它 1后台用户 2手机端用户)
    */
+  @ApiModelProperty(value = "操作类别(0其它 1后台用户 2手机端用户)")
   @Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户")
   private Integer operatorType;
 
   /**
    * 操作人员
    */
+  @ApiModelProperty(value = "操作人员")
   @Excel(name = "操作人员")
   private String operName;
 
   /**
    * 部门名称
    */
+  @ApiModelProperty(value = "部门名称")
   @Excel(name = "部门名称")
   private String deptName;
 
   /**
    * 请求url
    */
+  @ApiModelProperty(value = "请求url")
   @Excel(name = "请求地址")
   private String operUrl;
 
   /**
    * 操作地址
    */
+  @ApiModelProperty(value = "主机地址")
   @Excel(name = "操作地址")
   private String operIp;
 
   /**
    * 操作地点
    */
+  @ApiModelProperty(value = "操作地点")
   @Excel(name = "操作地点")
   private String operLocation;
 
   /**
    * 请求参数
    */
+  @ApiModelProperty(value = "请求参数")
   @Excel(name = "请求参数")
   private String operParam;
 
   /**
    * 返回参数
    */
+  @ApiModelProperty(value = "返回参数")
   @Excel(name = "返回参数")
   private String jsonResult;
 
   /**
    * 操作状态(0正常 1异常)
    */
+  @ApiModelProperty(value = "操作状态(0正常 1异常)")
   @Excel(name = "状态", readConverterExp = "0=正常,1=异常")
   private Integer status;
 
   /**
    * 错误消息
    */
+  @ApiModelProperty(value = "错误消息")
   @Excel(name = "错误消息")
   private String errorMsg;
 
   /**
    * 操作时间
    */
+  @ApiModelProperty(value = "操作时间")
   @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
   private Date operTime;