--no commit message

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/service/member/MemberLoginLogServiceImpl.java

 package com.zrqx.bg.member.service.member;
 
-import java.io.UnsupportedEncodingException;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.alibaba.fastjson.JSONObject;
 import com.zrqx.bg.member.mapper.distributor.DistributorMapper;
 import com.zrqx.bg.member.mapper.member.MemberLoginLogMapper;
 import com.zrqx.bg.member.mapper.member.MemberMapper;
@@ -28,7 +27,6 @@ import com.zrqx.core.model.member.supervise.Supervise;
 import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.bean.BeanUtils;
 import com.zrqx.core.util.excelutil.ExcelUtil;
-import com.zrqx.core.util.ip.CusAccessObjectUtil;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.vo.member.member.ExcelMemberLoginLogVo;
@@ -40,20 +38,7 @@ public class MemberLoginLogServiceImpl extends BaseServiceImpl<MemberLoginLog,In
 	@Autowired
 	private MemberLoginLogMapper memberLoginLogMapper;
 	
-	@Autowired
-	private MemberMapper memberMapper;
-	
-	@Autowired
-	private SchoolMapper schoolMapper;
-	
-	@Autowired
-	private PressMapper pressMapper;
 	
-	@Autowired
-	private DistributorMapper distributorMapper;
-	
-	@Autowired
-	private SuperviseMapper superviseMapper;
 	
 	@Override
 	public BaseMapper<MemberLoginLog> getMapper() {
@@ -63,27 +48,10 @@ public class MemberLoginLogServiceImpl extends BaseServiceImpl<MemberLoginLog,In
 	@Override
 	public PageInfo<MemberLoginLog> page(PageParam pageParam, QueryMemberLoginLogForm form) {
 		List<MemberLoginLog> list = this.list(pageParam, form, true);
-		
-		list.forEach(this::fmtMemberLoginInfo);
-		
 		return new PageInfo<MemberLoginLog>(list);
 	}
 	
-	public void fmtMemberLoginInfo(MemberLoginLog loginInfo) {
-		//根据IP获取省市区
-//		String address = "";
-//		try {
-//			address = CusAccessObjectUtil.getAddresses("","utf-8");
-//		} catch (UnsupportedEncodingException e) {
-//			e.printStackTrace();
-//		}
-//		JSONObject object = JSONObject.parseObject(address);
-//		String str1 = object.getString("regionName") + object.getString("city");
-//		loginInfo.setIp(str1);
-		//根据电话号码获取学校超级管理员所在的学级以及姓名
-		String orgName = this.fmtMember(loginInfo.getMemberId());
-		loginInfo.setAccount(orgName);
-	}
+
 	
 	private void fmtOrderBy(PageParam pageParam){
 		if(StringUtils.isBlank(pageParam.getOrderBy())){
@@ -92,31 +60,7 @@ public class MemberLoginLogServiceImpl extends BaseServiceImpl<MemberLoginLog,In
 	}
 	
 	
-	public String fmtMember(Integer memberId) {
-		String name = "";//机构名称
-		Member member = memberMapper.selectByPrimaryKey(memberId);
-		if(member != null) {
-			if(MemberTypeEnum.SCHOOL.getCode().equals(member.getType())) {//学校
-				School school = schoolMapper.selectByPrimaryKey(member.getRelationId());
-				name = school.getName();
-			}
-			if(MemberTypeEnum.PUBLISHER.getCode().equals(member.getType())) {
-				Press press = pressMapper.selectByPrimaryKey(member.getRelationId());
-				name = press.getName();
-			}
-			if(MemberTypeEnum.BUSNESS.getCode().equals(member.getType())) {
-				Distributor distributor = distributorMapper.selectByPrimaryKey(member.getRelationId());
-				name = distributor.getName();
-			}
-			if(MemberTypeEnum.SUPERVISE.getCode().equals(member.getType())) {
-				Supervise supervise = superviseMapper.selectByPrimaryKey(member.getRelationId());
-				name = supervise.getUserName();
-			}
-			return name + "\n" + member.getName();
-		}
-		return null;
 	
-	}
 	
 	@Override
 	public String exportMemberLoginLog(QueryMemberLoginLogForm form, PageParam pageParam, HttpServletRequest request,