1.许可

tangzy

2021-12-06 cc057177b2fb17aee9a173a6adbabdc578fd74c7

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -17,8 +17,10 @@
package org.springblade.modules.system.controller;


import com.aliyun.oss.ServiceException;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -27,6 +29,7 @@
import com.alibaba.fastjson.JSON;
import lombok.AllArgsConstructor;
import org.springblade.common.cache.DictCache;
import org.springblade.common.constant.FtpConstant;
import org.springblade.common.enums.DictEnum;
import org.springblade.common.utils.arg;
import org.springblade.core.cache.utils.CacheUtil;
@@ -42,10 +45,7 @@
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.DigestUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
import org.springblade.core.tool.utils.*;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.experience.entity.Experience;
import org.springblade.modules.experience.service.IExperienceService;
@@ -180,36 +180,39 @@
   public R submit(@Valid @RequestBody User user) throws Exception {
      CacheUtil.clear(USER_CACHE);
      //查询角色
      if (null!=user.getRoleId()){
         Role role = new Role();
         role.setId(Long.parseLong(user.getRoleId()));
         Role one = roleService.getOne(Condition.getQueryWrapper(role));
         if (one.getRoleAlias().equals("保安")){
            user.setHold("1");
         }
         if (one.getRoleAlias().equals("未持证保安")){
            user.setHold("2");
         }
      }
//      if (null!=user.getRoleId()){
//         Role role = new Role();
//         role.setId(Long.parseLong(user.getRoleId()));
//         Role one = roleService.getOne(Condition.getQueryWrapper(role));
//         if (one.getRoleAlias().equals("保安")){
//            user.setHold("1");
//         }
//         if (one.getRoleAlias().equals("未持证保安")){
//            user.setHold("2");
//         }
//      }

      //根据 deptId 查询dept信息,公安管理员
      Dept dept = iDeptService.getById(user.getDeptId());
      Long sid = 1123598813738675201L;
      if (dept.getParentId().equals(sid)){
         //获取辖区的数据
         Jurisdiction jurisdiction = new Jurisdiction();
         jurisdiction.setDeptName(dept.getDeptName());
         Jurisdiction one = jurisdictionService.getOne(Condition.getQueryWrapper(jurisdiction));
         user.setJurisdiction(one.getId().toString());
      }
//      //根据 deptId 查询dept信息,公安管理员
//      Dept dept = iDeptService.getById(user.getDeptId());
//      Long sid = 1123598813738675201L;
//      if (dept.getParentId().equals(sid)){
//         //获取辖区的数据
//         Jurisdiction jurisdiction = new Jurisdiction();
//         jurisdiction.setDeptName(dept.getDeptName());
//         Jurisdiction one = jurisdictionService.getOne(Condition.getQueryWrapper(jurisdiction));
//         user.setJurisdiction(one.getId().toString());
//      }
      userService.submit(user);
      String birthday = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getBirthday());
      String rtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getRtime());
      //      String birthday = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getBirthday());
      String rtime = null;
      if (null!=user.getRtime()) {
         rtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getRtime());
      }
      String s = "insert into blade_user(id,tenant_id,account,password,name,real_name,avatar,email,phone,birthday,sex,role_id,dept_id,cardid,nativePlace,nation,education," +
         "politicaloutlook,healstats,height,address,registered,rtime,securitynumber,hold,jurisdiction) " +
         "values(" + "'" + user.getId() + "'" + "," + "'" + 000000 + "'" + "," + "'" + user.getAccount() + "'" + "," +
         "'" + user.getPassword() + "'" + "," +"'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
         "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + birthday + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
         "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
         "," + "'" + user.getDeptId() + "'" + "," + "'" + user.getCardid() + "'" + "," + "'" + user.getNativeplace() + "'" + "," + "'"
         + user.getNation() + "'" + "," + "'" + user.getEducation() + "'" + "," + "'" + user.getPoliticaloutlook() + "'" + "," + "'" + user.getHealstats() + "'"
         + "," +"'" + user.getHeight() + "'" + "," + "'" + user.getAddress() + "'" +"," + "'" + user.getRegistered() + "'"+ "," +
@@ -246,13 +249,11 @@

      String s1 =
         "update blade_user set account = " + "'" + user.getAccount()+ "'"
            + ",password = " + "'" + user.getPassword()+"'"
            + ",name = " + "'" + user.getName()+"'"
            + ",real_name = " + "'" + user.getRealName()+"'"
            + ",avatar = " + "'" + user.getAvatar()+"'"
            + ",email = " + "'" + user.getEmail()+"'"
            + ",phone = " + "'" + user.getPhone()+"'"
            + ",birthday = " + "'" + birthday+"'"
            + ",sex = " + "'" + user.getSex()+"'"
            + ",role_id = " + "'" + user.getRoleId()+"'"
            + ",dept_id = " + "'" + user.getDeptId()+"'"
