user服务代码整理

user-service/src/main/java/com/diagbot/facade/PermissionFacade.java

@@ -26,6 +26,7 @@ public class PermissionFacade extends PermissionServiceImpl {
 
     /**
      * 获取资源信息
+     *
      * @param appkey 参数
      * @param secret 参数
      * @return 资源信息
@@ -33,11 +34,13 @@ public class PermissionFacade extends PermissionServiceImpl {
     public RespDTO getPermission(String appkey, String secret) {
         User user = userFacade.findByName(appkey);
         if (null == user) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "未找到对应的appkey【" + appkey + "】");
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "未找到对应的appkey【" + appkey + "】");
         }
         PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
         if (!passwordEncoder.matches(secret, user.getPassword())) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "appkey 或 secret 错误【" + appkey + "," + secret + "】");
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "appkey 或 secret 错误【" + appkey + "," + secret + "】");
         }
         List<Permission> permissions = this.getPermissionByUserId(user.getId());
         return RespDTO.onSuc(permissions);

user-service/src/main/java/com/diagbot/facade/UserAuthenticationFacade.java

@@ -248,28 +248,28 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
         waitAuthenDTO.setCount(count);
         return waitAuthenDTO;
     }
-    
-    public List<Integer> getAuthInfoCount(Long userId){
-    	List<Integer> ret = new ArrayList<>();
-    	Integer authIngCount = 0;
-    	Integer authRejectCount = 0;
-    	User user = userFacade.getById(userId);
-    	if(user.getAuthStatus()==2){
-    		authIngCount = 1;
-    	}else if(user.getAuthStatus()==0){
-    		 QueryWrapper<UserAuthentication> qw = new QueryWrapper<>();
-    	     qw.eq("user_id", userId).
-    	                eq("is_deleted", IsDeleteEnum.N.getKey()).
-    	                orderByDesc("gmt_create");
-    	     UserAuthentication userAuthentication = this.getOne(qw, false);
-    	     if(userAuthentication!=null&&userAuthentication.getIsReject()==0){
-    	    	 authRejectCount = 1;
-    	     }
-    	}
-    	
-    	ret.add(authIngCount);
-    	ret.add(authRejectCount);
-    
-    	return ret;
+
+    public List<Integer> getAuthInfoCount(Long userId) {
+        List<Integer> ret = new ArrayList<>();
+        Integer authIngCount = 0;
+        Integer authRejectCount = 0;
+        User user = userFacade.getById(userId);
+        if (user.getAuthStatus() == 2) {
+            authIngCount = 1;
+        } else if (user.getAuthStatus() == 0) {
+            QueryWrapper<UserAuthentication> qw = new QueryWrapper<>();
+            qw.eq("user_id", userId).
+                    eq("is_deleted", IsDeleteEnum.N.getKey()).
+                    orderByDesc("gmt_create");
+            UserAuthentication userAuthentication = this.getOne(qw, false);
+            if (userAuthentication != null && userAuthentication.getIsReject() == 0) {
+                authRejectCount = 1;
+            }
+        }
+
+        ret.add(authIngCount);
+        ret.add(authRejectCount);
+
+        return ret;
     }
 }

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -65,7 +65,6 @@ import com.diagbot.vo.UserInfoAuditVO;
 import com.diagbot.vo.UserInfoOrganizationsVO;
 import com.diagbot.vo.UserSaveVO;
 import com.diagbot.vo.UsernameVO;
-
 import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.factory.PasswordEncoderFactories;
@@ -136,7 +135,8 @@ public class UserFacade extends UserServiceImpl {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "请输入正确的手机号");
         }
 
-        verFacade.verifyImgVerification(imgVerVerVO); //保存时再次校验图形验证码，主要是为了防止跳过前端校验直接调用接口
+        //保存时再次校验图形验证码，主要是为了防止跳过前端校验直接调用接口
+        verFacade.verifyImgVerification(imgVerVerVO);
 
         PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
         String entryPassword = passwordEncoder.encode(user.getPassword());
@@ -268,7 +268,8 @@ public class UserFacade extends UserServiceImpl {
             paramMap1.put("is_deleted", IsDeleteEnum.N.getKey());
             List<UserOrganization> res1 = userOrganizationFacade.selectByMap(paramMap1);
             if (ListUtil.isNotEmpty(res1)) {
-                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该机构下已存在用户，不能再添加别的用户");
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                        "该机构下已存在用户，不能再添加别的用户");
             }
         }
 
@@ -391,7 +392,8 @@ public class UserFacade extends UserServiceImpl {
         if (!passwordEncoder.matches(password, user.getPassword())) {
             throw new CommonException(ServiceErrorCode.USER_PASSWORD_ERROR);
         }
-        JWT jwt = authServiceClient.getToken("Basic dWFhLXNlcnZpY2U6MTIzNDU2", "password", username, password);
+        JWT jwt = authServiceClient.getToken("Basic dWFhLXNlcnZpY2U6MTIzNDU2",
+                "password", username, password);
         if (null == jwt) {
             throw new CommonException(ServiceErrorCode.GET_TOKEN_FAIL);
         }
@@ -425,7 +427,8 @@ public class UserFacade extends UserServiceImpl {
             throw new CommonException(CommonErrorCode.TOKEN_PAST);
         }
 
-        JWT jwt = authServiceClient.refreshToken("Basic dWFhLXNlcnZpY2U6MTIzNDU2", "refresh_token", refreshToken);
+        JWT jwt = authServiceClient.refreshToken("Basic dWFhLXNlcnZpY2U6MTIzNDU2",
+                "refresh_token", refreshToken);
         if (null == jwt) {
             throw new CommonException(ServiceErrorCode.GET_TOKEN_FAIL);
         }
@@ -452,7 +455,8 @@ public class UserFacade extends UserServiceImpl {
                     "令牌不能为空");
         }
 
-        OAuth2AccessToken jwt = authServiceClient.checkToken("Basic dWFhLXNlcnZpY2U6MTIzNDU2", token);
+        OAuth2AccessToken jwt
+                = authServiceClient.checkToken("Basic dWFhLXNlcnZpY2U6MTIzNDU2", token);
         if (null == jwt) {
             throw new CommonException(ServiceErrorCode.GET_TOKEN_FAIL);
         }
@@ -588,7 +592,8 @@ public class UserFacade extends UserServiceImpl {
                     "用户不存在【" + userId + "】");
         }
 
-        PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
+        PasswordEncoder passwordEncoder
+                = PasswordEncoderFactories.createDelegatingPasswordEncoder();
         if (!passwordEncoder.matches(password, user.getPassword())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "原密码错误");
         }
@@ -610,7 +615,8 @@ public class UserFacade extends UserServiceImpl {
      */
     //@CachePut(value = CACHE_NAME, key = "'user:'+#p0['id']")
     public User saveUser(User user) {
-        PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
+        PasswordEncoder passwordEncoder
+                = PasswordEncoderFactories.createDelegatingPasswordEncoder();
         String entryPassword = passwordEncoder.encode(user.getPassword());
         user.setPassword(entryPassword);
         user.setGmtCreate(new Date());
@@ -627,7 +633,8 @@ public class UserFacade extends UserServiceImpl {
      */
     //@CachePut(value = CACHE_NAME, key = "'user:'+#p0['id']")
     public User updateUser(User user) {
-        PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
+        PasswordEncoder passwordEncoder
+                = PasswordEncoderFactories.createDelegatingPasswordEncoder();
         String entryPassword = passwordEncoder.encode(user.getPassword());
         user.setPassword(entryPassword);
         user.setGmtModified(new Date());
@@ -1131,10 +1138,8 @@ public class UserFacade extends UserServiceImpl {
             userIds.add(userInfoId);
         }
         if (userIds.size() > 0) {
-
-
-            RespDTO<List<UserAndProdutDTO>> InformationData = diagbotmanClient.getInformationAvailableAll(userIds);
-
+            RespDTO<List<UserAndProdutDTO>> InformationData
+                    = diagbotmanClient.getInformationAvailableAll(userIds);
             if (InformationData == null || !"0".equals(InformationData.code)) {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                         "获取所有开通信息失败");
@@ -1165,7 +1170,9 @@ public class UserFacade extends UserServiceImpl {
      * @param userName
      * @return
      */
-    public RespDTO<IPage<AuthenticationDTO>> queryAuthentications(Page page, String orgName, String userName, String startTime, String endTime) {
+    public RespDTO<IPage<AuthenticationDTO>> queryAuthentications(Page page, String orgName,
+                                                                  String userName, String startTime,
+                                                                  String endTime) {
         CustomerDTO userInfo = new CustomerDTO();
         if (userName != null && userName.length() != 0) {
             userInfo.setUserName(userName);
@@ -1441,14 +1448,14 @@ public class UserFacade extends UserServiceImpl {
      */
     public Map<String, String> getUserInfoByIds(List<String> ids) {
         List<Long> longList
-                = ids.stream().map(r->Long.valueOf(r)).distinct().collect(Collectors.toList());
+                = ids.stream().map(r -> Long.valueOf(r)).distinct().collect(Collectors.toList());
 
         Map<String, String> map = new HashMap<>();
-        if (ListUtil.isNotEmpty(longList)){
+        if (ListUtil.isNotEmpty(longList)) {
             List<User> userList = this.getByIds(longList);
-            if (ListUtil.isNotEmpty(userList)){
+            if (ListUtil.isNotEmpty(userList)) {
                 map = userList.stream()
-                        .collect(Collectors.toMap(k->k.getId().toString(), v->v.getLinkman()));
+                        .collect(Collectors.toMap(k -> k.getId().toString(), v -> v.getLinkman()));
             }
         }
         return map;

user-service/src/main/java/com/diagbot/facade/VerFacade.java

@@ -104,7 +104,8 @@ public class VerFacade {
             //验证是否超过三分钟
             SwsVerInfo swsVerInfoCheck = smsVerService.getSmsVerification(smsVerCreatVO.getMobile());
             if (null != swsVerInfoCheck) {
-                if (DateUtil.after(DateUtil.addMinutes(swsVerInfoCheck.getCreateTime(), ConstantEnum.SMS_EXPIRED_INTERVAL.getKey()),
+                if (DateUtil.after(DateUtil.addMinutes(swsVerInfoCheck.getCreateTime(),
+                        ConstantEnum.SMS_EXPIRED_INTERVAL.getKey()),
                         DateUtil.now())) {
                     throw new CommonException(ServiceErrorCode.SMS_SEND_ERROR,
                             "同一用户三分钟之内不能重复发送验证短信，请三分钟之后再次发送");
@@ -158,7 +159,8 @@ public class VerFacade {
         //验证是否超过三分钟
         SwsVerInfo swsVerInfoCheck = smsVerService.getSmsVerification(smsVerCreatVO.getMobile());
         if (null != swsVerInfoCheck) {
-            if (DateUtil.after(DateUtil.addMinutes(swsVerInfoCheck.getCreateTime(), ConstantEnum.SMS_EXPIRED_INTERVAL.getKey()),
+            if (DateUtil.after(DateUtil.addMinutes(swsVerInfoCheck.getCreateTime(),
+                    ConstantEnum.SMS_EXPIRED_INTERVAL.getKey()),
                     DateUtil.now())) {
                 throw new CommonException(ServiceErrorCode.SMS_SEND_ERROR,
                         "同一用户三分钟之内不能重复发送验证短信，请三分钟之后再次发送");
@@ -227,7 +229,8 @@ public class VerFacade {
         swsVerInfo.setCode(smsVerVerVO.getSmsCode());
         Boolean smsVer = smsVerService.verifySmsVerification(swsVerInfo);
         if (!smsVer) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "短信验证码输入有误，请重新输入");
+            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR,
+                    "短信验证码输入有误，请重新输入");
         }
         return true;
     }

user-service/src/main/java/com/diagbot/web/ReportFormController.java

@@ -5,14 +5,13 @@ import com.diagbot.facade.UserFacade;
 import com.diagbot.vo.UserExportVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import springfox.documentation.annotations.ApiIgnore;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -36,45 +35,49 @@ public class ReportFormController {
     @SysLoggerExport("exportUserInfoAll")
     @ResponseBody
     @ApiIgnore
-    public  void export(@RequestBody UserExportVO userExportVO,HttpServletRequest request,HttpServletResponse response)
+    public void export(@RequestBody UserExportVO userExportVO, HttpServletRequest request, HttpServletResponse response)
             throws Exception {
-         userFacade.export(userExportVO, response);
-        
+        userFacade.export(userExportVO, response);
+
     }
+
     @ApiOperation(value = "导出用户信息(新):[by:wangfeng]", notes = "根据时间 导出用户信息")
     @PostMapping("/exportUserInfo")
     @SysLoggerExport("exportUserInfo")
     @ResponseBody
-    public  void exportUserInfo(@RequestBody UserExportVO userExportVO,HttpServletRequest request,HttpServletResponse response)
+    public void exportUserInfo(@RequestBody UserExportVO userExportVO, HttpServletRequest request, HttpServletResponse response)
             throws Exception {
-         userFacade.exportUserInfo(userExportVO, response);
-        
+        userFacade.exportUserInfo(userExportVO, response);
+
     }
+
     @ApiOperation(value = "导出机构信息(新):[by:wangfeng]", notes = "根据时间 导出用户信息和机构信息")
     @PostMapping("/exportOrganization")
     @SysLoggerExport("exportOrganization")
     @ResponseBody
-    public  void exportOrganization(@RequestBody UserExportVO userExportVO,HttpServletRequest request,HttpServletResponse response)
+    public void exportOrganization(@RequestBody UserExportVO userExportVO, HttpServletRequest request, HttpServletResponse response)
             throws Exception {
-         userFacade.exportOrganization(userExportVO, response);
-        
+        userFacade.exportOrganization(userExportVO, response);
+
     }
+
     @ApiOperation(value = "导出认证中用户的信息(新):[by:wangfeng]", notes = "导出认证中用户的信息")
     @PostMapping("/exportKema")
     @SysLoggerExport("exportKema")
     @ResponseBody
-    public  void exportKema(@RequestBody UserExportVO userExportVO,HttpServletRequest request,HttpServletResponse response)
+    public void exportKema(@RequestBody UserExportVO userExportVO, HttpServletRequest request, HttpServletResponse response)
             throws Exception {
-         userFacade.exportKema(userExportVO, response);
-        
+        userFacade.exportKema(userExportVO, response);
+
     }
+
     @ApiOperation(value = "导出已认证用户的信息(新):[by:wangfeng]", notes = "根据时间 导出已认证用户的信息")
     @PostMapping("/exportVerified")
     @SysLoggerExport("exportVerified")
     @ResponseBody
-    public  void exportVerified (@RequestBody UserExportVO userExportVO,HttpServletRequest request,HttpServletResponse response)
+    public void exportVerified(@RequestBody UserExportVO userExportVO, HttpServletRequest request, HttpServletResponse response)
             throws Exception {
-         userFacade.exportVerified(userExportVO, response);
-        
+        userFacade.exportVerified(userExportVO, response);
+
     }
 }

user-service/src/main/java/com/diagbot/web/UserAuthenticationController.java

@@ -11,18 +11,16 @@ import com.diagbot.facade.UserAuthenticationFacade;
 import com.diagbot.vo.UserAuthenticationVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import springfox.documentation.annotations.ApiIgnore;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -97,7 +95,7 @@ public class UserAuthenticationController {
     public RespDTO<WaitAuthenDTO> waitAuthen() {
         return RespDTO.onSuc(userAuthenticationFacade.waitAuthen());
     }
-    
+
     @PostMapping(value = "/getAuthInfoCount")
     @SysLogger("getAuthInfoCount")
     @ApiOperation(value = "远程调用，根据用户id获取用户认证信息[by:rgb]")

user-service/src/main/java/com/diagbot/web/UserController.java

@@ -76,7 +76,6 @@ public class UserController {
     }
 
 
-
     @ApiOperation(value = "验证token有效性[by:zhoutg]",
             notes = "token：token信息，必填<br>")
     @PostMapping("/verifyToken")
@@ -88,7 +87,6 @@ public class UserController {
     }
 
 
-
     @ApiOperation(value = "校验用户(手机号)已注册[by:zhoutg]",
             notes = "username：用户名(手机号)，必填<br>")
     @PostMapping("/verifyExistUsername")
@@ -352,7 +350,7 @@ public class UserController {
     @PostMapping("/getUserInfoByIds")
     @SysLogger("getUserInfoByIds")
     @ApiIgnore
-    public RespDTO<Map<String, String>> getUserInfoByIds(@RequestBody List<String> ids){
+    public RespDTO<Map<String, String>> getUserInfoByIds(@RequestBody List<String> ids) {
         return RespDTO.onSuc(userFacade.getUserInfoByIds(ids));
     }
 }

user-service/src/main/java/com/diagbot/web/UserInfoController.java

@@ -1,31 +1,11 @@
 package com.diagbot.web;
 
-import java.util.List;
-import java.util.Map;
-
-import javax.validation.Valid;
-
-import com.diagbot.vo.UserInfoPagVO;
-import com.diagbot.vo.UserOrganProductPageVO;
-import com.diagbot.vo.UsernameVO;
-
-import org.apache.ibatis.annotations.Param;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.AuthenticationDTO;
 import com.diagbot.dto.OrganizationDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserAllDTO;
-import com.diagbot.dto.UserInfoDTO;
 import com.diagbot.dto.UserOrgizationProductDTO;
 import com.diagbot.entity.Organization;
 import com.diagbot.facade.OrganizationFacade;
@@ -40,11 +20,18 @@ import com.diagbot.vo.OrganizationVO;
 import com.diagbot.vo.UserAndOrgPageVO;
 import com.diagbot.vo.UserAndOrganizationVO;
 import com.diagbot.vo.UserInfoAuditVO;
-import com.diagbot.vo.UserInfoOrganizationsVO;
-
+import com.diagbot.vo.UserInfoPagVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import springfox.documentation.annotations.ApiIgnore;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * @Description: 外部用户信息
@@ -93,16 +80,17 @@ public class UserInfoController {
     @SysLogger("auditUserInfoAllPass")
     @Transactional
     public RespDTO<Boolean> auditUserInfoAllPass(@Valid @RequestBody UserInfoAuditVO userInfoAuditVO) {
-    	int ByType = 1;
-    	return userFacade.auditUserInfoAlls(userInfoAuditVO,ByType);
+        int ByType = 1;
+        return userFacade.auditUserInfoAlls(userInfoAuditVO, ByType);
     }
+
     @ApiOperation(value = "认证用户信息和机构信息不通过接口(新)[by:wangfeng]", notes = "审核用户信息和机构信息不通过")
     @PostMapping("/auditUserInfoAllNopass")
     @SysLogger("auditUserInfoAllNopass")
     @Transactional
     public RespDTO<Boolean> auditUserInfoAllNopass(@Valid @RequestBody UserInfoAuditVO userInfoAuditVO) {
         int ByType = 2;
-    	return userFacade.auditUserInfoAlls(userInfoAuditVO,ByType);
+        return userFacade.auditUserInfoAlls(userInfoAuditVO, ByType);
     }
 
     @ApiOperation(value = "删除用户信息和机构信息接口(新)[by:wangfeng]", notes = "用户信息和机构信息")
@@ -118,7 +106,7 @@ public class UserInfoController {
     @SysLogger("findOrganization")
     public RespDTO<Organization> findOrganization(@RequestBody OrganizationNameVO organizationNameVO) {
         // TODO 返回机构Id和机构
-    	String organizationName = organizationNameVO.getOrganizationName();
+        String organizationName = organizationNameVO.getOrganizationName();
         List<Organization> organization = organizationFacade.findOrganization(organizationName);
 
         return RespDTO.onSuc(organization);
@@ -151,56 +139,56 @@ public class UserInfoController {
 
         return userFacade.getUserOrganProductAlls(pageVO, pageVO.getOrgName(), pageVO.getAuthStatus());
     }*/
-    
+
     @ApiOperation(value = "分页查询注册用户信息接口(新)[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current,认证的状态authStatus")
     @PostMapping("/queryUserInformation")
     @SysLogger("queryUserInformation")
-    public RespDTO<IPage<UserAllDTO>> queryUserInformation(@RequestBody UserInfoPagVO userInfoPagVO){
-    	
-    	return userFacade.queryUserInformations(userInfoPagVO,userInfoPagVO.getUserName(), userInfoPagVO.getAuthStatus(),userInfoPagVO.getStartTime(),userInfoPagVO.getEndTime());
+    public RespDTO<IPage<UserAllDTO>> queryUserInformation(@RequestBody UserInfoPagVO userInfoPagVO) {
+
+        return userFacade.queryUserInformations(userInfoPagVO, userInfoPagVO.getUserName(), userInfoPagVO.getAuthStatus(), userInfoPagVO.getStartTime(), userInfoPagVO.getEndTime());
     }
-    
-    
+
+
     @ApiOperation(value = "分页查询机构信息接口（新）[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current")
     @PostMapping("/queryMechanismInformation")
     @SysLogger("queryMechanismInformation")
-    public RespDTO<IPage<OrganizationDTO>> queryMechanismInformation(@RequestBody UserInfoPagVO userInfoPagVO){
-    	
-    	return userFacade.queryMechanismInformations(userInfoPagVO,userInfoPagVO.getOrgName(),userInfoPagVO.getStartTime(),userInfoPagVO.getEndTime());
+    public RespDTO<IPage<OrganizationDTO>> queryMechanismInformation(@RequestBody UserInfoPagVO userInfoPagVO) {
+
+        return userFacade.queryMechanismInformations(userInfoPagVO, userInfoPagVO.getOrgName(), userInfoPagVO.getStartTime(), userInfoPagVO.getEndTime());
     }
-    
-    
+
+
     @ApiOperation(value = "分页查询已认证用户信息和机构信息及开通产品接口（新）[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current")
     @PostMapping("/queryVerifiedUserOrganizationProduct")
     @SysLogger("queryVerifiedUserOrganizationProduct")
     public RespDTO<IPage<UserOrgizationProductDTO>> queryVerifiedUserOrganizationProduct(@RequestBody UserAndOrgPageVO userAndOrgPageVO) {
-		
-		return userFacade.queryVerifiedUserOrganizationProducts(userAndOrgPageVO,userAndOrgPageVO.getOrgName(),userAndOrgPageVO.getUserName(),userAndOrgPageVO.getStartTime(),userAndOrgPageVO.getEndTime());
-	}
-   
+
+        return userFacade.queryVerifiedUserOrganizationProducts(userAndOrgPageVO, userAndOrgPageVO.getOrgName(), userAndOrgPageVO.getUserName(), userAndOrgPageVO.getStartTime(), userAndOrgPageVO.getEndTime());
+    }
+
     @ApiOperation(value = "分页查询认证中的用户信息接口（新）[by:wangfeng]", notes = "根据每页显示size条数，默认 10，和当前页current")
     @PostMapping("/queryAuthentication")
     @SysLogger("queryAuthentication")
-	public RespDTO<IPage<AuthenticationDTO>> queryAuthentication(@RequestBody UserAndOrgPageVO userAndOrgPageVO) {
-		
-		return userFacade.queryAuthentications(userAndOrgPageVO,userAndOrgPageVO.getOrgName(),userAndOrgPageVO.getUserName(),userAndOrgPageVO.getStartTime(),userAndOrgPageVO.getEndTime());
-	} 
-    
+    public RespDTO<IPage<AuthenticationDTO>> queryAuthentication(@RequestBody UserAndOrgPageVO userAndOrgPageVO) {
+
+        return userFacade.queryAuthentications(userAndOrgPageVO, userAndOrgPageVO.getOrgName(), userAndOrgPageVO.getUserName(), userAndOrgPageVO.getStartTime(), userAndOrgPageVO.getEndTime());
+    }
+
     @ApiOperation(value = "超管修改用户信息接口（新）[by:wangfeng]", notes = "用户id必传")
     @PostMapping("/updateUserInfo")
     @SysLogger("updateUserInfo")
     @Transactional
-    public RespDTO<Boolean> updateUserInfo (@RequestBody AmendUserInfoVO amendUserInfoVO){
-		return userFacade.updateUserInfos(amendUserInfoVO);
-    	
+    public RespDTO<Boolean> updateUserInfo(@RequestBody AmendUserInfoVO amendUserInfoVO) {
+        return userFacade.updateUserInfos(amendUserInfoVO);
+
     }
-    
+
     @ApiOperation(value = "机构信息修改接口(新)[by:wangfeng]", notes = "机构id必传")
     @PostMapping("/updateOrganizations")
     @SysLogger("updateOrganizations")
     @Transactional
-    public RespDTO<Boolean> updateOrganization (@RequestBody AmendOrgVO amendOrgVO){
-		return userFacade.updateOrganizations(amendOrgVO);
-    	
+    public RespDTO<Boolean> updateOrganization(@RequestBody AmendOrgVO amendOrgVO) {
+        return userFacade.updateOrganizations(amendOrgVO);
+
     }
 }