From 6bb1442357aa0d3f5eba2d5b7cb0b4828a59d1be Mon Sep 17 00:00:00 2001 From: majintao Date: Wed, 20 Nov 2024 16:45:01 +0800 Subject: [PATCH] =?UTF-8?q?API=E6=8E=A5=E5=8F=A3=E2=80=9C=E5=BC=80?= =?UTF-8?q?=E9=80=9A=E5=9F=8E=E5=B8=82=E2=80=9D=E5=A2=9E=E5=8A=A0=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E9=80=9A=E8=BF=87=E7=9C=81=E4=BB=BD=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bkoff/controllers/ApiUserController.java | 160 ++++++++++++++++++ .../com/fangjia/bkoff/model/ApiUserModel.java | 10 ++ .../src/main/webapp/apiUser/city.ftl | 119 ++++++++++--- 3 files changed, 262 insertions(+), 27 deletions(-) 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 01093e983..6da0200db 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 @@ -12,6 +12,7 @@ import com.fangjia.dal.mongo.fangjia.model.ServerArea; import com.fangjia.dal.mongo.model.ApiCountLog; import com.fangjia.dal.mongo.model.ApiInvokeStatistical; import com.fangjia.dal.mongo.model.ApiUserCfg; +import com.fangjia.dal.mongo.model.RegionBlock; import com.fangjia.dal.mongo.model.bkoff.BkoffUsers; import com.fangjia.dal.mongo.open.model.ApiJsonViewConfig; import com.fangjia.dal.mongo.open.model.ApiUserAuthority; @@ -23,9 +24,11 @@ import com.fangjia.dal.mongo.tool.model.OpenUriAnaly; import com.fangjia.dal.sql.model.ApiUser; import com.fangjia.dal.sql.model.User; import com.fangjia.service.api.ApiUserCfgService; +import com.fangjia.service.bo.ServerAreaBo; import com.fangjia.service.mongo.bkoff.ApiInvokeStatisticalService; import com.fangjia.service.mongo.bkoff.BkoffUsersService; import com.fangjia.service.mongo.fangjia.ApiCountLogService; +import com.fangjia.service.mongo.fangjia.RegionBlockService; import com.fangjia.service.mongo.fangjia.ServerAreaService; import com.fangjia.service.open.*; import com.fangjia.service.sql.ApiUserService; @@ -80,6 +83,8 @@ public class ApiUserController { private BkoffUsersService bkoffUsersService; private ApiCountLogService apiCountLogService; + private RegionBlockService regionBlockService; + /** * 所有api用户的信息展示 * @@ -461,6 +466,7 @@ public class ApiUserController { ApiUserAuthority apiUserAuthority = apiUserAuthorityService.findByUserId(model.getUserId()); Map cityCreditMap = apiUserAuthority.getCityCreditMap(); model.setDisplayName(user.getDisplayName() == null ? "" : user.getDisplayName()); + model.setProvinceList(getProvinceList()); model.setCityFirstLetters(Arrays.asList(getCityFirstLetter())); List serverAreaList = serverAreaService.findAll();// Load城市列表 if (StringUtils.isBlank(model.getType()) || "all".equals(model.getType())) {// 字母分组列表 @@ -481,6 +487,19 @@ public class ApiUserController { } serverAreaLetterList.add(map); } + if (model.getType().equals(serverArea.getProvince())) { + Map map = new HashMap(); + if (null != cityCreditMap && cityCreditMap.get(serverArea.getDisplay()) != null) { + map.put("key0", serverArea); + java.text.DecimalFormat df = new java.text.DecimalFormat("######0.00"); + String rate = df.format(cityCreditMap.get(serverArea.getDisplay())); + map.put("key1", rate); + } else { + map.put("key0", serverArea); + map.put("key1", null); + } + serverAreaLetterList.add(map); + } } model.setServerAreaList(serverAreaLetterList); } @@ -1946,6 +1965,15 @@ public class ApiUserController { "T", "W", "X", "Y", "Z"}; return cityFirstLetter; } + private List getProvinceList(){ + List provinces = Arrays.asList( + "山东", "福建", "河北", "河南", "湖北", "湖南", "江西", "海南", + "黑龙江", "陕西", "贵州", "新疆", "江苏", "安徽", "西藏", + "吉林", "山西", "甘肃", "宁夏", "四川", "浙江", "广西", + "云南", "直辖市", "内蒙古", "辽宁", "广东", "青海" + ); + return provinces; + } private Map> getCountByUri(List apiInvokeStatisticalList) { @@ -2104,6 +2132,65 @@ public class ApiUserController { return model; } + private Map> splitCityInProvince(List allCitys) { + if (CollectionUtils.isEmpty(allCitys)) { + return Collections.emptyMap(); + } + List regionBlocks = regionBlockService.getRegionBlockList(); + Map> regionMap = new TreeMap>(); + for (RegionBlock regionBlock : regionBlocks) { + List regionBlockList = regionMap.get(regionBlock.getCity()); + if (regionBlockList == null) { + regionBlockList = new ArrayList(); + } + regionBlockList.add(regionBlock); + regionMap.put(regionBlock.getCity(), regionBlockList); + } + Map> ret = new HashMap>(); + for (ServerAreaBo city : allCitys) { + + String province = ""; + if (city.getProvince() == null || city.getProvince() == "") { + province = null; + } else if (city.getProvince().equals("上海") || city.getProvince().equals("北京") || city.getProvince().equals("天津") + || city.getProvince().equals("重庆")) { + province = "直辖市"; + } else { + province = city.getProvince(); + } + if (province != null) { + + List cityBoList = ret.get(province); + if (CollectionUtils.isEmpty(cityBoList)) { + cityBoList = new ArrayList(); + } + CityBo bo = new CityBo(); + BeanUtils.copyProperties(city, bo); + + List getRegionBlock = regionMap.get(city.getDisplay()); + + if (getRegionBlock != null) { + + for (int i = getRegionBlock.size() - 1; i >= 0; i--) { + try { + if (getRegionBlock.get(i).getRegionType() != null && getRegionBlock.get(i).getRegionType() != 2) { + getRegionBlock.remove(i); + } + } catch (Exception e) { + e.printStackTrace(); + } + + } + + } + bo.setCityRegion(getRegionBlock); + cityBoList.add(bo); + ret.put(province, cityBoList); + } + } + return ret; + } + public void setBkoffUsersService(BkoffUsersService bkoffUsersService) { this.bkoffUsersService = bkoffUsersService; } @@ -2111,4 +2198,77 @@ public class ApiUserController { public void setApiCountLogService(ApiCountLogService apiCountLogService) { this.apiCountLogService = apiCountLogService; } + + public void setRegionBlockService(RegionBlockService regionBlockService) { + this.regionBlockService = regionBlockService; + } + + public class CityBo { + private String id; + private String display; + private String spell; + private String name; + private List cityRegion; + private int haveDistrict; // 0:没有 , > 0:有 + private Map cityRegionHaveDistrict; // 区域有无小区统计 0:没有 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getDisplay() { + return display; + } + + public void setDisplay(String display) { + this.display = display; + } + + public String getSpell() { + return spell; + } + + public void setSpell(String spell) { + this.spell = spell; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public List getCityRegion() { + return cityRegion; + } + + public void setCityRegion(List cityRegion) { + this.cityRegion = cityRegion; + } + + public int getHaveDistrict() { + return haveDistrict; + } + + public void setHaveDistrict(int haveDistrict) { + this.haveDistrict = haveDistrict; + } + + public Map getCityRegionHaveDistrict() { + return cityRegionHaveDistrict; + } + + public void setCityRegionHaveDistrict(Map cityRegionHaveDistrict) { + this.cityRegionHaveDistrict = cityRegionHaveDistrict; + } + + } + + } 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 353a79d8c..a312fb80b 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 @@ -104,6 +104,8 @@ public class ApiUserModel extends BaseModel { private Integer isCheckCount; private String openResourseUrisMap; + + private List provinceList; public String getOpenResourseUrisMap() { return openResourseUrisMap; @@ -665,4 +667,12 @@ public class ApiUserModel extends BaseModel { public void setIsWarnExpired(Integer isWarnExpired) { this.isWarnExpired = isWarnExpired; } + + public List getProvinceList() { + return provinceList; + } + + public void setProvinceList(List provinceList) { + this.provinceList = provinceList; + } } diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/city.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/city.ftl index 2444338cb..ddea00e5d 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/city.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/city.ftl @@ -1,6 +1,6 @@ <#ftl attributes={"content_type":"text/html; charset=UTF-8"}> <#compress> - + @@ -18,45 +18,110 @@
<#if openCitys??&&openCitys?length gt 0>${displayName!''}宸茬粡寮�閫�${openCitys!}<#else>${displayName!''}灏氭湭寮�閫氫换浣曞煄甯�
-


${message!}
-
+
+ + +
+ + 鍏ㄩ儴 + <#list provinceList as provinceName> + style='background:#82C1EF;'> + ${provinceName} + + + + +
- -
+ +
     <#if serverAreaList??> - <#assign submitId='_submit_button'> - <#-- <#list serverAreaList as serverArea> - checked />${serverArea.display!} - --> - - - - - - <#list serverAreaList as map> - + <#assign submitId='_submit_button'> +
鍩庡競鍙俊搴�
+ + + + + <#list serverAreaList as map> - - + + - - -
+ 鍏ㄩ�� + 鍙俊搴�
checked value="${map['key0'].display!}" />${map['key0'].display!} + checked + value="${map['key0'].display!}" /> + ${map['key0'].display!} + + +
+ + <#else> <#assign submitId='_submit_button_all'> - checked id="_checkbox_select_all"/>鍏ㄩ�� + checked id="_checkbox_select_all" /> 鍏ㄩ�� -


-      -
+


+      + +
+ + +