Browse Source

新增查询部门正常账号初始密码

anderx 7 years ago
parent
commit
782345562a

+ 13 - 0
src/main/java/com/goafanti/admin/bo/AdminListBo.java

@@ -20,6 +20,11 @@ public class AdminListBo {
 	 * 用户名
 	 */
 	private String	name;
+	
+	/**
+	 * 密码
+	 */
+	private String password;
 
 	/**
 	 * 邮箱
@@ -251,4 +256,12 @@ public class AdminListBo {
 		this.lastLoginTime = lastLoginTime;
 	}
 
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
 }

+ 2 - 0
src/main/java/com/goafanti/admin/service/AdminService.java

@@ -66,4 +66,6 @@ public interface AdminService {
 	List<AdminListBo> selectDepartmentStaff(String departmentId,String name);
 
 	int updateLockAdmin();
+
+	List<Admin> getListDefaultPassword(String id);
 }

+ 18 - 2
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -18,6 +18,7 @@ import com.goafanti.admin.service.AdminService;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AdminLocationMapper;
 import com.goafanti.common.dao.AdminMapper;
+import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.dao.UserRoleMapper;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.utils.LoggerUtils;
@@ -40,7 +41,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 	private PasswordUtil					passwordUtil;
 	@Override
 	public List<Admin> selectAllAdmin() {
-		return adminMapper.selectAllAdmin();
+		return adminMapper.selectAllAdmin(null);
 	}
 
 	@Override
@@ -241,7 +242,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 	@Override
 	public int updateLockAdmin() {
 		int count=0;
-		List<Admin> list=adminMapper.selectAllAdmin();//获取所有用户
+		List<Admin> list=adminMapper.selectAllAdmin(null);//获取所有用户
 		List<List<Admin>>aList=groupList(list);//拆分成多个
 		String lockIds = "";
 		for(List<Admin> al:aList){
@@ -303,6 +304,21 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 	        System.out.println(listGroup);
 	}*/
 
+	@Override
+	public List<Admin> getListDefaultPassword(String depId) {
+		List<Admin> list=adminMapper.selectAllAdmin(depId);
+		List<Admin> list2=new ArrayList<>();
+		for (Admin a : list) {
+			String pwd=a.getPassword();
+			a.setPassword("123456");
+			String pwd2=passwordUtil.getEncryptPwd(a);
+			if (pwd.equals(pwd2)) {
+				list2.add(a);
+			}
+		}
+		return list2;
+	}
+
 	
 
 }

+ 1 - 1
src/main/java/com/goafanti/admin/service/impl/NewAdminServiceImpl.java

@@ -57,7 +57,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 	
 	@Override
 	public List<Admin> selectAllAdmin() {
-		return adminMapper.selectAllAdmin();
+		return adminMapper.selectAllAdmin(null);
 	}
 
 	@Override

+ 10 - 1
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.goafanti.admin.service.AdminService;
 import com.goafanti.admin.service.AttachmentService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
@@ -68,6 +69,8 @@ public class PublicController extends BaseController {
 
 	@Resource
 	private AttachmentService			aftFileService;
+	@Resource
+	private AdminService	adminService;
 	
 	@Resource
 	private FieldGlossoryService			fieldGlossoryService;
@@ -519,6 +522,12 @@ public class PublicController extends BaseController {
 		res.setData(districtGlossoryService.getProvince());
 		return res;
 	}
-	
+	@RequestMapping(value = "/listDefaultPassword" , method = RequestMethod.POST)
+	@ResponseBody
+	public Result listDefaultPassword(String depId){
+		Result res=new Result();
+		res.setData(adminService.getListDefaultPassword(depId));
+		return res;
+	}
 	
 }

+ 3 - 1
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -169,10 +169,12 @@ public interface AdminMapper {
 	
 	Admin selectAdminName(@Param("name")String name);
 
-	List<Admin> selectAllAdmin();
+	List<Admin> selectAllAdmin(@Param("depId")String depId);
 
 	int updateLockIds(@Param("lockIds")String lockIds);
 
+	List<AdminListBo> getListDefaultPassword(String id);
+
 	
 
 }

+ 4 - 1
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -513,6 +513,9 @@
     <include refid="Base_Column_List" />
     from admin 
     where status !='锁定' 
+     <if test="depId != null">
+       and department_id = #{depId,jdbcType=VARCHAR}
+     </if>
   </select>
   
   <select id="selectByMobile" parameterType="java.lang.String" resultMap="BaseResultMap">
@@ -930,7 +933,7 @@
   </select>
   
   <select id="selectDepartmentStaff" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.AdminListBo">
-	select a.id ,a.name,a.department_id,b.name 
+	select a.id ,a.name,a.password,a.department_id,b.name 
 		from admin a left join department b
 		on a.department_id= b.id
 		where 1=1