Skip to content

S
server
Commit 92e6b747 by XiaHou
Options

增加万科 从微V导入 功能

parent bc7d6b42
Showing with 173 additions and 162 deletions
mall-admin/src/main/resources/application.yml
......@@ -2,9 +2,12 @@ server:
port: 8180
spring:
datasource:
url: jdbc:mysql://115.29.198.90:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
url: jdbc:mysql://10.27.33.5:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username: root
password: root
password: root123!!
#url: jdbc:mysql://47.98.216.76:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
#username: root
#password: 6just@2019
druid:
initial-size: 5 #连接池初始化大小
min-idle: 10 #最小空闲连接数
......@@ -15,10 +18,11 @@ spring:
login-username: druid
login-password: druid
redis:
host: 127.0.0.1 # Redis服务器地址
host: 10.27.33.5 # Redis服务器地址
#host: 47.98.96.174
database: 0 # Redis数据库索引（默认为0）
port: 6379 # Redis服务器连接端口
password: # Redis服务器连接密码（默认为空）
password: "root123!!" # Redis服务器连接密码（默认为空）
jedis:
pool:
max-active: 200 # 连接池最大连接数（使用负值表示没有限制）
......@@ -26,11 +30,6 @@ spring:
max-idle: 100 # 连接池中的最大空闲连接
min-idle: 20 # 连接池中的最小空闲连接
timeout: 3000ms # 连接超时时间（毫秒）
rabbitmq: #rabbitmq相关配置
host: 129.204.227.14
port: 5672
username: admin
password: admin
quartz:
#相关属性配置
properties:
......
mall-config/src/main/resources/config/admin/admin-dev.yml
......@@ -12,9 +12,12 @@ aliyun:
prefix: mall/images/ # 上传文件夹路径前缀
spring:
datasource:
url: jdbc:mysql://115.29.198.90:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
url: jdbc:mysql://10.27.33.5:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username: root
password: root
password: root123!!
#url: jdbc:mysql://47.98.216.76:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
#username: root
#password: 6just@2019
logging:
level:
root: info #日志配置DEBUG,INFO,WARN,ERROR
......
mall-config/src/main/resources/config/admin/admin-prod.yml
......@@ -12,8 +12,11 @@ aliyun:
prefix: mall/images/ # 上传文件夹路径前缀
spring:
datasource:
url: jdbc:mysql://db:3306/mall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
url: jdbc:mysql://10.27.33.5:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username: root
password: 2017gzMM
password: root123!!
#url: jdbc:mysql://47.98.216.76:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
#username: root
#password: 6just@2019
logging:
path: /var/logs #配置日志生成路径
\ No newline at end of file
mall-config/src/main/resources/config/portal/portal-dev.yml
spring:
datasource:
url: jdbc:mysql://115.29.198.90:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
url: jdbc:mysql://10.27.33.5:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username: root
password: root
password: root123!!
#url: jdbc:mysql://47.98.216.76:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
#username: root
#password: 6just@2019
redis:
host: 127.0.0.1 # Redis服务器地址
host: 10.27.33.5 # Redis服务器地址
#host: 47.98.96.174
database: 0 # Redis数据库索引（默认为0）
port: 6379 # Redis服务器连接端口
password: # Redis服务器连接密码（默认为空）
password: "root123!!" # Redis服务器连接密码（默认为空）
# 日志配置
logging:
level:
......
mall-config/src/main/resources/config/portal/portal-prod.yml
spring:
datasource:
url: jdbc:mysql://db:3306/mall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
url: jdbc:mysql://10.27.33.5:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username: root
password: 2017gzMM
password: root123!!
redis:
host: 127.0.0.1 # Redis服务器地址
host: 10.27.33.5 # Redis服务器地址
#host: 47.98.96.174
database: 0 # Redis数据库索引（默认为0）
port: 6379 # Redis服务器连接端口
password: #不设置密码
password: "root123!!" # Redis服务器连接密码（默认为空）
mall-portal/src/main/resources/application.yml
......@@ -2,9 +2,12 @@ server:
port: 8085
spring:
datasource:
url: jdbc:mysql://115.29.198.90:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
url: jdbc:mysql://10.27.33.5:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
username: root
password: root
password: root123!!
#url: jdbc:mysql://47.98.216.76:3306/vanke?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
#username: root
#password: 6just@2019
druid:
initial-size: 5 #连接池初始化大小
min-idle: 10 #最小空闲连接数
......@@ -15,10 +18,11 @@ spring:
login-username: druid
login-password: druid
redis:
host: 127.0.0.1 # Redis服务器地址
host: 10.27.33.5 # Redis服务器地址
#host: 47.98.96.174
database: 0 # Redis数据库索引（默认为0）
port: 6379 # Redis服务器连接端口
password: # Redis服务器连接密码（默认为空）
password: "root123!!" # Redis服务器连接密码（默认为空）
jedis:
pool:
max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
......@@ -88,11 +92,6 @@ redis:
payOrderId: "portal:payOrderId:"
expire:
authCode: 90 # 验证码超期时间
# 自定义消息队列名称
rabbitmq:
queue:
name:
cancelOrder: cancelOrderQueue
## 微信开放平台
wechat:
open:
......
mall-service/src/main/java/com/macro/mall/service/vanke/impl/VankeMemberLoginServiceImpl.java
......@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.macro.mall.common.baiduyun.HttpUtil;
import com.macro.mall.common.utils.HttpClientUtil;
import com.macro.mall.common.utils.HttpUtils;
import com.macro.mall.common.utils.MyJsonUtil;
import com.macro.mall.dao.UmsMemberDao;
import com.macro.mall.domain.dto.VankeGetUserInfoVO;
......@@ -20,18 +19,15 @@ import com.macro.mall.service.vanke.IVankeConfigService;
import com.macro.mall.service.vanke.IVankeMemberLoginService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.httpclient.NameValuePair;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.io.*;
import java.net.HttpURLConnection;
import java.net.URL;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
@Slf4j
......@@ -66,7 +62,7 @@ public class VankeMemberLoginServiceImpl implements IVankeMemberLoginService {
public String getVankeAccessToken() {
//先判断redis是否存在vankeAccessToken
String vankeAccessToken = this.redisService.get("vankeAccessToken");
if(vankeAccessToken == null || vankeAccessToken.isEmpty()){
if (vankeAccessToken == null || vankeAccessToken.isEmpty()) {
/*String params ="{\n" +
" \"appId\": \""+getConfig("appid")+"\",\n" +
" \"secret\": \""+getConfig("secret")+"\",\n" +
......@@ -74,7 +70,7 @@ public class VankeMemberLoginServiceImpl implements IVankeMemberLoginService {
" \"scope\": \""+getConfig("scope")+"\"\n" +
"}";*/
String res = null;
Map<String,Object> map = new HashMap<>();
Map<String, Object> map = new HashMap<>();
VankeGetUserInfoVO vankeGetUserInfoVO = new VankeGetUserInfoVO();
vankeGetUserInfoVO.setAppid(getConfig("appid"));
vankeGetUserInfoVO.setSecret(getConfig("secret"));
......@@ -82,73 +78,75 @@ public class VankeMemberLoginServiceImpl implements IVankeMemberLoginService {
vankeGetUserInfoVO.setScope(getConfig("scope"));
try {
System.out.println(getConfig("host"));
res = HttpUtil.postGeneralUrl(getConfig("host")+"/gateway/oauth2/token/getAccessToken","application/json",JSONObject.toJSONString(vankeGetUserInfoVO),"UTF-8");
res = HttpUtil.postGeneralUrl(getConfig("host") + "/gateway/oauth2/token/getAccessToken", "application/json", JSONObject.toJSONString(vankeGetUserInfoVO), "UTF-8");
map = MyJsonUtil.getMapChangeJson(res);
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);
}
if((boolean)map.get("success")){
if ((boolean) map.get("success")) {
//将token储存到redis 设置2小时有效期
redisService.set("vankeAccessToken", (String)map.get("accessToken"));
redisService.expire("vankeAccessToken",(Integer)map.get("expireIn"));
}else{//获取token失败
redisService.set("vankeAccessToken", (String) map.get("accessToken"));
redisService.expire("vankeAccessToken", (Integer) map.get("expireIn"));
} else {//获取token失败
log.info("获取token失败" + res);
}
return (String)map.get("accessToken");
}else{//否则存在直接返回accesToken
return (String) map.get("accessToken");
} else {//否则存在直接返回accesToken
return vankeAccessToken;
}
}
/**
* 通过ticket更新万科用户信息
*
* @param ticket
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public ResultMsg updateVankeVvUser(String ticket){
if(ticket == null || "".equals(ticket)){
return new ResultMsg(false,"传入ticket为空");
public ResultMsg updateVankeVvUser(String ticket) {
if (ticket == null || "".equals(ticket)) {
return new ResultMsg(false, "传入ticket为空");
}
//通过appId 和 ticket 以及 token发起获取用户身份信息请求
String params ="{\n" +
" \"appid\": \""+getConfig("appid")+"\",\n" +
" \"ticket\": \""+ticket+"\"\n" +
String params = "{\n" +
" \"appid\": \"" + getConfig("appid") + "\",\n" +
" \"ticket\": \"" + ticket + "\"\n" +
"}";
String res = null;
Map<String,Object> map = new HashMap<>();
Map<String, Object> map = new HashMap<>();
try {
res = HttpUtil.postGeneralUrl(getConfig("host")+"/gateway/ticket/user/acquirecontext?accessToken="+this.getVankeAccessToken(),"application/json",params,"UTF-8");
res = HttpUtil.postGeneralUrl(getConfig("host") + "/gateway/ticket/user/acquirecontext?accessToken=" + this.getVankeAccessToken(), "application/json", params, "UTF-8");
map = MyJsonUtil.getMapChangeJson(res);
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);
}
if((boolean)map.get("success")){ //如果成功 执行成功的业务
if ((boolean) map.get("success")) { //如果成功 执行成功的业务
//得到通过返回的map数据 更新umsMember
ResultMsg result = this.updateUmsMember(map);
if(result.isFlag()){
return new ResultMsg(true,"更新成功",result.getContext());
if (result.isFlag()) {
return new ResultMsg(true, "更新成功", result.getContext());
}
return new ResultMsg(false,result.getMsg());
}else{//否则获取失败 打印失败信息 return出去
return new ResultMsg(false, result.getMsg());
} else {//否则获取失败 打印失败信息 return出去
log.info("更新用户获取信息失败失败" + res);
return new ResultMsg(false,res);
return new ResultMsg(false, res);
}
}
/**
* 得到万科用户信息
*
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public ResultMsg getVankeUserInfo(String ticket){
public ResultMsg getVankeUserInfo(String ticket) {
this.getVankeConfig();
if(ticket == null || "".equals(ticket)){
return new ResultMsg(false,"传入ticket为空");
if (ticket == null || "".equals(ticket)) {
return new ResultMsg(false, "传入ticket为空");
}
//通过appId 和 ticket 以及 token发起获取用户身份信息请求
/*String params ="{\n" +
......@@ -156,28 +154,28 @@ public class VankeMemberLoginServiceImpl implements IVankeMemberLoginService {
" \"ticket\": \""+ticket+"\"\n" +
"}";*/
String res = null;
Map<String,Object> map = new HashMap<>();
Map<String, Object> map = new HashMap<>();
VankeGetUserInfoVO vankeGetUserInfoVO = new VankeGetUserInfoVO();
vankeGetUserInfoVO.setAppid(getConfig("appid"));
vankeGetUserInfoVO.setTicket(ticket);
try {
System.out.println(getConfig("host")+"/gateway/ticket/user/acquirecontext?accessToken="+this.getVankeAccessToken());
System.out.println(getConfig("host") + "/gateway/ticket/user/acquirecontext?accessToken=" + this.getVankeAccessToken());
System.out.println(JSONObject.toJSONString(vankeGetUserInfoVO));
res = HttpUtil.postGeneralUrl(getConfig("host")+"/gateway/ticket/user/acquirecontext?accessToken="+this.getVankeAccessToken(),"application/json",JSONObject.toJSONString(vankeGetUserInfoVO),"UTF-8");
res = HttpUtil.postGeneralUrl(getConfig("host") + "/gateway/ticket/user/acquirecontext?accessToken=" + this.getVankeAccessToken(), "application/json", JSONObject.toJSONString(vankeGetUserInfoVO), "UTF-8");
map = MyJsonUtil.getMapChangeJson(res);
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);
}
if((boolean)map.get("success")){ //如果成功 执行成功的业务
if ((boolean) map.get("success")) { //如果成功 执行成功的业务
//得到通过返回的map数据 得到umsMember
UmsMember um =this.handleSuccessInfo(map);
UmsMember um = this.handleSuccessInfo(map);
Map<String, String> tokenMap = this.umsMemberService.vankeLogin(um);
return new ResultMsg(true,"登录成功",tokenMap);
}else{//否则获取失败 打印失败信息 return出去
return new ResultMsg(true, "登录成功", tokenMap);
} else {//否则获取失败 打印失败信息 return出去
log.info("获取用户信息失败失败" + res);
return new ResultMsg(false,res);
return new ResultMsg(false, res);
}
}
......@@ -185,32 +183,32 @@ public class VankeMemberLoginServiceImpl implements IVankeMemberLoginService {
* 处理回调成功的会员数据信息 得到Ums_member
*/
@Override
public UmsMember handleSuccessInfo(Map<String,Object> map){
public UmsMember handleSuccessInfo(Map<String, Object> map) {
//通过job_no（员工编号）判断表中是否已经存在数据 不存在插入 存在则返回已登录 同时需要登录通过 返回自己系统token给前端
UmsMember um = this.umsMemberDao.selectUmsMemberByJobNo( map.get("jobNo")+"");
if(um == null ){//执行插入操作
UmsMember um = this.umsMemberDao.selectUmsMemberByJobNo(map.get("jobNo") + "");
if (um == null) {//执行插入操作
VankeVvUser vankeVvUser = new VankeVvUser();
vankeVvUser.setAccount( map.get("account")+"");
vankeVvUser.setAppid( map.get("appid")+"");
vankeVvUser.setDepartOrgName( map.get("departOrgName")+"");
vankeVvUser.setDepartment(map.get("department")+"");
vankeVvUser.setDeviceId( map.get("deviceId")+"");
vankeVvUser.setEid( map.get("eid")+"");
vankeVvUser.setEmail( map.get("email")+"");
vankeVvUser.setJobNo( map.get("jobNo")+"");
vankeVvUser.setLongName( map.get("longName")+"");
vankeVvUser.setMobile( map.get("mobile")+"");
vankeVvUser.setNetworkid( map.get("networkid")+"");
vankeVvUser.setOid( map.get("oid")+"");
vankeVvUser.setOpenid( map.get("openid")+"");
vankeVvUser.setOrgid( map.get("orgId")+"");
vankeVvUser.setPhotourl( map.get("photoUrl")+"");
vankeVvUser.setTid( map.get("tid")+"");
vankeVvUser.setUid( map.get("uid")+"");
vankeVvUser.setUserid( map.get("userid")+"");
vankeVvUser.setUsername( map.get("username")+"");
vankeVvUser.setXtid( map.get("xtid")+"");
vankeVvUser.setIsAdmin( map.get("isAdmin")+"");
vankeVvUser.setAccount(map.get("account") + "");
vankeVvUser.setAppid(map.get("appid") + "");
vankeVvUser.setDepartOrgName(map.get("departOrgName") + "");
vankeVvUser.setDepartment(map.get("department") + "");
vankeVvUser.setDeviceId(map.get("deviceId") + "");
vankeVvUser.setEid(map.get("eid") + "");
vankeVvUser.setEmail(map.get("email") + "");
vankeVvUser.setJobNo(map.get("jobNo") + "");
vankeVvUser.setLongName(map.get("longName") + "");
vankeVvUser.setMobile(map.get("mobile") + "");
vankeVvUser.setNetworkid(map.get("networkid") + "");
vankeVvUser.setOid(map.get("oid") + "");
vankeVvUser.setOpenid(map.get("openid") + "");
vankeVvUser.setOrgid(map.get("orgId") + "");
vankeVvUser.setPhotourl(map.get("photoUrl") + "");
vankeVvUser.setTid(map.get("tid") + "");
vankeVvUser.setUid(map.get("uid") + "");
vankeVvUser.setUserid(map.get("userid") + "");
vankeVvUser.setUsername(map.get("username") + "");
vankeVvUser.setXtid(map.get("xtid") + "");
vankeVvUser.setIsAdmin(map.get("isAdmin") + "");
this.vankeVvUserMapper.insertSelective(vankeVvUser);
//根据部门名称判断是否存在此部门
VankeDepartmentExample example = new VankeDepartmentExample();
......@@ -219,12 +217,12 @@ public class VankeMemberLoginServiceImpl implements IVankeMemberLoginService {
List<VankeDepartment> vdList = this.vankeDepartmentMapper.selectByExample(example);
//初始化部门对象
VankeDepartment vd = new VankeDepartment();
if(vdList == null || vdList.size() == 0 ){ // 如果不存在此部门 则新增部门
if (vdList == null || vdList.size() == 0) { // 如果不存在此部门 则新增部门
vd.setName(vankeVvUser.getDepartment());
this.vankeDepartmentMapper.insertSelective(vd);
}else{//否则存在
} else {//否则存在
vd = vdList.get(0);
if(vd.getDeleteStatus() == 0){//如果是已删除状态 新进会员则继续将此已删除部门转换成 未删除
if (vd.getDeleteStatus() == 0) {//如果是已删除状态 新进会员则继续将此已删除部门转换成 未删除
vd.setDeleteStatus(1);
this.vankeDepartmentMapper.updateByPrimaryKeySelective(vd);
}
......@@ -249,35 +247,35 @@ public class VankeMemberLoginServiceImpl implements IVankeMemberLoginService {
}
private ResultMsg updateUmsMember(Map<String,Object> map){
private ResultMsg updateUmsMember(Map<String, Object> map) {
//通过job_no（员工编号）判断表中是否已经存在数据 不存在插入 存在则返回已登录 同时需要登录通过 返回自己系统token给前端
UmsMember um = this.umsMemberDao.selectUmsMemberByJobNo( map.get("jobNo")+"");
if(um == null){
log.error("查询会员错误,不存在此会员，返回会员信息数据为:"+map);
return new ResultMsg(false,"ticket获取用户信息错误。"+map);
}else{
UmsMember um = this.umsMemberDao.selectUmsMemberByJobNo(map.get("jobNo") + "");
if (um == null) {
log.error("查询会员错误,不存在此会员，返回会员信息数据为:" + map);
return new ResultMsg(false, "ticket获取用户信息错误。" + map);
} else {
VankeVvUser vankeVvUser = new VankeVvUser();
vankeVvUser.setAccount( map.get("account")+"");
vankeVvUser.setAppid( map.get("appid")+"");
vankeVvUser.setDepartOrgName( map.get("departOrgName")+"");
vankeVvUser.setDepartment(map.get("department")+"");
vankeVvUser.setDeviceId( map.get("deviceId")+"");
vankeVvUser.setEid( map.get("eid")+"");
vankeVvUser.setEmail( map.get("email")+"");
vankeVvUser.setJobNo( map.get("jobNo")+"");
vankeVvUser.setLongName( map.get("longName")+"");
vankeVvUser.setMobile( map.get("mobile")+"");
vankeVvUser.setNetworkid( map.get("networkid")+"");
vankeVvUser.setOid( map.get("oid")+"");
vankeVvUser.setOpenid( map.get("openid")+"");
vankeVvUser.setOrgid( map.get("orgId")+"");
vankeVvUser.setPhotourl( map.get("photoUrl")+"");
vankeVvUser.setTid( map.get("tid")+"");
vankeVvUser.setUid( map.get("uid")+"");
vankeVvUser.setUserid( map.get("userid")+"");
vankeVvUser.setUsername( map.get("username")+"");
vankeVvUser.setXtid( map.get("xtid")+"");
vankeVvUser.setIsAdmin( map.get("isAdmin")+"");
vankeVvUser.setAccount(map.get("account") + "");
vankeVvUser.setAppid(map.get("appid") + "");
vankeVvUser.setDepartOrgName(map.get("departOrgName") + "");
vankeVvUser.setDepartment(map.get("department") + "");
vankeVvUser.setDeviceId(map.get("deviceId") + "");
vankeVvUser.setEid(map.get("eid") + "");
vankeVvUser.setEmail(map.get("email") + "");
vankeVvUser.setJobNo(map.get("jobNo") + "");
vankeVvUser.setLongName(map.get("longName") + "");
vankeVvUser.setMobile(map.get("mobile") + "");
vankeVvUser.setNetworkid(map.get("networkid") + "");
vankeVvUser.setOid(map.get("oid") + "");
vankeVvUser.setOpenid(map.get("openid") + "");
vankeVvUser.setOrgid(map.get("orgId") + "");
vankeVvUser.setPhotourl(map.get("photoUrl") + "");
vankeVvUser.setTid(map.get("tid") + "");
vankeVvUser.setUid(map.get("uid") + "");
vankeVvUser.setUserid(map.get("userid") + "");
vankeVvUser.setUsername(map.get("username") + "");
vankeVvUser.setXtid(map.get("xtid") + "");
vankeVvUser.setIsAdmin(map.get("isAdmin") + "");
this.vankeVvUserMapper.insertSelective(vankeVvUser);
//根据部门名称判断是否存在此部门
VankeDepartmentExample example = new VankeDepartmentExample();
......@@ -286,12 +284,12 @@ public class VankeMemberLoginServiceImpl implements IVankeMemberLoginService {
List<VankeDepartment> vdList = this.vankeDepartmentMapper.selectByExample(example);
//初始化部门对象
VankeDepartment vd = new VankeDepartment();
if(vdList == null || vdList.size() == 0 ){ // 如果不存在此部门 则新增部门
if (vdList == null || vdList.size() == 0) { // 如果不存在此部门 则新增部门
vd.setName(vankeVvUser.getDepartment());
this.vankeDepartmentMapper.insertSelective(vd);
}else{//否则存在
} else {//否则存在
vd = vdList.get(0);
if(vd.getDeleteStatus() == 0){//如果是已删除状态 新进会员则继续将此已删除部门转换成 未删除
if (vd.getDeleteStatus() == 0) {//如果是已删除状态 新进会员则继续将此已删除部门转换成 未删除
vd.setDeleteStatus(1);
this.vankeDepartmentMapper.updateByPrimaryKeySelective(vd);
}
......@@ -309,28 +307,29 @@ public class VankeMemberLoginServiceImpl implements IVankeMemberLoginService {
um.setDepartId(vd.getId());
this.umsMemberMapper.updateByPrimaryKeySelective(um);
}
return new ResultMsg(true,"更新成功",um);
return new ResultMsg(true, "更新成功", um);
}
/**
* 通过 起始页 和 每页显示数量获取企业所有组织人员
*
* @return
*/
@Override
public List<VankeVvUserImportVo> getAllPersons(Integer pageNum,Integer pageSize){
public List<VankeVvUserImportVo> getAllPersons(Integer pageNum, Integer pageSize) {
String accessToken = this.getVankeAccessToken();
NameValuePair[] data = {
new NameValuePair("eid",getConfig("eid")),
new NameValuePair("time","2010-08-31 01:40:38"),//查询这个时刻之后所有变更的数据
new NameValuePair("begin",""+pageNum+""),
new NameValuePair("count",""+pageSize+"")
new NameValuePair("eid", getConfig("eid")),
new NameValuePair("time", "2010-08-31 01:40:38"),//查询这个时刻之后所有变更的数据
new NameValuePair("begin", "" + pageNum + ""),
new NameValuePair("count", "" + pageSize + "")
};
String res = null;
Map<String,Object> map = new HashMap<>();
Map<String, Object> map = new HashMap<>();
try {
res = HttpClientUtil.formUrlencodedPost(getConfig("host")+"/gateway/opendata-control/data/getallpersons?accessToken="+accessToken,data);
res = HttpClientUtil.formUrlencodedPost(getConfig("host") + "/gateway/opendata-control/data/getallpersons?accessToken=" + accessToken, data);
map = MyJsonUtil.getMapChangeJson(res);
} catch (Exception e) {
e.printStackTrace();
......@@ -343,41 +342,42 @@ public class VankeMemberLoginServiceImpl implements IVankeMemberLoginService {
public String testVankerefreshToken() {
//先判断redis是否存在vankeAccessToken
String vankeAccessToken="";
if(vankeAccessToken == null || vankeAccessToken.isEmpty()){
String params ="{\n" +
" \"appId\": \""+getConfig("appid")+"\",\n" +
" \"secret\": \""+getConfig("secret")+"\",\n" +
" \"timestamp\": "+new java.util.Date().getTime()+",\n" +
" \"scope\": \""+getConfig("scope")+"\"\n" +
String vankeAccessToken = "";
if (vankeAccessToken == null || vankeAccessToken.isEmpty()) {
String params = "{\n" +
" \"appId\": \"" + getConfig("appid") + "\",\n" +
" \"secret\": \"" + getConfig("secret") + "\",\n" +
" \"timestamp\": " + new java.util.Date().getTime() + ",\n" +
" \"scope\": \"" + getConfig("scope") + "\"\n" +
"}";
String res = null;
Map<String,Object> map = new HashMap<>();
Map<String, Object> map = new HashMap<>();
try {
res = HttpUtil.postGeneralUrl(getConfig("host")+"/gateway/oauth2/token/getAccessToken","application/json",params,"UTF-8");
res = HttpUtil.postGeneralUrl(getConfig("host") + "/gateway/oauth2/token/getAccessToken", "application/json", params, "UTF-8");
map = MyJsonUtil.getMapChangeJson(res);
} catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e);
}
if((boolean)map.get("success")){
if ((boolean) map.get("success")) {
//将token储存到redis 设置2小时有效期
}else{//获取token失败
} else {//获取token失败
log.info("获取token失败" + res);
}
return (String)map.get("accessToken");
}else{//否则存在直接返回accesToken
return (String) map.get("accessToken");
} else {//否则存在直接返回accesToken
return vankeAccessToken;
}
}
/**
* 获取vanke配置 信息
*
* @return
*/
private VankeConfig getVankeConfig(){
private VankeConfig getVankeConfig() {
//得到配置信息
VankeConfig vankeConfig = this.vankeConfigService.getConfig();
//将配置信息放置到redis中
......@@ -392,43 +392,44 @@ public class VankeMemberLoginServiceImpl implements IVankeMemberLoginService {
/**
* 得到具体参数
*
* @param flag
* @return
*/
private String getConfig(String flag){
private String getConfig(String flag) {
String res = "";
if("appid".equals(flag)){
if ("appid".equals(flag)) {
//先判断redis是否存在
String vanke_appid = this.redisService.get("vanke_appid");
if(vanke_appid == null || vanke_appid.isEmpty()){
if (vanke_appid == null || vanke_appid.isEmpty()) {
return this.getVankeConfig().getAppid();
}
res = vanke_appid;
}else if("secret".equals(flag)){
} else if ("secret".equals(flag)) {
//先判断redis是否存在
String vanke_secret = this.redisService.get("vanke_secret");
if(vanke_secret == null || vanke_secret.isEmpty()){
if (vanke_secret == null || vanke_secret.isEmpty()) {
return this.getVankeConfig().getSecret();
}
res = vanke_secret;
}else if("scope".equals(flag)){
} else if ("scope".equals(flag)) {
//先判断redis是否存在
String vanke_scope = this.redisService.get("vanke_scope");
if(vanke_scope == null || vanke_scope.isEmpty()){
if (vanke_scope == null || vanke_scope.isEmpty()) {
return this.getVankeConfig().getScope();
}
res = vanke_scope;
}else if("eid".equals(flag)){
} else if ("eid".equals(flag)) {
//先判断redis是否存在
String vanke_eid = this.redisService.get("vanke_eid");
if(vanke_eid == null || vanke_eid.isEmpty()){
if (vanke_eid == null || vanke_eid.isEmpty()) {
return this.getVankeConfig().getEid();
}
res = vanke_eid;
}else if("host".equals(flag)){
} else if ("host".equals(flag)) {
//先判断redis是否存在
String vanke_host = this.redisService.get("vanke_host");
if(vanke_host == null || vanke_host.isEmpty()){
if (vanke_host == null || vanke_host.isEmpty()) {
return this.getVankeConfig().getHost();
}
res = vanke_host;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment