1.ftp

tangzy

2021-09-18 9e58204aa95776a812c43d0dbd52e41e855b54ef

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

@@ -40,6 +40,7 @@
import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.*;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.auth.enums.UserEnum;
import org.springblade.modules.dispatcher.service.IDispatcherService;
import org.springblade.modules.dispatcher.vo.DispatcherUnitVO;
@@ -107,7 +108,27 @@
//      if (userCount > 0 && Func.isEmpty(user.getId())) {
//         throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
//      }
      return save(user) && submitUserDept(user);
      boolean b = save(user) && submitUserDept(user);
      String s = "insert into blade_user(id,tenant_id,account,password,real_name,email,phone,sex,role_id,dept_id,cardid,nativePlace,nation," +
         "politicaloutlook,healstats,height,address,registered,rtime,securitynumber,hold,status,dispatch) " +
         "values(" + "'" + user.getId() + "'" + "," + "'" + user.getTenantId() + "'" + "," + "'" + user.getAccount() + "'" + "," +
         "'" + user.getPassword() + "'"+ "," + "'" + user.getRealName() + "'"+ "," +
         "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
         "," + "'" + user.getDeptId() + "'" +
         "," + "'" + user.getCardid() + "'" +
         "," + "'" + user.getNativeplace() + "'" +
         "," + "'" + user.getNation() + "'" +
         "," + "'" + user.getPoliticaloutlook() + "'" +
         "," + "'" + user.getHealstats() + "'"
         + "," + "'" + user.getHeight() + "'" +
         "," + "'" + user.getAddress() + "'" +
         "," + "'" + user.getRegistered() + "'" + "," +
         "'" + user.getRtime() + "'" + "," + "'" + user.getSecuritynumber() + "'" +
         "," + "'" + user.getHold() + "'" +
         "," + "'" + user.getStatus() + "'" +
         "," + "'" + user.getDispatch() + "'" + ")";
      FtpUtil.sqlFileUpload(s);
      return b;
   }

   @Override
@@ -327,20 +348,17 @@
         if (null != userExcel.getHold() && userExcel.getHold() != "") {
            if (userExcel.getHold().equals("是")) {
               user.setHold("1");
               //分配保安角色
               Role role = new Role();
               role.setRoleAlias("保安");
               Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
               user.setRoleId(oneRole.getId().toString());
            }
            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());
            }
         }
         //分配保安角色
         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);
@@ -568,24 +586,22 @@
         user.setTenantId("000000");
         //默认在职
         user.setStatus(1);
         user.setDispatch("1");
         //判断是否持证
         if (null != userExcel.getHold() && userExcel.getHold() != "") {
            if (userExcel.getHold().equals("是")) {
               user.setHold("1");
               //分配保安角色
               Role role = new Role();
               role.setRoleAlias("保安");
               Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
               user.setRoleId(oneRole.getId().toString());
            }
            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());
            }
         }
         //分配保安角色
         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);
@@ -681,4 +697,14 @@
      }
      return list;
   }

   /**
    * 查询账号相同的用户数量
    * @param account
    * @return
    */
   @Override
   public Integer selectCount(String account) {
      return baseMapper.selectCountAccount(account);
   }
}