管理员新增和查询

src/main/java/com/rf/psychological/institution/repository/InstitutionRepository.java

@@ -23,15 +23,9 @@ public interface InstitutionRepository extends BaseRepository<InstitutionEntity,
     @Query(value = "select count(1) from t_institution_info  where if(:searchKey is not null and :searchKey!='',institution_no like CONCAT('%',:searchKey,'%') ,1=1) or if(:searchKey is not null and :searchKey!='',institution_name like CONCAT('%',:searchKey,'%') ,1=1)", nativeQuery = true)
     int allInstitutionNum(@Param("searchKey") String searchKey);
 
-    /**
-     * 根据机构编号查询机构信息
-     * @param institutionNo
-     * @return
-     */
-    //@Query(value = "select id,institution_name,institution_no,login_name,password from t_institution_info  where institution_no = :institutionNo", nativeQuery = true)
-    //InstitutionEntity findByInstitutionNo(@Param("institutionNo") String institutionNo);
     InstitutionEntity findByInstitutionNo(String institutionNo);
 
 
     void  deleteByInstitutionNo(String institutionNo);
+
 }

src/main/java/com/rf/psychological/institution/service/impl/InstitutionServiceImpl.java

@@ -103,7 +103,7 @@ public class InstitutionServiceImpl implements InstitutionService {
             saveInstitutionVO.getAdminList().forEach(item->{
                         UserEntity institutionUserEntity = new UserEntity(institutionNo,institutionName, item.get("loginName").toString(),
                         item.get("loginName").toString(), DigestUtils.md5DigestAsHex(item.get("password").toString().getBytes()),
-                        LocalDate.now().toString(),Constant.DEFAULT_VALUE_ZERO, UserStatus.PASS.getType(), UserRole.ADMIN.getType());
+                        LocalDate.now().toString(),Constant.DEFAULT_VALUE_ZERO, UserStatus.PASS.getType(), UserRole.SUPERADMIN.getType());
                         institutionUserEntity.setCreateTime(DateUtil.now());
                         institutionUserEntity.setStructureNo(institutionNo);
                         userService.save(institutionUserEntity);

src/main/java/com/rf/psychological/user/dao/repository/UserRepository.java

@@ -3,6 +3,7 @@ package com.rf.psychological.user.dao.repository;
 import com.rf.psychological.base.repository.BaseRepository;
 import com.rf.psychological.user.dao.model.UserEntity;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
@@ -198,4 +199,6 @@ public interface UserRepository extends BaseRepository<UserEntity, String> {
     UserEntity findByPhoneAndPasswordAndRoleType(String phone, String password, String roleType);
 
     List<UserEntity> findByStructureNo(String structureNo);
+    @Query(value="select * from t_user_info where institution_no =:institutionNo and role_type =3 and phone !=:phone" ,nativeQuery = true)
+    Page<UserEntity> findAdmin(@Param("institutionNo") String institutionNo, @Param("phone") String phone, Pageable pageable);
 }

src/main/java/com/rf/psychological/user/rest/UserController.java

@@ -1,12 +1,10 @@
 package com.rf.psychological.user.rest;
 
-import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Validator;
 import com.alibaba.fastjson.JSONObject;
 import com.rf.psychological.base.rest.BaseController;
 import com.rf.psychological.enums.UserRole;
-import com.rf.psychological.enums.UserStatus;
 import com.rf.psychological.group.dao.model.GroupEntity;
 import com.rf.psychological.group.rest.GroupInfoController;
 import com.rf.psychological.group.service.GroupInfoService;
@@ -20,7 +18,6 @@ import com.rf.psychological.security.SafetyProcess;
 import com.rf.psychological.user.dao.model.UserEntity;
 import com.rf.psychological.user.service.UserService;
 import com.rf.psychological.utils.Constant;
-import com.rf.psychological.utils.JWTUtil;
 import com.rf.psychological.utils.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -31,13 +28,9 @@ import org.springframework.data.domain.Page;
 import org.springframework.util.DigestUtils;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpSession;
 import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
 import java.util.List;
 
-import static cn.hutool.core.date.DatePattern.PURE_DATETIME_PATTERN;
-
 
 /**
  * @author zsy
@@ -377,4 +370,55 @@ public class UserController extends BaseController {
         }
     }
 
+    /**
+     * 添加管理员
+     * @param jsonParam
+     * @return
+     */
+    @PostMapping("/addAdminUser")
+    @ApiOperation(value = "添加管理员",notes = "json字符串形式传参（加密）,data参数包括:data:注册用户基本信息《gender:性别，password:密码，roleType:角色，institutionNo:机构编号，phone:账号，mobile：手机号,petName：名称》")
+    @SafetyProcess
+    public Result addAdminUser(@RequestBody String jsonParam){
+        try {
+            String data = AesEncryptUtils.decrypt(JSONObject.parseObject(jsonParam).getString("data"));
+            JSONObject jsonData = JSONObject.parseObject(data);
+            UserEntity userEntity = jsonData.toJavaObject(UserEntity.class);
+            String institutionNo = userEntity.getInstitutionNo();
+            if (StringUtils.isEmpty(institutionNo)){
+                return fail("","机构编号不能为空");
+            }
+            //判断机构编号是否存在
+            InstitutionEntity institutionEntity = this.institutionService.findByInstitutionNo(institutionNo);
+            if (institutionEntity == null) {
+                return fail("", "机构编号不存在！");
+            }
+            userEntity.setInstitutionName(institutionEntity.getInstitutionName());
+            UserEntity userInfo = this.userService.findPhoneAndInstitutionNoAndRoleType(userEntity.getPhone(), userEntity.getInstitutionNo(),userEntity.getRoleType());
+            if (userInfo == null) {
+                userEntity.setCreateTime(DateUtil.now());
+                userEntity.setStructureNo(institutionNo);
+                userEntity.setPassword(DigestUtils.md5DigestAsHex(userEntity.getPassword().getBytes()));
+                this.userService.save(userEntity);
+                return success();
+            } else {
+                return fail("", "账号已注册");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            return fail();
+        }
+    }
+
+    @GetMapping("/getAdminUser")
+    @ApiOperation(value = "获取管理员")
+    @SafetyProcess
+    public Result getAdminUser(@RequestParam int pageNum,@RequestParam int pageSize, @RequestParam String institutionNo,@RequestParam String phone){
+        try {
+            Page<UserEntity> userEntityPage = userService.findAdmin(pageNum,pageSize,institutionNo,phone);
+            return success(userEntityPage);
+        }catch (Exception e){
+            return fail("操作失败");
+        }
+
+    }
 }

src/main/java/com/rf/psychological/user/service/UserService.java

@@ -226,4 +226,6 @@ public interface UserService {
     List<UserEntity> findByStructureNo(String structureNo);
 
     Page findUserByStructureNo(int pageNum, int pageSize, String institutionNo, String structureNo);
+
+    Page<UserEntity> findAdmin(int pageNum, int pageSize, String institutionNo,String phone);
 }

src/main/java/com/rf/psychological/user/service/impl/UserServiceImpl.java

@@ -352,6 +352,11 @@ public class UserServiceImpl implements UserService {
         return result;
     }
 
+    @Override
+    public Page<UserEntity> findAdmin(int pageNum, int pageSize, String institutionNo, String phone) {
+        return userRepository.findAdmin(institutionNo,phone,PageRequestUtil.of(pageNum,pageSize));
+    }
+
 
     /**
      * 改变用户状态