|
|
@@ -5,19 +5,14 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.goafanti.common.bo.Error;
|
|
|
import com.goafanti.common.bo.InputCallCompleter;
|
|
|
import com.goafanti.common.bo.Result;
|
|
|
-import com.goafanti.common.dao.AdminMapper;
|
|
|
-import com.goafanti.common.dao.CallLogMapper;
|
|
|
-import com.goafanti.common.dao.OrganizationContactBookMapper;
|
|
|
-import com.goafanti.common.dao.UserMapper;
|
|
|
-import com.goafanti.common.model.Admin;
|
|
|
-import com.goafanti.common.model.CallLog;
|
|
|
-import com.goafanti.common.model.OrganizationContactBook;
|
|
|
-import com.goafanti.common.model.User;
|
|
|
+import com.goafanti.common.dao.*;
|
|
|
+import com.goafanti.common.model.*;
|
|
|
import com.goafanti.common.utils.DateUtils;
|
|
|
import com.goafanti.common.utils.HttpUtils;
|
|
|
import com.goafanti.common.utils.LoggerUtils;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
+import com.goafanti.core.mybatis.page.Pagination;
|
|
|
import com.goafanti.core.websocket.SystemWebSocketHandler;
|
|
|
import com.goafanti.customer.bo.InputCallNumber;
|
|
|
import com.goafanti.customer.bo.InputUserCallList;
|
|
|
@@ -46,6 +41,8 @@ public class UserOutboundServiceImpl extends BaseMybatisDao<CallLogMapper> imple
|
|
|
@Resource
|
|
|
private UserMapper userMapper;
|
|
|
@Resource
|
|
|
+ private UserMidMapper userMidMapper;
|
|
|
+ @Resource
|
|
|
private AdminMapper adminMapper;
|
|
|
@Resource
|
|
|
private OrganizationContactBookMapper organizationContactBookMapper;
|
|
|
@@ -203,6 +200,11 @@ public class UserOutboundServiceImpl extends BaseMybatisDao<CallLogMapper> imple
|
|
|
count++;
|
|
|
duration+=log.getDuration();
|
|
|
}
|
|
|
+ UserMid mid=new UserMid();
|
|
|
+ mid.setUid(uid);
|
|
|
+ mid.setCallCount(count);
|
|
|
+ mid.setCallDuration(duration);
|
|
|
+ userMidMapper.updateByUid(mid);
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -220,6 +222,23 @@ public class UserOutboundServiceImpl extends BaseMybatisDao<CallLogMapper> imple
|
|
|
public Object userCallList(InputUserCallList in) {
|
|
|
CallLog select=new CallLog();
|
|
|
select.setUid(in.getUid());
|
|
|
- return findPage("findCallLogList","findCallLogCount",select,in.getPageNo(),in.getPageSize());
|
|
|
+ Pagination<?> page = findPage("findCallLogList", "findCallLogCount", select, in.getPageNo(), in.getPageSize());
|
|
|
+ UserMid userMid = userMidMapper.selectByUid(in.getUid());
|
|
|
+ Map<String,Object> sumMap = new HashMap();
|
|
|
+ int count=0;
|
|
|
+ int duration=0;
|
|
|
+ if (userMid!=null){
|
|
|
+ User user = userMapper.queryById(in.getUid());
|
|
|
+ count=userMid.getCallCount();
|
|
|
+ duration=userMid.getCallDuration();
|
|
|
+ sumMap.put("callCount",count);
|
|
|
+ sumMap.put("callDuration",duration);
|
|
|
+ sumMap.put("name",user.getNickname());
|
|
|
+ }
|
|
|
+ Map<String,Object> res = new HashMap();
|
|
|
+ res.put("page",page);
|
|
|
+ res.put("sum",sumMap);
|
|
|
+
|
|
|
+ return res;
|
|
|
}
|
|
|
}
|