Merge remote-tracking branch 'origin/dev/one' into dev/one

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

@@ -679,7 +679,7 @@ public class UserFacade extends UserServiceImpl {
 
     /**
      * @param userExportVO
-     * @return 
+     * @return
      * @return 导出Excel文件
      */
     public  void export(UserExportVO userExportVO,HttpServletResponse response) {
@@ -831,7 +831,7 @@ public class UserFacade extends UserServiceImpl {
     /**
      * 添加用户信息和机构信息管理员
      * @param userAndOrganizationVO
-     * @return 
+     * @return
      */
     public RespDTO<Boolean> addUserInfos(UserAndOrganizationVO userAndOrganizationVO) {
         // TODO 先查找机构，获取机构id,再注册用户,返回用户id, 取到用户id和 机构id ,查询用户机构关联表，在进行绑定
@@ -972,7 +972,7 @@ public class UserFacade extends UserServiceImpl {
         if(endTime != null && endTime.length() != 0){
         	userInfo.setEndTime(endTime);
         }
-        
+
     	return RespDTO.onSuc(queryUserInformation(page, userInfo));
     }
     /**
@@ -1024,8 +1024,8 @@ public class UserFacade extends UserServiceImpl {
             userIds.add(userInfoId);
         }
         if(userIds.size()>0){
-        	
-        
+
+
         RespDTO<List<UserAndProdutUDTO>> InformationData = diagbotmanClient.getInformationAvailableAll(userIds);
 
         if (InformationData == null || !"0".equals(InformationData.code)) {
@@ -1073,234 +1073,236 @@ public class UserFacade extends UserServiceImpl {
 		return RespDTO.onSuc(queryAuthentication(page, userInfo));
 	}
 
-/**
- * 导出用户信息
- * @param userExportVO
- * @param response
- */
-	public void exportUserInfo(UserExportVO userExportVO, HttpServletResponse response) {
-		  Map<String, Object> userMap = new HashMap<String, Object>();
-	        userMap.put("startTime", userExportVO.getStartTime());
-	        userMap.put("endTime", userExportVO.getEndTime());
-	        userMap.put("autStatus",userExportVO.getAutStatus());
-	        userMap.put("orgName",userExportVO.getOrgName());
-	        userMap.put("userName",userExportVO.getUserName());
-	        List<UserInfoDTO> datas = dependentuserInfoByTime(userMap);
-	        GsonUtil.toJson(datas);
-	        List<String> listName = new ArrayList<>();
-
-	        listName.add("用户id");
-	        listName.add("创建时间");
-	        listName.add("联系人");
-	        listName.add("认证状态");
-	        listName.add("用户名");
-	        listName.add("邮箱");
-	        listName.add("机构名称");
-
-
-	        List<String> listId = new ArrayList<>();
-	        listId.add("userId");//用户ID
-	        listId.add("userGmtCreate");//记录创建时间
-	        listId.add("linKman");//联系人
-	        listId.add("autStatus");//认证状态
-	        listId.add("userName");// 用户名
-	        listId.add("email");// 邮箱
-	        listId.add("orgName");//机构名称
-
-
-	        List<ExportUserInfoDTO> list = new ArrayList<>();
-	        for (int i = 0; i < datas.size(); i++) {
-	            UserInfoDTO userInfo = datas.get(i);
-	            list.add(new ExportUserInfoDTO(String.valueOf(userInfo.getUserId()),
-	                    DateUtil.formatDate(userInfo.getUserGmtCreate()),
-	                    userInfo.getLinKman(),
-	                    AuthStatusEnum.getName(userInfo.getAutStatus()),
-	                    userInfo.getUserName(),
-	                    userInfo.getEmail(),
-	                    userInfo.getOrgName()));
-
-	        }
-	        response.setContentType("text/html;charset=UTF-8");
-	        ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
-	        ex.exportExcelNew("注册用户信息", listName, listId, list,response);
-		
-	}
+    /**
+     * 导出用户信息
+     *
+     * @param userExportVO
+     * @param response
+     */
+    public void exportUserInfo(UserExportVO userExportVO, HttpServletResponse response) {
+        Map<String, Object> userMap = new HashMap<String, Object>();
+        userMap.put("startTime", userExportVO.getStartTime());
+        userMap.put("endTime", userExportVO.getEndTime());
+        userMap.put("autStatus", userExportVO.getAutStatus());
+        userMap.put("orgName", userExportVO.getOrgName());
+        userMap.put("userName", userExportVO.getUserName());
+        List<UserInfoDTO> datas = dependentuserInfoByTime(userMap);
+
+        GsonUtil.toJson(datas);
+        List<String> listName = new ArrayList<>();
+
+        listName.add("用户id");
+        listName.add("创建时间");
+        listName.add("联系人");
+        listName.add("认证状态");
+        listName.add("用户名");
+        listName.add("邮箱");
+        listName.add("机构名称");
+
+
+        List<String> listId = new ArrayList<>();
+        listId.add("userId");//用户ID
+        listId.add("userGmtCreate");//记录创建时间
+        listId.add("linKman");//联系人
+        listId.add("autStatus");//认证状态
+        listId.add("userName");// 用户名
+        listId.add("email");// 邮箱
+        listId.add("orgName");//机构名称
+
+
+        List<ExportUserInfoDTO> list = new ArrayList<>();
+        for (int i = 0; i < datas.size(); i++) {
+            UserInfoDTO userInfo = datas.get(i);
+            list.add(new ExportUserInfoDTO(String.valueOf(userInfo.getUserId()),
+                    DateUtil.formatDate(userInfo.getUserGmtCreate()),
+                    userInfo.getLinKman(),
+                    AuthStatusEnum.getName(userInfo.getAutStatus()),
+                    userInfo.getUserName(),
+                    userInfo.getEmail(),
+                    userInfo.getOrgName()));
+
+        }
+        response.setContentType("text/html;charset=UTF-8");
+        ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
+        ex.exportExcelNew("注册用户信息", listName, listId, list, response);
+
+    }
 
     //导出机构信息数据
-	public void exportOrganization(UserExportVO userExportVO, HttpServletResponse response) {
-		  Map<String, Object> userMap = new HashMap<String, Object>();
-	        userMap.put("startTime", userExportVO.getStartTime());
-	        userMap.put("endTime", userExportVO.getEndTime());
-	        /*userMap.put("autStatus",userExportVO.getAutStatus());*/
-	        userMap.put("orgName",userExportVO.getOrgName());
-	        /*userMap.put("userName",userExportVO.getUserName());*/
-	        List<UserInfoDTO> datas = exportOrganizations(userMap);
-	        GsonUtil.toJson(datas);
-	        List<String> listName = new ArrayList<>();
-
-
-	        listName.add("机构ID");
-	        listName.add("注册时间");
-	        listName.add("注册机构");
-	        listName.add("机构负责人");
-	        listName.add("机构属性");
-	        listName.add("机构地址");
-	        listName.add("超管名称");
-
-	        List<String> listId = new ArrayList<>();
-	        
-	        listId.add("orgId");//机构ID
-	        listId.add("orgGmtCreate");//记录创建时间
-	        listId.add("orgName");//机构名称
-	        listId.add("orgPrincipal");//负责人
-	        listId.add("orgType");//机构属性
-	        listId.add("orgAddress");//机构地址
-	        listId.add("userName");// 用户名
-
-	        List<ExportOrganizationDTO> list = new ArrayList<>();
-	        for (int i = 0; i < datas.size(); i++) {
-	            UserInfoDTO userInfo = datas.get(i);
-	            list.add(new ExportOrganizationDTO(
-	                    String.valueOf(userInfo.getOrgId()),
-	                    DateUtil.formatDate(userInfo.getOrgGmtCreate()),
-	                    userInfo.getOrgName(),
-	                    userInfo.getOrgPrincipal(),
-	                    OrganizationTypeEnum.getName(userInfo.getOrgType()),
-	                    userInfo.getOrgAddress(),
-	                    userInfo.getUserName()));
-	        }
-	        response.setContentType("text/html;charset=UTF-8");
-	        ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
-	        ex.exportExcelNew("机构信息详情", listName, listId, list,response);
-		
-	}
+    public void exportOrganization(UserExportVO userExportVO, HttpServletResponse response) {
+        Map<String, Object> userMap = new HashMap<String, Object>();
+        userMap.put("startTime", userExportVO.getStartTime());
+        userMap.put("endTime", userExportVO.getEndTime());
+        /*userMap.put("autStatus",userExportVO.getAutStatus());*/
+        userMap.put("orgName", userExportVO.getOrgName());
+        /*userMap.put("userName",userExportVO.getUserName());*/
+        List<UserInfoDTO> datas = exportOrganizations(userMap);
+        GsonUtil.toJson(datas);
+        List<String> listName = new ArrayList<>();
+
+
+        listName.add("机构ID");
+        listName.add("注册时间");
+        listName.add("注册机构");
+        listName.add("机构负责人");
+        listName.add("机构属性");
+        listName.add("机构地址");
+        listName.add("超管名称");
+
+        List<String> listId = new ArrayList<>();
+
+        listId.add("orgId");//机构ID
+        listId.add("orgGmtCreate");//记录创建时间
+        listId.add("orgName");//机构名称
+        listId.add("orgPrincipal");//负责人
+        listId.add("orgType");//机构属性
+        listId.add("orgAddress");//机构地址
+        listId.add("userName");// 用户名
+
+        List<ExportOrganizationDTO> list = new ArrayList<>();
+        for (int i = 0; i < datas.size(); i++) {
+            UserInfoDTO userInfo = datas.get(i);
+            list.add(new ExportOrganizationDTO(
+                    String.valueOf(userInfo.getOrgId()),
+                    DateUtil.formatDate(userInfo.getOrgGmtCreate()),
+                    userInfo.getOrgName(),
+                    userInfo.getOrgPrincipal(),
+                    OrganizationTypeEnum.getName(userInfo.getOrgType()),
+                    userInfo.getOrgAddress(),
+                    userInfo.getUserName()));
+        }
+        response.setContentType("text/html;charset=UTF-8");
+        ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
+        ex.exportExcelNew("机构信息详情", listName, listId, list, response);
+
+    }
 
     //导出认证中数据
-	public void exportKema(UserExportVO userExportVO, HttpServletResponse response) {
-		  Map<String, Object> userMap = new HashMap<String, Object>();
-	        userMap.put("startTime", userExportVO.getStartTime());
-	        userMap.put("endTime", userExportVO.getEndTime());
-	        userMap.put("autStatus",userExportVO.getAutStatus());
-	        userMap.put("orgName",userExportVO.getOrgName());
-	        userMap.put("userName",userExportVO.getUserName());
-	        List<UserInfoDTO> datas = dependentuserInfoByTime(userMap);
-	        GsonUtil.toJson(datas);
-	        List<String> listName = new ArrayList<>();
-
-	        listName.add("编号");
-	        listName.add("创建时间");
-	        listName.add("超管理名称");
-	        listName.add("所在机构");
-	        listName.add("岗位名称");
-	        listName.add("手机号");
-	        listName.add("邮箱");
-	        listName.add("认证状态");
-
-	        List<String> listId = new ArrayList<>();
-	        listId.add("userId");//用户ID
-	        listId.add("userGmtCreate");//记录创建时间
-	        listId.add("linKman");//联系人
-	        listId.add("orgName");//机构名称 
-	        listId.add("autPosition");//岗位信息
-	        listId.add("userName");// 用户名
-	        listId.add("email");// 邮箱
-	        listId.add("autStatus");//认证状态
-
-	        List<ExportKemaDTO> list = new ArrayList<>();
-	        for (int i = 0; i < datas.size(); i++) {
-	            UserInfoDTO userInfo = datas.get(i);
-	            list.add(new ExportKemaDTO(String.valueOf(userInfo.getUserId()),
-	                    DateUtil.formatDate(userInfo.getUserGmtCreate()),
-	                    userInfo.getLinKman(),
-	                    userInfo.getOrgName(),
-	                    userInfo.getAutPosition(),
-	                    userInfo.getUserName(),
-	                    userInfo.getEmail(),
-	                    AuthStatusEnum.getName(userInfo.getAutStatus())));
-	        }
-
-	        response.setContentType("text/html;charset=UTF-8");
-	        ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
-	        ex.exportExcelNew("认证用户信息详情", listName, listId, list,response);
-	}
+    public void exportKema(UserExportVO userExportVO, HttpServletResponse response) {
+        Map<String, Object> userMap = new HashMap<String, Object>();
+        userMap.put("startTime", userExportVO.getStartTime());
+        userMap.put("endTime", userExportVO.getEndTime());
+        userMap.put("autStatus", userExportVO.getAutStatus());
+        userMap.put("orgName", userExportVO.getOrgName());
+        userMap.put("userName", userExportVO.getUserName());
+        List<UserInfoDTO> datas = dependentuserInfoByTime(userMap);
+        GsonUtil.toJson(datas);
+        List<String> listName = new ArrayList<>();
+
+        listName.add("编号");
+        listName.add("创建时间");
+        listName.add("超管理名称");
+        listName.add("所在机构");
+        listName.add("岗位名称");
+        listName.add("手机号");
+        listName.add("邮箱");
+        listName.add("认证状态");
+
+        List<String> listId = new ArrayList<>();
+        listId.add("userId");//用户ID
+        listId.add("userGmtCreate");//记录创建时间
+        listId.add("linKman");//联系人
+        listId.add("orgName");//机构名称
+        listId.add("autPosition");//岗位信息
+        listId.add("userName");// 用户名
+        listId.add("email");// 邮箱
+        listId.add("autStatus");//认证状态
+
+        List<ExportKemaDTO> list = new ArrayList<>();
+        for (int i = 0; i < datas.size(); i++) {
+            UserInfoDTO userInfo = datas.get(i);
+            list.add(new ExportKemaDTO(String.valueOf(userInfo.getUserId()),
+                    DateUtil.formatDate(userInfo.getUserGmtCreate()),
+                    userInfo.getLinKman(),
+                    userInfo.getOrgName(),
+                    userInfo.getAutPosition(),
+                    userInfo.getUserName(),
+                    userInfo.getEmail(),
+                    AuthStatusEnum.getName(userInfo.getAutStatus())));
+        }
+
+        response.setContentType("text/html;charset=UTF-8");
+        ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
+        ex.exportExcelNew("认证用户信息详情", listName, listId, list, response);
+    }
 
     //导出已认证数据
-	public void exportVerified(UserExportVO userExportVO, HttpServletResponse response) {
-		  Map<String, Object> userMap = new HashMap<String, Object>();
-	        userMap.put("startTime", userExportVO.getStartTime());
-	        userMap.put("endTime", userExportVO.getEndTime());
-	        userMap.put("autStatus",userExportVO.getAutStatus());
-	        userMap.put("orgName",userExportVO.getOrgName());
-	        userMap.put("userName",userExportVO.getUserName());
-	        List<UserInfoDTO> datas = dependentuserInfoByTime(userMap);
-	        GsonUtil.toJson(datas);
-	        List<String> listName = new ArrayList<>();
-
-	        listName.add("编号");
-	        listName.add("注册时间");
-	        listName.add("审核通过时间");
-	        listName.add("超管理名称");
-	        listName.add("所在机构");
-	        listName.add("岗位名称");
-	        listName.add("手机号");
-	        listName.add("邮箱");
-	        listName.add("状态");
-
-	        List<String> listId = new ArrayList<>();
-	        listId.add("userId");//用户ID
-	        listId.add("userGmtCreate");//记录创建时间
-	        listId.add("userGmtModified");
-	        listId.add("linKman");//联系人
-	        listId.add("orgName");//机构名称
-	        listId.add("autPosition");//岗位信息
-	        listId.add("userName");// 用户名
-	        listId.add("email");// 邮箱
-	        listId.add("autStatus");//认证状态
-
-	        List<ExportVerifiedDTO> list = new ArrayList<>();
-	        for (int i = 0; i < datas.size(); i++) {
-	            UserInfoDTO userInfo = datas.get(i);
-	            list.add(new ExportVerifiedDTO(String.valueOf(userInfo.getUserId()),
-	                    DateUtil.formatDate(userInfo.getUserGmtCreate()),
-	                    DateUtil.formatDate(userInfo.getUserGmtModified()),
-	                    userInfo.getLinKman(),
-	                    userInfo.getOrgName(),
-	                    userInfo.getOrgPrincipal(),
-	                    userInfo.getUserName(),
-	                    userInfo.getEmail(),
-	                    AuthStatusEnum.getName(userInfo.getAutStatus())));
-	        }
-	        response.setContentType("text/html;charset=UTF-8");
-	        ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
-	        ex.exportExcelNew("已认证用户信息", listName, listId, list,response);
-		
-	}
+    public void exportVerified(UserExportVO userExportVO, HttpServletResponse response) {
+        Map<String, Object> userMap = new HashMap<String, Object>();
+        userMap.put("startTime", userExportVO.getStartTime());
+        userMap.put("endTime", userExportVO.getEndTime());
+        userMap.put("autStatus", userExportVO.getAutStatus());
+        userMap.put("orgName", userExportVO.getOrgName());
+        userMap.put("userName", userExportVO.getUserName());
+        List<UserInfoDTO> datas = dependentuserInfoByTime(userMap);
+        GsonUtil.toJson(datas);
+        List<String> listName = new ArrayList<>();
+
+        listName.add("编号");
+        listName.add("注册时间");
+        listName.add("审核通过时间");
+        listName.add("超管理名称");
+        listName.add("所在机构");
+        listName.add("岗位名称");
+        listName.add("手机号");
+        listName.add("邮箱");
+        listName.add("状态");
+
+        List<String> listId = new ArrayList<>();
+        listId.add("userId");//用户ID
+        listId.add("userGmtCreate");//记录创建时间
+        listId.add("userGmtModified");
+        listId.add("linKman");//联系人
+        listId.add("orgName");//机构名称
+        listId.add("autPosition");//岗位信息
+        listId.add("userName");// 用户名
+        listId.add("email");// 邮箱
+        listId.add("autStatus");//认证状态
+
+        List<ExportVerifiedDTO> list = new ArrayList<>();
+        for (int i = 0; i < datas.size(); i++) {
+            UserInfoDTO userInfo = datas.get(i);
+            list.add(new ExportVerifiedDTO(String.valueOf(userInfo.getUserId()),
+                    DateUtil.formatDate(userInfo.getUserGmtCreate()),
+                    DateUtil.formatDate(userInfo.getUserGmtModified()),
+                    userInfo.getLinKman(),
+                    userInfo.getOrgName(),
+                    userInfo.getOrgPrincipal(),
+                    userInfo.getUserName(),
+                    userInfo.getEmail(),
+                    AuthStatusEnum.getName(userInfo.getAutStatus())));
+        }
+        response.setContentType("text/html;charset=UTF-8");
+        ExportBeanExcelUtil ex = new ExportBeanExcelUtil();
+        ex.exportExcelNew("已认证用户信息", listName, listId, list, response);
+
+    }
 
     //超管修改用户信息接口
-	public RespDTO<Boolean> updateUserInfos(AmendUserInfoVO amendUserInfoVO) {
-         Map<String, Object> amendUserInfo = new HashMap<String, Object>();
-         amendUserInfo.put("modifier", UserUtils.getCurrentPrincipleID());
-         amendUserInfo.put("gmtModified", DateUtil.now());
-         amendUserInfo.put("email", amendUserInfoVO.getEmail());
-         amendUserInfo.put("userId", amendUserInfoVO.getUserId());
-         amendUserInfo.put("autPosition",amendUserInfoVO.getAutPosition());
-         amendUserInfo.put("linKman",amendUserInfoVO.getLinKman());
-         updateUserInfo(amendUserInfo);
-         return RespDTO.onSuc(true);
-	}
+    public RespDTO<Boolean> updateUserInfos(AmendUserInfoVO amendUserInfoVO) {
+        Map<String, Object> amendUserInfo = new HashMap<String, Object>();
+        amendUserInfo.put("modifier", UserUtils.getCurrentPrincipleID());
+        amendUserInfo.put("gmtModified", DateUtil.now());
+        amendUserInfo.put("email", amendUserInfoVO.getEmail());
+        amendUserInfo.put("userId", amendUserInfoVO.getUserId());
+        amendUserInfo.put("autPosition", amendUserInfoVO.getAutPosition());
+        amendUserInfo.put("linKman", amendUserInfoVO.getLinKman());
+        updateUserInfo(amendUserInfo);
+        return RespDTO.onSuc(true);
+    }
 
     //超管修改机构信息
-	public RespDTO<Boolean> updateOrganizations(AmendOrgVO amendOrgVO) {
-		 Map<String, Object> amendOrg = new HashMap<String, Object>();
-		 amendOrg.put("modifier", UserUtils.getCurrentPrincipleID());
-		 amendOrg.put("gmtModified", DateUtil.now());
-		 amendOrg.put("address", amendOrgVO.getOrgAddress());
-		 amendOrg.put("type", amendOrgVO.getOrgType());
-		 amendOrg.put("orgId", amendOrgVO.getOrgId());
-		 amendOrg.put("orgSubNum", amendOrgVO.getOrgSubNum());
-	     updateOrganizations(amendOrg);
-	     return RespDTO.onSuc(true);
-	}
-    
-    
+    public RespDTO<Boolean> updateOrganizations(AmendOrgVO amendOrgVO) {
+        Map<String, Object> amendOrg = new HashMap<String, Object>();
+        amendOrg.put("modifier", UserUtils.getCurrentPrincipleID());
+        amendOrg.put("gmtModified", DateUtil.now());
+        amendOrg.put("address", amendOrgVO.getOrgAddress());
+        amendOrg.put("type", amendOrgVO.getOrgType());
+        amendOrg.put("orgId", amendOrgVO.getOrgId());
+        amendOrg.put("orgSubNum", amendOrgVO.getOrgSubNum());
+        updateOrganizations(amendOrg);
+        return RespDTO.onSuc(true);
+    }
+
+
 }