diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java index e93f2e177..ca2a516e3 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java @@ -1,11 +1,13 @@ package com.fangjia.bkoff.controllers; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.util.DateUtils; +import com.alibaba.excel.write.metadata.WriteSheet; import com.fangjia.bkoff.model.ApiUserModel; import com.fangjia.bkoff.model.JsonModel; -import com.fangjia.core.util.BeanUtils; -import com.fangjia.core.util.DataUtil; -import com.fangjia.core.util.DateUtil; -import com.fangjia.core.util.StringUtil; +import com.fangjia.core.util.*; +import com.fangjia.dal.QueryParam; import com.fangjia.dal.mongo.fangjia.model.ServerArea; import com.fangjia.dal.mongo.model.ApiInvokeStatistical; import com.fangjia.dal.mongo.model.ApiUserCfg; @@ -27,23 +29,33 @@ import com.fangjia.service.sql.UserService; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateUtils; import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.bson.types.ObjectId; import org.json.JSONArray; +import org.sothis.core.util.CollectionUtils; import org.sothis.web.mvc.ActionContext; import org.sothis.web.mvc.annotation.Param; +import scala.Int; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.math.BigDecimal; import java.net.URLEncoder; +import java.text.DecimalFormat; import java.text.SimpleDateFormat; import java.util.*; + /** * api用户开通等管理controller * @@ -61,8 +73,6 @@ public class ApiUserController { private ApiInvokeStatisticalService apiInvokeStatisticalService; private ApiVisitCountService apiVisitCountService; private ApiCountCityService apiCountCityService; - - /** * 所有api用户的信息展示 * @@ -303,14 +313,15 @@ public class ApiUserController { user.put("password", DigestUtils.md5Hex(model.getPassword())); // // // 更改用户密码 - this.userService.updateById(user,userId); + this.userService.updateById(user, userId); // 刷新缓存 this.apiUserService.clearApiUserAuthorityCache(userId); model.setViewType("redirect"); - model.setViewParam("location", "/apiUser/edit?userId="+userId); + model.setViewParam("location", "/apiUser/edit?userId=" + userId); return model; } + public Object editPwdAction(ApiUserModel model) { Long userId = model.getUserId(); User user = this.userService.findById(userId); @@ -975,7 +986,21 @@ public class ApiUserController { } else { cities = new ArrayList(); } - List analys = openUriAnalyService.findOpenUriAnalyLogs(model.getUserId(), null, startDate, endDate); + // 只查询正式账号 + List queryParams = Arrays.asList(new QueryParam("isTest", 0)); + List apiUsers = this.apiUserService.findApiUsersByParamsSortDate(queryParams); + // 获取正式账号的ids + List ids = new ArrayList(); + for (ApiUser apiUser : apiUsers) { + ids.add((int) apiUser.getId()); + } + List analyAll = openUriAnalyService.findOpenUriAnalyLogs(model.getUserId(), null, startDate, endDate); + List analys = new ArrayList(); + for (OpenUriAnaly analy : analyAll) { + if (ids.contains(analy.getApiUserId())) { + analys.add(analy); + } + } List bos = null; List eachCityBos = null; if (model.getWay() == null) { @@ -1016,9 +1041,7 @@ public class ApiUserController { } } } - List userIds = new ArrayList(); for (StatAnalyBo boTemp : bos) { - userIds.add(Long.valueOf(boTemp.getUserId())); List apiVisitCounts = apiVisitCountService.findAllApiVisitCount(Long.valueOf(boTemp.getUserId()), null, startDate, endDate); int total = 0; for (ApiVisitCount apiVisitCount : apiVisitCounts) { @@ -1027,7 +1050,6 @@ public class ApiUserController { boTemp.setBillingCount(total); } - List apiUsers = apiUserService.findApiUserByIds(userIds); Map idUserMap = new HashMap(); for (ApiUser apiUser : apiUsers) { idUserMap.put(apiUser.getId(), apiUser); @@ -1051,8 +1073,199 @@ public class ApiUserController { return model; } + public Object exportAction(ApiUserModel model, HttpServletResponse response) throws IllegalAccessException { + Date startDate = null; + Date endDate = null; + if (StringUtils.isBlank(model.getBegDate()) && StringUtils.isBlank(model.getEndDate())) { + startDate = DateUtil.add(DateUtil.formatToYYYYMMDD(new Date()), -7); + endDate = DateUtil.parseStringToDate(DateUtil.formatToYYYYMMDD(new Date())); + } else { + if (StringUtils.isNotBlank(model.getBegDate())) { + startDate = DateUtil.parseStringToDate(model.getBegDate()); + } + if (StringUtils.isNotBlank(model.getEndDate())) { + endDate = DateUtil.parseStringToDate(model.getEndDate()); + } - public Object userVisitStatAction(ApiUserModel model) { + } + if (startDate != null) { + model.setBegDate(DateUtil.formatToYYYYMMDD(startDate)); + } + + if (endDate != null) { + model.setEndDate(DateUtil.formatToYYYYMMDD(endDate)); + } + + long diffInMillies = Math.abs(endDate.getTime() - startDate.getTime()); + + // 将毫秒转换为天数 + long days = diffInMillies / (1000 * 60 * 60 * 24); // 使用long来计算天数 + // 只查询正式账号 + List queryParams = Arrays.asList(new QueryParam("isTest", 0)); + List apiUsers = this.apiUserService.findApiUsersByParamsSortDate(queryParams); + // 获取正式账号的ids + List ids = new ArrayList(); + for (ApiUser apiUser : apiUsers) { + ids.add((int) apiUser.getId()); + } + // 只获取正式用户的 + List analyAll = openUriAnalyService.findOpenUriAnalyLogs(model.getUserId(), null, startDate, endDate); + List analys = new ArrayList(); + for (OpenUriAnaly analy : analyAll) { + if (ids.contains(analy.getApiUserId())) { + analys.add(analy); + } + } + List userIds = new ArrayList(); + // 获取有访问记录的用户ID + for (OpenUriAnaly analy : analys) { + if (!userIds.contains(analy.getApiUserId())) { + userIds.add(analy.getApiUserId()); + } + } + List bosAll = new ArrayList(); + if (CollectionUtils.isNotEmpty(userIds)) { + // 根据访问遍历用户 + for (Integer userId : userIds) { + long id = (long) userId; + // 获取每个用户的访问 + List analyUser = openUriAnalyService.findOpenUriAnalyLogs(id, null, startDate, endDate); + ApiUserAuthority authority = apiUserAuthorityService.findByUserId(id); + Map countMap = authority.getTotalCountMap(); + // 获取 deadline + ApiUser apiUser = apiUserService.findApiUserById(id); + // 获取用户名 + User user = userService.findById(id); + List bos = null; + bos = createAnalyBosByLink(analyUser); + long date = DateUtil.parseStringToDate("2016-11-23").getTime(); + if (startDate.getTime() >= date && endDate.getTime() > date) { + List apiInvokeStatisticalList = apiInvokeStatisticalService.findApiInvokeStatisticalList(id, startDate, endDate); + if (bos != null && apiInvokeStatisticalList.size() > 0) { + Map> resultMap = getCountByUri(apiInvokeStatisticalList); + for (StatAnalyBo boTemp : bos) { + boTemp.setPurpose(apiUser.getPurpose()); + String url = boTemp.getKey(); + boTemp.setSuccessEffectiveTime(resultMap.get(url).get("successEffectiveCount")); + boTemp.setSuccessInvalidTime(resultMap.get(url).get("successInvalidCount")); + boTemp.setDefeatTime(resultMap.get(url).get("defeatCount")); + if (apiUser != null) { + boTemp.setDeadline(apiUser.getDeadTime()); + } + long curVistedCount = apiVisitCountService.findApiVisitCountByDay(id, url, DateUtil.truncateDay(new Date())); + long historyCount = apiVisitCountService.findApiVisitAllCount(id, url, DateUtil.truncateDay(new Date())); + if (countMap != null && countMap.containsKey(url)) { + Integer totalCount = countMap.get(url); + long usedCount = curVistedCount + historyCount; + boTemp.setSurplusCallCount(Integer.valueOf((int) (totalCount - usedCount))); + } + if (user != null) { + boTemp.setName(user.getDisplayName()); + boTemp.setUserId((int) user.getId()); + } + + List apiVisitCounts = apiVisitCountService.findAllApiVisitCount(id, boTemp.getKey(), startDate, endDate); + int total = 0; + for (ApiVisitCount apiVisitCount : apiVisitCounts) { + total += apiVisitCount.getVisitCount(); + } + boTemp.setBillingCount(total); + double dailyUse = boTemp.getCount() * 1.0 / days; + boTemp.setDailyUse(dailyUse); + } + } + } + bosAll.addAll(bos); + + } + } + this.buildReport(bosAll, response, startDate, endDate); + model.setViewType("stream"); + return model; + } + + private void buildReport(List bos, HttpServletResponse response, Date startDate, Date endDate) { + try { + List> dataList = new ArrayList>(); + + for (StatAnalyBo bo : bos) { + List row = new ArrayList(); + row.add(bo.getUserId() != null ? bo.getUserId().toString() : ""); + row.add(bo.getName() != null ? bo.getName().toString() : ""); + if (bo.getPurpose() != null) { + Integer purpose = bo.getPurpose(); + if (purpose == 1) { + row.add("API"); + } else if (purpose == 2) { + row.add("PDS"); + } else if (purpose == 4) { + row.add("房生活"); + } + }else { + row.add(""); + } + row.add(bo.getKey() != null ? bo.getKey().toString() : ""); + row.add(bo.getSurplusCallCount() != null ? bo.getSurplusCallCount().toString() : ""); + row.add(bo.getDeadline() != null ? DateUtils.format(bo.getDeadline(), "yyyy/MM/dd") : ""); + row.add(bo.getCount() != null ? bo.getCount().toString() : ""); + if (bo.getDailyUse() !=null){ + // 格式化为保留一位小数的字符串 + String formattedDailyUse = String.format("%.1f", bo.getDailyUse()); + row.add(formattedDailyUse); + }else { + row.add(""); + } + row.add(bo.getPercent() != null ? bo.getPercent().toString() : ""); + row.add(bo.getSuccessEffectiveTime() != null ? bo.getSuccessEffectiveTime().toString() : ""); + row.add(bo.getSuccessInvalidTime() != null ? bo.getSuccessInvalidTime().toString() : ""); + row.add(bo.getDefeatTime() != null ? bo.getDefeatTime().toString() : ""); + row.add(bo.getBillingCount() != null ? bo.getBillingCount().toString() : ""); + dataList.add(row); + } + + String fileName = "用户账号使用统计(" + DateUtils.format(startDate, "yyyy/MM/dd") + "—" + DateUtils.format(endDate, "yyyy/MM/dd") + ").xlsx"; +// ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).build(); + String displayName = URLEncoder.encode(fileName, "UTF-8"); + response.setHeader("Content-Disposition", "attachment; filename=\"" + displayName + "\""); + response.setContentType("application/x-download;charset=utf-8"); + Workbook workbook = new XSSFWorkbook(); + Sheet sheet = workbook.createSheet("用户账号使用统计"); + List head = Arrays.asList( + "用户ID", "账号", "账号用途", "接口", "剩余使用次数", "合同到期时间", "访问次数", "日均访问量", + "占比(%)", "成功并有效", "成功并无效", "失败次数", "计费次数"); + // 创建表头 + Row headRow = sheet.createRow(0); + for (int i = 0; i < head.size(); i++) { + Cell cell = headRow.createCell(i); + cell.setCellValue(head.get(i)); + } + // 写入数据,从第二行 + for (int i = 0; i < dataList.size(); i++) { + Row row = sheet.createRow(i + 1); + List data = dataList.get(i); + for (int j = 0; j < data.size(); j++) { + Cell cell = row.createCell(j); + cell.setCellValue(data.get(j)); + } + } + ServletOutputStream outputStream = response.getOutputStream(); + workbook.write(outputStream); + } catch (IOException e) { + } + + } + + List> formatHead(String[] headArr) { + List> head = new ArrayList>(); + for (String name : headArr) { + List temp = new ArrayList(); + temp.add(name); + head.add(temp); + } + return head; + } + + public Object userVisitStatAction(ApiUserModel model) throws IllegalAccessException { Date startDate = null; Date endDate = null; if (StringUtils.isNotBlank(model.getBegDate())) { @@ -1075,8 +1288,12 @@ public class ApiUserController { // bos = createAnalyBosByUser(analys); // model.setChartSeries(toChartString(bos)); // }else if(model.getWay() == 2){ + Long userId = model.getUserId(); + ApiUserAuthority authority = apiUserAuthorityService.findByUserId(userId); + Map countMap = authority.getTotalCountMap(); + ApiUser apiUser = apiUserService.findApiUserById(userId); if (model.getWay() == 2) { - User user = userService.findById(model.getUserId()); + User user = userService.findById(userId); if (user != null) { model.setUserName(user.getDisplayName()); } @@ -1120,6 +1337,16 @@ public class ApiUserController { boTemp.setSuccessEffectiveTime(resultMap.get(url).get("successEffectiveCount")); boTemp.setSuccessInvalidTime(resultMap.get(url).get("successInvalidCount")); boTemp.setDefeatTime(resultMap.get(url).get("defeatCount")); + if (apiUser != null) { + boTemp.setDeadline(apiUser.getDeadTime()); + } + long curVistedCount = apiVisitCountService.findApiVisitCountByDay(userId, url, DateUtil.truncateDay(new Date())); + long historyCount = apiVisitCountService.findApiVisitAllCount(userId, url, DateUtil.truncateDay(new Date())); + if (countMap != null && countMap.containsKey(url)) { + Integer totalCount = countMap.get(url); + long usedCount = curVistedCount + historyCount; + boTemp.setSurplusCallCount(Integer.valueOf((int) (totalCount - usedCount))); + } } } } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/InquiryController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/InquiryController.java index 6e8ae8ffc..c96fd1c20 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/InquiryController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/InquiryController.java @@ -74,6 +74,8 @@ public class InquiryController { role = fjtRoleService.findRolesByName("农行"); }else if(2 == bkoffUsers.getSupportInquiryTask().intValue()){ role = fjtRoleService.findRolesByName("深圳农行"); + }else if(3 == bkoffUsers.getSupportInquiryTask().intValue()){ + role = fjtRoleService.findRolesByName("大正评估"); } List zqUserIds = userCityService.findUserIdByCity("肇庆"); @@ -87,6 +89,8 @@ public class InquiryController { } }else if(vo2.getRole()==16){ userIds.add(vo2.getId()); + }else if(vo2.getRole()==18){ + userIds.add(vo2.getId()); } } diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl index 907506c9f..2f3071de2 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl @@ -51,6 +51,7 @@ diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/apiVisitStat.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/apiVisitStat.ftl index 893f21d79..4f5ec9781 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/apiVisitStat.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/apiVisitStat.ftl @@ -12,9 +12,9 @@