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 54be64383..995111eb3 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 @@ -89,7 +89,24 @@ public class ApiUserController { * @param ApiUser * :用户的appKey username、等资料 */ - List apiUsers = this.apiUserService.findApiUsersByParamsSortDate(null); + ArrayList queryParams = new ArrayList(); + if (model.getStatus() != null) { + queryParams.add(new QueryParam("status", model.getStatus())); + }else { + queryParams.add(new QueryParam("status",0)); + } + if (model.getIsTest()!=null){ + queryParams.add(new QueryParam("isTest",model.getIsTest())); + }else { + queryParams.add(new QueryParam("isTest",0)); + } + if (model.getPurpose()!=null){ + queryParams.add(new QueryParam("purpose",model.getPurpose())); + }else { + queryParams.add(new QueryParam("purpose",1)); + } + + List apiUsers = this.apiUserService.findApiUsersByParamsSortDate(queryParams); List apiUserBoList = new ArrayList(); for (ApiUser apiUser : apiUsers) { User user = this.userService.findById(apiUser.getId()); @@ -195,6 +212,8 @@ public class ApiUserController { apiUser.setDeadTime(model.getDeadTime()); apiUser.setManager(model.getManager()); apiUser.setIsMonitor(model.getIsMonitor()); + apiUser.setContact(model.getContact()); + apiUser.setPhone(model.getPhone()); this.apiUserService.save(apiUser); // 新增用户,默认挂牌价改为默认评估价 model.setPriceType("evaluate"); @@ -238,6 +257,8 @@ public class ApiUserController { bo.setDeadTime(apiUser.getDeadTime()); bo.setManager(apiUser.getManager()); bo.setIsMonitor(apiUser.getIsMonitor()); + bo.setContact(apiUser.getContact()); + bo.setPhone(apiUser.getPhone()); ApiUserCfg apiUserCfg_rate = apiUserCfgService.findByUserId(apiUser.getId(), ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE); if (apiUserCfg_rate != null) { bo.setEvaluateRate((Double) apiUserCfg_rate.getCfgValue()); @@ -291,6 +312,8 @@ public class ApiUserController { dataApiUser.put("deadTime", model.getDeadTime()); dataApiUser.put("manager", model.getManager()); dataApiUser.put("isMonitor", model.getIsMonitor()); + dataApiUser.put("contact", model.getContact()); + dataApiUser.put("phone", model.getPhone()); this.apiUserService.update(dataApiUser, userId); // 更改用户密码 // this.userService.updateById(user,userId); @@ -1255,7 +1278,7 @@ public class ApiUserController { dataList.add(row); } - String dateStr ="("+ DateUtils.format(startDate, "yyyy/MM/dd") + "—" + DateUtils.format(endDate, "yyyy/MM/dd") +")"; + String dateStr = "(" + DateUtils.format(startDate, "yyyy/MM/dd") + "—" + DateUtils.format(endDate, "yyyy/MM/dd") + ")"; String fileName = "用户账号使用统计" + dateStr + ".xlsx"; // ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).build(); String displayName = URLEncoder.encode(fileName, "UTF-8"); @@ -1265,10 +1288,10 @@ public class ApiUserController { Sheet sheet = workbook.createSheet("用户账号使用统计"); List head = Arrays.asList( "用户ID", "账号", "合同到期时间", "接口", "接口名称", "剩余使用次数", - "访问次数(近一周)", "日均访问量(近一周)","成功并有效(近一周)", "成功并无效(近一周)","失败次数(近一周)", - "访问次数(近一月)", "日均访问量(近一月)","成功并有效(近一月)", "成功并无效(近一月)","失败次数(近一月)", - "访问次数"+dateStr, "日均访问量"+dateStr,"成功并有效"+dateStr, "成功并无效"+dateStr,"失败次数"+dateStr - ); + "访问次数(近一周)", "日均访问量(近一周)", "成功并有效(近一周)", "成功并无效(近一周)", "失败次数(近一周)", + "访问次数(近一月)", "日均访问量(近一月)", "成功并有效(近一月)", "成功并无效(近一月)", "失败次数(近一月)", + "访问次数" + dateStr, "日均访问量" + dateStr, "成功并有效" + dateStr, "成功并无效" + dateStr, "失败次数" + dateStr + ); // 创建表头 Row headRow = sheet.createRow(0); for (int i = 0; i < head.size(); i++) { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiUserModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiUserModel.java index ad264fe9a..f77689d9e 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiUserModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiUserModel.java @@ -40,6 +40,10 @@ public class ApiUserModel extends BaseModel { private Map priceRatingMap; private Integer isMonitor; + private String contact; + + private String phone; + public String getPriceType() { return priceType; } @@ -70,7 +74,7 @@ public class ApiUserModel extends BaseModel { private String type; private String citys;// spell private String unCheckCitys;// 页面反选的city - private int status; + private Integer status; private String uri; private boolean hasAuth; private boolean supportLatLng; @@ -378,15 +382,15 @@ public class ApiUserModel extends BaseModel { this.limit = limit; } - public int getStatus() { + public Integer getStatus() { return status; } - public void setStatus(int status) { + public void setStatus(Integer status) { this.status = status; } - public String getCompany() { + public String getCompany() { return company; } @@ -615,4 +619,20 @@ public class ApiUserModel extends BaseModel { public void setIsMonitor(Integer isMonitor) { this.isMonitor = isMonitor; } + + public String getContact() { + return contact; + } + + public void setContact(String contact) { + this.contact = contact; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } } diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl index 2f3071de2..6520d44c3 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl @@ -34,12 +34,12 @@
鏄电О - + 鐢ㄦ埛鍚� - + 瀵嗙爜 @@ -59,7 +59,7 @@ 璐︽埛鐢ㄩ�� + 閿�鍞礋璐d汉 - + 鍏徃 - + 浼颁环璋冩暣姣旂巼 @@ -92,13 +92,21 @@ siteName - + 鍒版湡鏃堕棿 - + + 瀹㈡埛鑱旂郴浜� + + + + 瀹㈡埛鑱旂郴浜虹數璇� + + ip鍦板潃