@@ -348,7 +349,7 @@
   }

   /**
    * 导入用户
    * 导入用户page-security-apply
    */
   @PostMapping("import-user")
   @ApiOperationSupport(order = 12)
@@ -566,24 +567,19 @@
      //获取user
      User user = JSON.parseObject(JSON.toJSONString(userMap.get("user")),User.class);
      //判断是否为空
      if (null!=user.getHold()){
         //持证
         if (user.getHold().equals("1")){
            //分配保安角色
            Role role = new Role();
            role.setRoleAlias("保安");
            Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
            user.setRoleId(oneRole.getId().toString());
         }
         //未持证
         if (user.getHold().equals("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());
      user.setDispatch("1");

      Integer userCount = userService.selectCount(user.getAccount());
      if (userCount > 0 && Func.isEmpty(user.getId())) {
         throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
      }

      //密码加密
      if (Func.isNotEmpty(user.getPassword())) {
         user.setPassword(DigestUtil.encrypt(user.getPassword()));
@@ -607,18 +603,48 @@
      else {
         rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
      }
      String urla = "";
      if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
         String[] split = user.getAvatar().split(",");
         for (int i = 0; i < split.length; i++) {
            String s = split[i].substring(26, split[i].length());
            urla += FtpConstant.ip + s + ",";
         }
         String substring = urla.substring(0, urla.length() - 1);
         user.setAvatar(substring);
      }

      String urlf = "";
      if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
         String[] splits = user.getFingerprint().split(",");
         for (int i = 0; i < splits.length; i++) {
            String s = splits[i].substring(26, splits[i].length());
            urlf += FtpConstant.ip + s + ",";
         }
         String substrings = urla.substring(0, urlf.length() - 1);
         user.setFingerprint(substrings);
      }


      String s = "insert into blade_user(id,tenant_id,account,password,name,real_name,avatar,email,phone,birthday,sex,role_id,dept_id,cardid,nativePlace,nation,education," +
         "politicaloutlook,healstats,height,address,registered,rtime,securitynumber,hold,jurisdiction) " +
         "values(" + "'" + user.getId() + "'" + "," + "'" + 000000 + "'" + "," + "'" + user.getAccount() + "'" + "," +
         "'" + user.getPassword() + "'" + "," +"'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
         "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + birthday + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
         "," + "'" + user.getDeptId() + "'" + "," + "'" + user.getCardid() + "'" + "," + "'" + user.getNativeplace() + "'" + "," + "'"
         + user.getNation() + "'" + "," + "'" + user.getEducation() + "'" + "," + "'" + user.getPoliticaloutlook() + "'" + "," + "'" + user.getHealstats() + "'"
         + "," +"'" + user.getHeight() + "'" + "," + "'" + user.getAddress() + "'" +"," + "'" + user.getRegistered() + "'"+ "," +
         "'" + rtime + "'"+ "," + "'" + user.getSecuritynumber() + "'"+"," + "'" + user.getHold() + "'"+"," + "'" + user.getJurisdiction() + "'"+")";
      String s = "insert into blade_user(id,tenant_id,account,password,name,real_name,avatar,email,phone,sex,role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
         "politicaloutlook,healstats,height,address,registered,rtime,securitynumber,hold,jurisdiction,dispatch) " +
         "values(" + "'" + user.getId() + "'" + "," + "'" + user.getTenantId() + "'" + "," + "'" + user.getAccount() + "'" + "," +
         "'" + user.getPassword() + "'" + "," + "'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
         "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
         "," + "'" + user.getDeptId() + "'" +
         "," + "'" + user.getCardid() + "'" +
         "," + "'" + user.getNativeplace() + "'" +
         "," + "'" + user.getNation() + "'" +
         "," + "'" + user.getFingerprint() + "'" +
         "," + "'" + user.getEducation() + "'" +
         "," + "'" + user.getPoliticaloutlook() + "'" +
         "," + "'" + user.getHealstats() + "'"
         + "," + "'" + user.getHeight() + "'" +
         "," + "'" + user.getAddress() + "'" +
         "," + "'" + user.getRegistered() + "'" + "," +
         "'" + rtime + "'" + "," + "'" + user.getSecuritynumber() + "'" +
         "," + "'" + user.getHold() + "'" +
         "," + "'" + user.getJurisdiction() + "'" +
         "," + "'" + user.getDispatch() + "'" + ")";
      FtpUtil.sqlFileUpload(s);

      //获取从业记录
@@ -659,8 +685,8 @@
    * @return
    */
   @GetMapping("/seleL")
   public R seleL(String type,String deptid, String jurisdiction) {
      List<Map<String, Object>> list = userService.seleL(type,deptid, jurisdiction);
   public R seleL(String type,String deptid, String jurisdiction,Long userId) {
      List<Map<String, Object>> list = userService.seleL(type,deptid, jurisdiction,userId);
      return R.data(list);
   }