二维码生成地址修改，保安证编码生成修改

Administrator

2021-08-31 08363052cecb30230a2c8b3eba791ca8d1be00a5

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -26,6 +26,7 @@
import org.springblade.common.cache.ParamCache;
import org.springblade.common.cache.SysCache;
import org.springblade.common.cache.UserCache;
import org.springblade.common.constant.AgeUtil;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.constant.TenantConstant;
import org.springblade.common.enums.DictEnum;
@@ -40,6 +41,12 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.*;
import org.springblade.modules.auth.enums.UserEnum;
import org.springblade.modules.dispatcher.service.IDispatcherService;
import org.springblade.modules.dispatcher.vo.DispatcherUnitVO;
import org.springblade.modules.dispatcher.vo.DispatcherVO;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.jurisdiction.entity.Jurisdiction;
import org.springblade.modules.system.entity.*;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.mapper.UserMapper;
@@ -71,6 +78,7 @@
   private final IUserOauthService userOauthService;
   private final IRoleService roleService;
   private final BladeTenantProperties tenantProperties;
   private final IInformationService iInformationService;

   @Override
   @Transactional(rollbackFor = Exception.class)
@@ -139,7 +147,15 @@

   @Override
   public IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user) {
      return page.setRecords(baseMapper.selectUserPages(page, user));
      List<UserVO> userVOS = baseMapper.selectUserPages(page, user);
      userVOS.forEach(userVO -> {
         if (null!=userVO.getCardid() && userVO.getCardid()!=""){
            userVO.setAge(AgeUtil.idCardToAge(userVO.getCardid()));
         }else {
            userVO.setAge(null);
         }
      });
      return page.setRecords(userVOS);
   }

   @Override
@@ -304,28 +320,40 @@
      data.forEach(userExcel -> {
         User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
         // 设置租户ID
         if (!AuthUtil.isAdministrator() || StringUtil.isBlank(user.getTenantId())) {
            user.setTenantId(AuthUtil.getTenantId());
         }
         if (null != userExcel.getStatus() && userExcel.getStatus() != "") {
            if (userExcel.getStatus().equals("在职")) {
               user.setStatus(1);
            } else {
               user.setStatus(2);
         user.setTenantId("000000");
         //默认在职
         user.setStatus(1);
         //判断是否持证
         if (null != userExcel.getHold() && userExcel.getHold() != "") {
            if (userExcel.getHold().equals("是")) {
               user.setHold("1");
            }
            if(userExcel.getHold().equals("否")) {
               user.setHold("2");
            }
         }
         if (userExcel.getSex().equals("男性")) {
            user.setSex(1);
         } else {
            user.setSex(2);
         //分配保安角色
         Role role = new Role();
         role.setRoleAlias("保安");
         Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
         user.setRoleId(oneRole.getId().toString());
         //性别
         if (null!=userExcel.getSex()) {
            if (userExcel.getSex().equals("男")) {
               user.setSex(1);
            }
            if (userExcel.getSex().equals("女")) {
               user.setSex(2);
            }
         }
         user.setRoleId("1412226235153731586");
         String deptname = user.getDeptId();
         String id = userDeptService.selectIn(deptname);
         user.setDeptId(id);
         //设置部门id
         user.setDeptId(userDeptService.selectIn(user.getDeptId()));
         //设置账号
         user.setAccount(user.getCardid());
         //获取默认密码配置
         String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
         user.setPassword(initPassword);
         user.setPassword(user.getCardid().substring(user.getCardid().length()-6));
//         user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
         //新增
         this.submit(user);
      });
   }
@@ -523,4 +551,128 @@
      return baseMapper.selectUser();
   }

   /**
    * 导入保安员
    * @param data
    * @param isCovered
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
   public void importSecurity(List<UserExcel> data, Boolean isCovered) {
      data.forEach(userExcel -> {
         User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
         // 设置租户ID
         user.setTenantId("000000");
         //默认在职
         user.setStatus(1);
         //判断是否持证
         if (null != userExcel.getHold() && userExcel.getHold() != "") {
            if (userExcel.getHold().equals("是")) {
               user.setHold("1");
            }
            if(userExcel.getHold().equals("否")) {
               user.setHold("2");
            }
         }
         //分配保安角色
         Role role = new Role();
         role.setRoleAlias("保安");
         Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
         user.setRoleId(oneRole.getId().toString());

         if (null!=userExcel.getSex()) {
            if (userExcel.getSex().equals("男")) {
               user.setSex(1);
            }
            if (userExcel.getSex().equals("女")) {
               user.setSex(2);
            }
         }
         //设置部门id
         user.setDeptId(userDeptService.selectIn(user.getDeptId()));
         //设置账号
         user.setAccount(user.getCardid());
         //获取默认密码配置
         user.setPassword(user.getCardid().substring(user.getCardid().length()-6));
//         user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
         //新增
         this.submit(user);
      });
   }


   /**
    * 根据保安员编码查询保安信息
    * @param securityNumber 保安证编码
    * @return
    */
   @Override
   public UserVO getUserInfoBySecurityNumber(String securityNumber) {
      return baseMapper.getUserInfoBySecurityNumber(securityNumber);
   }


   /**
    * 保安员信息
    * @param user
    * @return
    */
   @Override
   public UserVO getUserDetails(User user) {
      return baseMapper.getUserDetails(user);
   }

   /**
    *
    * @param type 1:派遣  2：保安向
    * @param deptid
    * @param jurisdiction
    * @return
    */
   @Override
   public List<Map<String, Object>> seleL(String type,String deptid, String jurisdiction,Long userId) {
      List<Map<String, Object>> list = new ArrayList<>();
      //派遣
      if (Integer.parseInt(type)==1){
         list = baseMapper.getDispaterInfo(deptid, jurisdiction);
      }
      //工作汇报
      //保安向保安
      if (Integer.parseInt(type)==2){
         list = baseMapper.getWorkReportInfo(type,deptid, jurisdiction);
      }
      //保安向民警
      if (Integer.parseInt(type)==3){
         //查询用户信息
         User user = this.getById(userId);
         //判断用户是否被派遣
         if (null!=user.getDispatch()){
            if (user.getDispatch().equals("0")) {
               //在派遣中，向派遣所在地辖区民警汇报
               //查询派遣信息
               DispatcherVO dispatcherVO = baseMapper.getDispatcherInfoByUserId(userId);
               list = baseMapper.getWorkReportInfos(null, null, dispatcherVO.getJurisdiction());
            }
            if (user.getDispatch().equals("1")){
               //未派遣或已派遣结束，向单位所在辖区民警汇报
               Information information = new Information();
               information.setDepartmentid(user.getDeptId());
               Information one = iInformationService.getOne(Condition.getQueryWrapper(information));
               list = baseMapper.getWorkReportInfos(type,null, one.getJurisdiction());
            }
         }else {
            //未派遣或已派遣结束，向单位所在辖区民警汇报
            Information information = new Information();
            information.setDepartmentid(user.getDeptId());
            Information one = iInformationService.getOne(Condition.getQueryWrapper(information));
            list = baseMapper.getWorkReportInfos(type,null, one.getJurisdiction());
         }

      }
      //民警对民警
      if (Integer.parseInt(type)==4){
         list = baseMapper.getWorkReportInfo(type,deptid, jurisdiction);
      }
      return list;
   }
}