【CHG】注册，线路类型

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

@@ -56,6 +56,7 @@ public class BusLineController extends BaseController {
   @GetMapping(value = {"/", "/{lineId}"})
   public AjaxResult getInfo(String lineId) {
     BusLine info = busLineService.getInfo(lineId);
+    busLineService.setXingbieList(info);
     AjaxResult ajax = AjaxResult.success();
     ajax.put("info", info);
     return ajax;
@@ -66,6 +67,9 @@ public class BusLineController extends BaseController {
   public TableDataInfo getList(BusLine busLine) {
     startPage();
     List<BusLine> list = busLineService.getList(busLine);
+    for(BusLine line : list){
+      busLineService.setXingbieList(line);
+    }
     return getDataTable(list);
   }
 

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

@@ -23,6 +23,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import javax.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -90,12 +91,11 @@ public class BusStationController extends BaseController {
   }
 
   @ApiOperation(value = "基础数据级联")
+  @PreAuthorize("@ss.hasPermi('system:dept:list')")
   @GetMapping(value = "cascade")
   public TableDataInfo cascade() {
     // 构建机构树
-    SysDept dept = new SysDept();
-    dept.setDeptId(SecurityUtils.getDeptId());
-    List<SysDept> depts = deptService.selectDeptList(dept);
+    List<SysDept> depts = deptService.selectDeptList();
     List<SysDept> deptTrees = deptService.buildDeptTree(depts);
     List<CascadeDeptVo> cascadeDeptList = busStationService.buildCascadeDept(deptTrees);
     Map<Long, CascadeDeptVo> cascadeDeptVoMap = new LinkedHashMap<>();

railway-admin/src/main/java/com/railway/web/controller/system/SysConfigController.java

@@ -59,7 +59,7 @@ public class SysConfigController extends BaseController {
   @GetMapping("/export")
   public AjaxResult export(SysConfig config) {
     List<SysConfig> list = configService.selectConfigList(config);
-    ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
+    ExcelUtil<SysConfig> util = new ExcelUtil<>(SysConfig.class);
     String localFilePath = util.exportExcel(list, "参数数据");
     return sysFileService.uploadFile(localFilePath);
   }

railway-admin/src/main/java/com/railway/web/controller/system/SysRegisterController.java

@@ -6,6 +6,7 @@ import com.railway.common.core.domain.model.RegisterBody;
 import com.railway.framework.web.service.SysRegisterService;
 import com.railway.system.service.ISysConfigService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -16,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
  *
  * @author railway
  */
-@Api(tags = "注册验证")
+@Api(tags = "权限认证 - 用户注册")
 @RestController
 public class SysRegisterController extends BaseController {
 
@@ -29,9 +30,10 @@ public class SysRegisterController extends BaseController {
     this.configService = configService;
   }
 
+  @ApiOperation(value = "注册", notes = "注册方法", response = AjaxResult.class)
   @PostMapping("/register")
   public AjaxResult register(@RequestBody RegisterBody user) {
-    if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
+    if (!configService.selectRegisterUser()) {
       return error("当前系统没有开启注册功能！");
     }
     String msg = registerService.register(user);

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

@@ -3,6 +3,7 @@ package com.railway.business.baseinfo.domain;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
@@ -36,6 +37,9 @@ public class BusLine extends BaseEntity {
   @Length(min = 1, max = 4, message = "【行别】长度必须介于 {min} 和 {max} 之间")
   private String xingbie;
 
+  @ApiModelProperty(value = "行别类型")
+  private List<String> xingbieType;
+
   @ApiModelProperty(value = "行别")
   private String xingbieText;
 

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

@@ -17,7 +17,7 @@ import org.hibernate.validator.constraints.Length;
 public class BusSubstation extends BaseEntity {
 
   @ApiModelProperty(value = "主键", hidden = true)
-  private String substationId;
+  private Long substationId;
 
   @ApiModelProperty(value = "管理车间id")
   private Long deptId;

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

@@ -41,4 +41,10 @@ public interface IBusLineService {
    */
   List<BusLine> getList();
 
+  /**
+   * 设置线路的行别类型列表
+   * @param busLine 线路信息
+   */
+  void setXingbieList(BusLine busLine);
+
 }

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

@@ -1,9 +1,12 @@
 package com.railway.business.baseinfo.service.impl;
 
 import com.railway.business.baseinfo.domain.BusLine;
+import com.railway.business.baseinfo.domain.enums.XingbieEnum;
 import com.railway.business.baseinfo.mapper.BusLineMapper;
 import com.railway.business.baseinfo.service.IBusLineService;
 import com.railway.common.utils.SecurityUtils;
+import com.railway.common.utils.StringUtils;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import org.springframework.stereotype.Service;
@@ -85,4 +88,35 @@ public class BusLineServiceImpl implements IBusLineService {
     return busLineMapper.getList(null);
   }
 
+  /**
+   * 设置线路的行别类型列表
+   *
+   * @param busLine 线路信息
+   */
+  @Override
+  public void setXingbieList(BusLine busLine) {
+    if(null == busLine){
+      return;
+    }
+
+    List<String> xingbieType = busLine.getXingbieType();
+    if(null == xingbieType){
+      xingbieType = new ArrayList<>();
+      busLine.setXingbieType(xingbieType);
+    }
+    String single = "单线";
+    if(single.equals(busLine.getLineType())){
+      xingbieType.add(XingbieEnum.DX.getCode());
+    }
+
+    if(StringUtils.isNotNull(busLine.getUpStartMarker()) && busLine.getUpStartMarker() > 0){
+      xingbieType.add(XingbieEnum.SX.getCode());
+    }
+
+    if(StringUtils.isNotNull(busLine.getDownStartMarker()) && busLine.getDownStartMarker() > 0){
+      xingbieType.add(XingbieEnum.XX.getCode());
+    }
+
+  }
+
 }

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

@@ -84,6 +84,12 @@ public class SysDept extends BaseEntity {
   @ApiModelProperty(value = "部门状态（0正常 1停用）")
   private String status;
 
+  /**
+   * 成员数量
+   */
+  @ApiModelProperty(value = "成员数量")
+  private Integer userCount;
+
   /**
    * 删除标志（0代表存在 1代表删除）
    */

railway-common/src/main/java/com/railway/common/core/domain/entity/SysRole.java

@@ -4,6 +4,7 @@ import com.railway.common.annotation.Excel;
 import com.railway.common.annotation.Excel.ColumnType;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 import lombok.Data;
@@ -72,6 +73,12 @@ public class SysRole extends BaseEntity {
   @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用")
   private String status;
 
+  /**
+   * 成员数量
+   */
+  @ApiModelProperty(value = "成员数量")
+  private Integer userCount;
+
   /**
    * 删除标志（0代表存在 1代表删除）
    */

railway-system/src/main/java/com/railway/system/mapper/SysUserMapper.java

@@ -53,6 +53,14 @@ public interface SysUserMapper {
    */
   SysUser selectUserById(Long userId);
 
+  /**
+   * 通过部门ID查询成员数量
+   *
+   * @param deptId 部门ID
+   * @return 结果
+   */
+  int countUserByDeptId(Long deptId);
+
   /**
    * 新增用户信息
    *

railway-system/src/main/java/com/railway/system/service/ISysConfigService.java

@@ -26,6 +26,13 @@ public interface ISysConfigService {
    */
   String selectConfigByKey(String configKey);
 
+  /**
+   * 注册开关
+   *
+   * @return true开启，false关闭
+   */
+  boolean selectRegisterUser();
+
   /**
    * 获取验证码开关
    *

railway-system/src/main/java/com/railway/system/service/ISysUserService.java

@@ -1,8 +1,7 @@
 package com.railway.system.service;
 
-import java.util.List;
 import com.railway.common.core.domain.entity.SysUser;
-import com.railway.system.domain.SysUserRole;
+import java.util.List;
 
 /**
  * 用户 业务层

railway-system/src/main/java/com/railway/system/service/impl/SysConfigServiceImpl.java

@@ -77,6 +77,16 @@ public class SysConfigServiceImpl implements ISysConfigService {
     return StringUtils.EMPTY;
   }
 
+  /**
+   * 注册开关
+   *
+   * @return true开启，false关闭
+   */
+  @Override
+  public boolean selectRegisterUser() {
+    return getBoolValue("sys.account.registerUser");
+  }
+
   /**
    * 获取验证码开关
    *
@@ -84,11 +94,7 @@ public class SysConfigServiceImpl implements ISysConfigService {
    */
   @Override
   public boolean selectCaptchaOnOff() {
-    String captchaOnOff = selectConfigByKey("sys.account.captchaOnOff");
-    if (StringUtils.isEmpty(captchaOnOff)) {
-      return true;
-    }
-    return Convert.toBool(captchaOnOff);
+    return getBoolValue("sys.account.captchaOnOff");
   }
 
   /**
@@ -186,9 +192,9 @@ public class SysConfigServiceImpl implements ISysConfigService {
    */
   @Override
   public String checkConfigKeyUnique(SysConfig config) {
-    Long configId = StringUtils.isNull(config.getConfigId()) ? -1L : config.getConfigId();
+    long configId = StringUtils.isNull(config.getConfigId()) ? -1L : config.getConfigId();
     SysConfig info = configMapper.checkConfigKeyUnique(config.getConfigKey());
-    if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue()) {
+    if (StringUtils.isNotNull(info) && info.getConfigId() != configId) {
       return UserConstants.NOT_UNIQUE;
     }
     return UserConstants.UNIQUE;
@@ -203,4 +209,17 @@ public class SysConfigServiceImpl implements ISysConfigService {
   private String getCacheKey(String configKey) {
     return Constants.SYS_CONFIG_KEY + configKey;
   }
+
+  /**
+   * 获取Bool类型的系统配置
+   * @param configKey 参数键
+   * @return true开启，false关闭
+   */
+  private boolean getBoolValue(String configKey){
+    String captchaOnOff = selectConfigByKey(configKey);
+    if (StringUtils.isEmpty(captchaOnOff)) {
+      return true;
+    }
+    return Convert.toBool(captchaOnOff);
+  }
 }

railway-system/src/main/java/com/railway/system/service/impl/SysDeptServiceImpl.java

@@ -14,6 +14,7 @@ import com.railway.common.utils.TreeSelectUtil;
 import com.railway.common.utils.spring.SpringUtils;
 import com.railway.system.mapper.SysDeptMapper;
 import com.railway.system.mapper.SysRoleMapper;
+import com.railway.system.mapper.SysUserMapper;
 import com.railway.system.service.ISysDeptService;
 import java.util.ArrayList;
 import java.util.List;
@@ -30,11 +31,13 @@ public class SysDeptServiceImpl implements ISysDeptService {
 
   private final SysDeptMapper deptMapper;
   private final SysRoleMapper roleMapper;
+  private final SysUserMapper userMapper;
 
   public SysDeptServiceImpl(SysDeptMapper deptMapper,
-      SysRoleMapper roleMapper) {
+      SysRoleMapper roleMapper, SysUserMapper userMapper) {
     this.deptMapper = deptMapper;
     this.roleMapper = roleMapper;
+    this.userMapper = userMapper;
   }
 
   /**
@@ -59,7 +62,11 @@ public class SysDeptServiceImpl implements ISysDeptService {
   @Override
   @DataScope(deptAlias = "d")
   public List<SysDept> selectDeptList(SysDept dept) {
-    return deptMapper.selectDeptList(dept);
+    List<SysDept> deptList = deptMapper.selectDeptList(dept);
+    for(SysDept sysDept : deptList){
+      sysDept.setUserCount(userMapper.countUserByDeptId(sysDept.getDeptId()));
+    }
+    return deptList;
   }
 
   /**

railway-system/src/main/java/com/railway/system/service/impl/SysRoleServiceImpl.java

@@ -55,7 +55,11 @@ public class SysRoleServiceImpl implements ISysRoleService {
   @Override
   @DataScope(deptAlias = "d")
   public List<SysRole> selectRoleList(SysRole role) {
-    return roleMapper.selectRoleList(role);
+    List<SysRole> roleList = roleMapper.selectRoleList(role);
+    for(SysRole sysRole : roleList){
+      sysRole.setUserCount(userRoleMapper.countUserRoleByRoleId(sysRole.getRoleId()));
+    }
+    return roleList;
   }
 
   /**

railway-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -147,6 +147,10 @@
     where u.user_id = #{userId}
   </select>
 
+  <select id="countUserByDeptId" resultType="Integer">
+    select count(1) from sys_user where dept_id = #{deptId}
+  </select>
+
   <select id="checkUserNameUnique" parameterType="String" resultType="int">
     select count(1) from sys_user where user_name = #{userName} limit 1
   </select>