Skip to content

H
Hgs
Commit c511e1c6 authored by jay's avatar jay
Browse files
Options

接口修改

parent 8b0dce3c
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 23 deletions
house365-hgs-web/src/main/java/com/house365/web/controller/RoleController.java
View file @ c511e1c6
...@@ -693,7 +693,7 @@ public class RoleController extends BaseController { ...@@ -693,7 +693,7 @@ public class RoleController extends BaseController {
DepartmentResponse dept = department.getDepartmentById(userEntity.getDeptId()); DepartmentResponse dept = department.getDepartmentById(userEntity.getDeptId());
try { try {
//2.获取短号 //2.获取短号
// String cornetUrl = "http://api.400.house365.com/api/5a9ea11c04845";//获取短号接口url // String cornetUrl = "http://tel400.house365.com/api/5a9ea11c04845";//获取短号接口url
String cornetUrl = MemoryPropertyPlaceholderConfigurer.getContextProperty("getcornet.url"); String cornetUrl = MemoryPropertyPlaceholderConfigurer.getContextProperty("getcornet.url");
HashMap<String, String> bindMap = new HashMap<>(); HashMap<String, String> bindMap = new HashMap<>();
List<String> newCornetParams = new ArrayList<>(); List<String> newCornetParams = new ArrayList<>();
......
house365-hgs-web/src/main/java/com/house365/web/util/HttpUtil.java
View file @ c511e1c6
...@@ -194,7 +194,7 @@ public class HttpUtil { ...@@ -194,7 +194,7 @@ public class HttpUtil {
public static String getAccessToken(HashMap<String, String> tokenMap, String timestamp, String randStr, String signature, String deciceId, House365RestResponse response){ public static String getAccessToken(HashMap<String, String> tokenMap, String timestamp, String randStr, String signature, String deciceId, House365RestResponse response){
//获取acceToken接口URl //获取acceToken接口URl
String getAccessTokenUrl = "http://api.400.house365.com/api/5aaf0c48ed105"; String getAccessTokenUrl = "http://tel400.house365.com/api/5aaf0c48ed105";
List<NameValuePair> tokenInParam = new ArrayList<>(); List<NameValuePair> tokenInParam = new ArrayList<>();
tokenInParam.add(new BasicNameValuePair("timestamp", timestamp)); tokenInParam.add(new BasicNameValuePair("timestamp", timestamp));
......
house365-hgs-web/src/main/resources/production/properties/system.properties
View file @ c511e1c6
...@@ -29,7 +29,7 @@ accesstoken.url=http://tel400.house365.com:81/api/5aaf0c48ed105 ...@@ -29,7 +29,7 @@ accesstoken.url=http://tel400.house365.com:81/api/5aaf0c48ed105
getcornet.url=http://tel400.house365.com:81/api/5a9ea11c04845 getcornet.url=http://tel400.house365.com:81/api/5a9ea11c04845
bindcornet.url=http://tel400.house365.com:81/api/5ad553214586b bindcornet.url=http://tel400.house365.com:81/api/5ad553214586b
#unbindcornet.url=http://tel400.house365.com:81/api/5a9ea13f5e42c #unbindcornet.url=http://tel400.house365.com:81/api/5a9ea13f5e42c
unbindcornet.url=http://api.400.house365.com/api/5a9ea13f5e42c unbindcornet.url=http://tel400.house365.com/api/5a9ea13f5e42c
modifycornet.url=http://tel400.house365.com:81/api/5ad6b66e28cec modifycornet.url=http://tel400.house365.com:81/api/5ad6b66e28cec
## NewHouse ## NewHouse
......
house365-hgs-ws/src/main/java/com/house365/ws/interfaces/impl/UserImpl.java
View file @ c511e1c6
...@@ -871,7 +871,7 @@ public class UserImpl implements IUser { ...@@ -871,7 +871,7 @@ public class UserImpl implements IUser {
private static String getAccessToken(HashMap<String, String> tokenMap, String timestamp, String randStr, String signature, String deciceId) { private static String getAccessToken(HashMap<String, String> tokenMap, String timestamp, String randStr, String signature, String deciceId) {
//获取acceToken接口URl //获取acceToken接口URl
String getAccessTokenUrl = "http://api.400.house365.com/api/5aaf0c48ed105"; String getAccessTokenUrl = "http://tel400.house365.com/api/5aaf0c48ed105";
List<NameValuePair> tokenInParam = new ArrayList<>(); List<NameValuePair> tokenInParam = new ArrayList<>();
tokenInParam.add(new BasicNameValuePair("timestamp", timestamp)); tokenInParam.add(new BasicNameValuePair("timestamp", timestamp));
tokenInParam.add(new BasicNameValuePair("app_id", "12558119")); tokenInParam.add(new BasicNameValuePair("app_id", "12558119"));
......
house365-hgs-ws/src/main/java/com/house365/ws/interfaces/rest/GetOnlineLogImpl.java
View file @ c511e1c6
...@@ -120,15 +120,7 @@ public class GetOnlineLogImpl implements IGetOnlineLog { ...@@ -120,15 +120,7 @@ public class GetOnlineLogImpl implements IGetOnlineLog {
list.add(dataMap); list.add(dataMap);
} }
} else { } else {
//判断用户在线 //当天没有日志记录时，往前推一个月查询是否有在线记录
if (u.getOnlineStatus() == 1) {
dataMap.put("userId", u.getId());
dataMap.put("accId", u.getAccId());
String timePeriod = startTime + "---" + endTime;
dataMap.put("time", timePeriod);
list.add(dataMap);
} else {
//处于下线状态时，往前推一个月查询是否有在线记录
Date date = DateTimeUtils.getDateByString(startTime, patten); Date date = DateTimeUtils.getDateByString(startTime, patten);
date = DateTimeUtils.getDaysAgo(date, 30); date = DateTimeUtils.getDaysAgo(date, 30);
String startTimeNew = DateTimeUtils.getDateString(date, patten); String startTimeNew = DateTimeUtils.getDateString(date, patten);
...@@ -136,21 +128,16 @@ public class GetOnlineLogImpl implements IGetOnlineLog { ...@@ -136,21 +128,16 @@ public class GetOnlineLogImpl implements IGetOnlineLog {
searchMap.put("endTime", endTime); searchMap.put("endTime", endTime);
searchMap.put("userId", u.getId()); searchMap.put("userId", u.getId());
searchMap.put("order", 1); searchMap.put("order", 1);
searchMap.put("newStatus", 1);
List<OnlineLogEntity> logListNew = logMapper.queryByConditions(searchMap); List<OnlineLogEntity> logListNew = logMapper.queryByConditions(searchMap);
if (CollectionUtils.isNotEmpty(logListNew)) { if (CollectionUtils.isNotEmpty(logListNew) && logListNew.get(0).getNewStatus() == 1) {
searchMap.put("newStatus", 0);
List<OnlineLogEntity> logListUnder = logMapper.queryByConditions(searchMap);
if (CollectionUtils.isNotEmpty(logListUnder)) {
dataMap.put("userId", u.getId()); dataMap.put("userId", u.getId());
dataMap.put("accId", u.getAccId()); dataMap.put("accId", u.getAccId());
String timePeriod = DateTimeUtils.getDateString(logListNew.get(0).getCreateTime(), patten) + "---" + DateTimeUtils.getDateString(logListUnder.get(0).getCreateTime(), patten); String timePeriod = startTime + "---" + endTime;
dataMap.put("time", timePeriod); dataMap.put("time", timePeriod);
list.add(dataMap); list.add(dataMap);
} }
} }
}
}
}); });
} }
data.setList(list); data.setList(list);
......
house365-hgs-ws/src/main/resources/production/properties/system.properties
View file @ c511e1c6
...@@ -37,7 +37,7 @@ CRM.CUSTOMER.INFO.URL=http://crm.house365.com:81/index.php/Simulate/getmember_vi ...@@ -37,7 +37,7 @@ CRM.CUSTOMER.INFO.URL=http://crm.house365.com:81/index.php/Simulate/getmember_vi
CRM.WECHAT.CUSTOMER.INFO.URL=http://crmtouch.house365.com/index.php?m=Home&c=Api&a=MemberViewHyperlink&source=hgs&nonce= CRM.WECHAT.CUSTOMER.INFO.URL=http://crmtouch.house365.com/index.php?m=Home&c=Api&a=MemberViewHyperlink&source=hgs&nonce=
CRM.TOUCH.HOST=http://crmtouch.house365.com CRM.TOUCH.HOST=http://crmtouch.house365.com
CRM.CUSTOMER.CALLBACK=http://crm.house365.com/api/hgs/pingback CRM.CUSTOMER.CALLBACK=http://crm.house365.com/api/hgs/pingback
unbindcornet.url=http://api.400.house365.com/api/5a9ea13f5e42c unbindcornet.url=http://tel400.house365.com/api/5a9ea13f5e42c
CRM.CONFIG.URL=http://crm.house365.com:81/api/hgs/definition CRM.CONFIG.URL=http://crm.house365.com:81/api/hgs/definition
CRM.CUSTOMERQUERY.URL=http://crm.house365.com/api/hgs/query CRM.CUSTOMERQUERY.URL=http://crm.house365.com/api/hgs/query
CRM.CONFIRM.URL=http://crm.house365.com/api/hgs/confirm CRM.CONFIRM.URL=http://crm.house365.com/api/hgs/confirm
......
house365-hgs-ws/src/main/resources/test/properties/system.properties
View file @ c511e1c6
...@@ -32,7 +32,7 @@ system.env=test ...@@ -32,7 +32,7 @@ system.env=test
CRM.CUSTOMERPROJECT.UPDATESTATUS.URL=http://crm.house365.com:81/api/hgs/update?apiLevel=1.0 CRM.CUSTOMERPROJECT.UPDATESTATUS.URL=http://crm.house365.com:81/api/hgs/update?apiLevel=1.0
#CRM.CUSTOMER.ADD.URL=http://218.94.115.131:8881/index.php/Simulate/sea_utf8? #CRM.CUSTOMER.ADD.URL=http://218.94.115.131:8881/index.php/Simulate/sea_utf8?
CRM.CUSTOMER.ADD.URL=http://crm.house365.com:81/index.php/Simulate/sea_utf8? CRM.CUSTOMER.ADD.URL=http://crm.house365.com:81/index.php/Simulate/sea_utf8?
unbindcornet.url=http://api.400.house365.com/api/5a9ea13f5e42c unbindcornet.url=http://tel400.house365.com/api/5a9ea13f5e42c
#CRM.CUSTOMER.INFO.URL=http://218.94.115.131:8881/index.php/Simulate/getmember_view?source=hgs&nonce= #CRM.CUSTOMER.INFO.URL=http://218.94.115.131:8881/index.php/Simulate/getmember_view?source=hgs&nonce=
CRM.CUSTOMER.INFO.URL=http://crm.house365.com:81/index.php/Simulate/getmember_view?source=hgs&nonce= CRM.CUSTOMER.INFO.URL=http://crm.house365.com:81/index.php/Simulate/getmember_view?source=hgs&nonce=
CRM.WECHAT.CUSTOMER.INFO.URL=http://crmtouch.house365.com/index.php?m=Home&c=Api&a=MemberViewHyperlink&source=hgs&nonce= CRM.WECHAT.CUSTOMER.INFO.URL=http://crmtouch.house365.com/index.php?m=Home&c=Api&a=MemberViewHyperlink&source=hgs&nonce=
......
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