新增流程节点进程查询接口

zhongrj

2023-09-17 8853292babb2ad94de4a3207966f1e83b767cd2d

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

@@ -56,14 +56,11 @@
import org.springblade.core.tool.api.R;
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.*;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.accreditation.entity.AccreditationRecords;
import org.springblade.modules.accreditation.service.AccreditationRecordsService;
import org.springblade.modules.dispatcher.entity.Dispatcher;
import org.springblade.modules.dispatcher.service.IDispatcherService;
import org.springblade.modules.exam.excel.ExportExamScoreExcel;
import org.springblade.modules.experience.entity.Experience;
import org.springblade.modules.experience.service.IExperienceService;
import org.springblade.modules.jurisdiction.entity.Jurisdiction;
@@ -82,12 +79,10 @@
import org.springblade.modules.system.service.IRoleService;
import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.system.service.MyAsyncService;
import org.springblade.modules.system.vo.DeptVO;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.system.wrapper.UserWrapper;
import org.springblade.modules.training.entity.TrainingRegistration;
import org.springblade.modules.training.service.TrainingRegistrationService;
import org.springframework.scheduling.annotation.Async;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -97,18 +92,12 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;

import static org.springblade.common.config.FtpConfig.*;
import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;

/**
@@ -210,11 +199,8 @@
   })
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "列表", notes = "传入account和realName")
   //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
   public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
      System.out.println("在线更新代码.... ");
      IPage<UserVO> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
      System.out.println("=================在线更新代码==================");
   public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId) {
      IPage<UserVO> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (AuthUtil.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : AuthUtil.getTenantId()));
      return R.data(pages);
   }

@@ -236,6 +222,18 @@
         if (userCount > 0) {
            throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
         }
         // 校验保安员，如果角色为保安员，则需要判断身份证号是否已注册
         List<String> roleIds = Arrays.asList(user.getRoleId().split(","));
         String roleId = "1412226235153731586";
         if (roleIds.contains(roleId)){
            // 判断是否已存在，通过身份证号码查询用户信息
            QueryWrapper<User> wrapper = new QueryWrapper<>();
            wrapper.eq("is_deleted",0).eq("status",1).eq("cardid",user.getCardid()).like("role_id","%"+roleId+"%");
            List<User> list = userService.list(wrapper);
            if (list.size()>0){
               throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前保安员身份证号码 [{}] 已存在!", user.getCardid()));
            }
         }
         user.setTenantId("000000");
         user.setStatus(1);
         user.setIsDeleted(0);
@@ -254,51 +252,12 @@
         }
         //新增
         boolean stats = userService.save(user);
         if (stats) {
            //内网同步
            String s = "insert into blade_user(" +
               "id,tenant_id,code,account,password,real_name,phone,sex,role_id,dept_id," +
               "create_time,update_time,cardid,status,is_deleted,jurisdiction) " +
               "values(" + "'" + user.getId() + "'" + "," +
               "'" + user.getTenantId() + "'" + "," +
               "'" + user.getCode() + "'" + "," +
               "'" + user.getAccount() + "'" + "," +
               "'" + user.getPassword() + "'" + "," +
               "'" + user.getRealName() + "'" + "," +
               "'" + user.getPhone() + "'" + "," +
               "'" + user.getSex() + "'" + "," +
               "'" + user.getRoleId() + "'" +
               "," + "'" + user.getDeptId() + "'" +
               "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" +
               "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'" +
               "," + "'" + user.getCardid() + "'" +
               "," + "'" + user.getStatus() + "'" +
               "," + "'" + user.getIsDeleted() + "'" +
               "," + "'" + user.getJurisdiction() + "'"
               + ")";
            myAsyncService.dataSync(s);
         }
      } else {
         //修改
         User user1 = userService.getById(user.getId());
         user.setPassword(user1.getPassword());
         user.setUpdateTime(new Date());
         boolean b = userService.updateById(user);
         if (b) {
            String s1 =
               "update blade_user set account = " + "'" + user.getAccount() + "'"
                  + ",code = " + "'" + user.getCode() + "'"
                  + ",real_name = " + "'" + user.getRealName() + "'"
                  + ",phone = " + "'" + user.getPhone() + "'"
                  + ",sex = " + "'" + user.getSex() + "'"
                  + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
                  + ",role_id = " + "'" + user.getRoleId() + "'"
                  + ",dept_id = " + "'" + user.getDeptId() + "'"
                  + ",cardid = " + "'" + user.getCardid() + "'"
                  + ",guncode = " + "'" + user.getGuncode() + "'"
                  + " " + "where id = " + "'" + user.getId() + "'";
            myAsyncService.dataSync(s1);
         }
      }

      //返回