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 7df83ddd3..691eb9427 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 @@ -46,68 +46,67 @@ import java.util.*; /** * api用户开通等管理controller - * + * * @author */ public class ApiUserController { - private ApiUserService apiUserService; - private UserService userService; - private ApiUserAuthorityService apiUserAuthorityService; - private OpenResourceService openResourceService; - private ServerAreaService serverAreaService; - private OpenResourceCountService openResourceCountService; - private OpenUriAnalyService openUriAnalyService; - private ApiUserCfgService apiUserCfgService; - private ApiInvokeStatisticalService apiInvokeStatisticalService; - private ApiVisitCountService apiVisitCountService; - private ApiCountCityService apiCountCityService; + private ApiUserService apiUserService; + private UserService userService; + private ApiUserAuthorityService apiUserAuthorityService; + private OpenResourceService openResourceService; + private ServerAreaService serverAreaService; + private OpenResourceCountService openResourceCountService; + private OpenUriAnalyService openUriAnalyService; + private ApiUserCfgService apiUserCfgService; + private ApiInvokeStatisticalService apiInvokeStatisticalService; + private ApiVisitCountService apiVisitCountService; + private ApiCountCityService apiCountCityService; + /** + * 所有api用户的信息展示 + * + * @param model + * @return + */ + public Object listAction(ApiUserModel model) { + /** + * open中公开出的接口资源 ApiUserAuthority 用户的权限信息 + * + * @param ApiUser + * :用户的资料信息 + * @param ApiUser + * :用户的appKey username、等资料 + */ + List apiUsers = this.apiUserService.findApiUsersByParamsSortDate(null); + List apiUserBoList = new ArrayList(); + for (ApiUser apiUser : apiUsers) { + User user = this.userService.findById(apiUser.getId()); + if (user == null) { + continue; + } + ApiUserBo bo = new ApiUserBo(); + bo.setAppKey(apiUser.getAppKey()); + if (null != user) { + bo.setUserId(user.getId()); + bo.setPassword(user.getPassword()); + bo.setUserName(user.getUserName()); + bo.setDisplayName(user.getDisplayName()); + } - /** - * 所有api用户的信息展示 - * - * @param model - * @return - */ - public Object listAction(ApiUserModel model) { - /** - * open中公开出的接口资源 ApiUserAuthority 用户的权限信息 - * - * @param ApiUser - * :用户的资料信息 - * @param ApiUser - * :用户的appKey username、等资料 - */ - List apiUsers = this.apiUserService.findApiUsersByParamsSortDate(null); - List apiUserBoList = new ArrayList(); - for (ApiUser apiUser : apiUsers) { - User user = this.userService.findById(apiUser.getId()); - if (user == null) { - continue; - } - ApiUserBo bo = new ApiUserBo(); - bo.setAppKey(apiUser.getAppKey()); - if(null != user){ - bo.setUserId(user.getId()); - bo.setPassword(user.getPassword()); - bo.setUserName(user.getUserName()); - bo.setDisplayName(user.getDisplayName()); - } - - bo.setSiteName(apiUser.getSiteName()); - bo.setStatus(apiUser.getStatus()); + bo.setSiteName(apiUser.getSiteName()); + bo.setStatus(apiUser.getStatus()); bo.setCompany(apiUser.getCompany()); - bo.setIsTest(apiUser.getIsTest()); - bo.setPurpose(apiUser.getPurpose()); - bo.setDeadTime(apiUser.getDeadTime()); - bo.setManager(apiUser.getManager()); - bo.setIsMonitor(apiUser.getIsMonitor()); + bo.setIsTest(apiUser.getIsTest()); + bo.setPurpose(apiUser.getPurpose()); + bo.setDeadTime(apiUser.getDeadTime()); + bo.setManager(apiUser.getManager()); + bo.setIsMonitor(apiUser.getIsMonitor()); - apiUserBoList.add(bo); - } + apiUserBoList.add(bo); + } - Collections.sort(apiUserBoList, new Comparator() { + Collections.sort(apiUserBoList, new Comparator() { @Override public int compare(ApiUserBo o1, ApiUserBo o2) { if (o1.getStatus() == 0) { @@ -118,482 +117,537 @@ public class ApiUserController { }); - model.setApiUserBoList(apiUserBoList); - return model; - } - - public Object openlistAction(ApiUserModel model) { - return model; - } - - public Object resetPwdAction(ApiUserModel model) { - JsonModel ret = new JsonModel(); - Map dataMap = new HashMap(); - dataMap.put("status", 0); - if (model.getUserId() != null) { - Map data = new HashMap(); - data.put("password", DigestUtils.md5Hex("123456")); - userService.updateById(data, model.getUserId()); - dataMap.put("status", 1); - } - ret.setJsonModel(dataMap); - return ret; - } + model.setApiUserBoList(apiUserBoList); + return model; + } - /** - * 新增api用户的信息 - * - * @param model - * @return - */ - public Object addAction(ApiUserModel model) { - return model; - } + public Object openlistAction(ApiUserModel model) { + return model; + } - public Object doAddAction(ApiUserModel model) throws Exception { - if (StringUtils.isBlank(model.getDisplayName()) || StringUtils.isBlank(model.getUserName()) - || StringUtils.isBlank(model.getPassword())) { - model.setMsg("昵称,用户名,密码不能为空"); - model.forward("/apiUser/add"); - return model; - } + public Object resetPwdAction(ApiUserModel model) { + JsonModel ret = new JsonModel(); + Map dataMap = new HashMap(); + dataMap.put("status", 0); + if (model.getUserId() != null) { + Map data = new HashMap(); + data.put("password", DigestUtils.md5Hex("123456")); + userService.updateById(data, model.getUserId()); + dataMap.put("status", 1); + } + ret.setJsonModel(dataMap); + return ret; + } - try { - List users = new ArrayList(); - User user = new User(); - user.setUserName(model.getUserName()); - user.setPassword(DigestUtils.md5Hex(model.getPassword())); - user.setDisplayName(model.getDisplayName()); - users.add(user); - Map userMap = this.userService.saveUser(users); - Long id = userMap.get(model.getUserName()); + /** + * 新增api用户的信息 + * + * @param model + * @return + */ + public Object addAction(ApiUserModel model) { + return model; + } - String appkey = DigestUtils.md5Hex(String.valueOf(id)) + DigestUtils.md5Hex(DigestUtils.md5Hex(String.valueOf(id))); - Date date = new Date(); - ApiUser apiUser = new ApiUser(); - apiUser.setId(id); - apiUser.setAppKey(appkey.toUpperCase()); - apiUser.setCreationDate(date); - apiUser.setSiteName(model.getSiteName()); + public Object doAddAction(ApiUserModel model) throws Exception { + if (StringUtils.isBlank(model.getDisplayName()) || StringUtils.isBlank(model.getUserName()) + || StringUtils.isBlank(model.getPassword())) { + model.setMsg("昵称,用户名,密码不能为空"); + model.forward("/apiUser/add"); + return model; + } + + try { + List users = new ArrayList(); + User user = new User(); + user.setUserName(model.getUserName()); + user.setPassword(DigestUtils.md5Hex(model.getPassword())); + user.setDisplayName(model.getDisplayName()); + users.add(user); + Map userMap = this.userService.saveUser(users); + Long id = userMap.get(model.getUserName()); + + String appkey = DigestUtils.md5Hex(String.valueOf(id)) + DigestUtils.md5Hex(DigestUtils.md5Hex(String.valueOf(id))); + Date date = new Date(); + ApiUser apiUser = new ApiUser(); + apiUser.setId(id); + apiUser.setAppKey(appkey.toUpperCase()); + apiUser.setCreationDate(date); + apiUser.setSiteName(model.getSiteName()); apiUser.setCompany(model.getCompany()); - apiUser.setStatus(0); - apiUser.setIsTest(model.getIsTest()); - apiUser.setPurpose(model.getPurpose()); - apiUser.setIp(model.getIp()); - apiUser.setEmail(model.getEmail()); - apiUser.setModificationDate(date); - apiUser.setDeadTime(model.getDeadTime()); - apiUser.setManager(model.getManager()); - apiUser.setIsMonitor(model.getIsMonitor()); - this.apiUserService.save(apiUser); - if(model.getEvaluateRate() != null && model.getEvaluateRate() != 0){ - ApiUserCfg apiUserCfg = new ApiUserCfg(); - apiUserCfg.setUserId(apiUser.getId()); - apiUserCfg.setCfgValue(model.getEvaluateRate()); - this.apiUserCfgService.save(apiUserCfg, ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE); - } - model.setMsg("新建成功!"); - } catch (Exception e) { - e.printStackTrace(); - model.setMsg("新建失败!"); - } - model.redirect("/apiUser/add?msg=" + URLEncoder.encode(model.getMsg(), "UTF-8")); - return model; - } + apiUser.setStatus(0); + apiUser.setIsTest(model.getIsTest()); + apiUser.setPurpose(model.getPurpose()); + apiUser.setIp(model.getIp()); + apiUser.setEmail(model.getEmail()); + apiUser.setModificationDate(date); + apiUser.setDeadTime(model.getDeadTime()); + apiUser.setManager(model.getManager()); + apiUser.setIsMonitor(model.getIsMonitor()); + this.apiUserService.save(apiUser); + // 新增用户,默认挂牌价改为默认评估价 + model.setPriceType("evaluate"); + modifyUserCfg(id, ApiUserCfg.ApiUserCfgKey.PRICE_TYPE, model.getPriceType()); + if (model.getEvaluateRate() != null && model.getEvaluateRate() != 0) { + ApiUserCfg apiUserCfg = new ApiUserCfg(); + apiUserCfg.setUserId(apiUser.getId()); + apiUserCfg.setCfgValue(model.getEvaluateRate()); + this.apiUserCfgService.save(apiUserCfg, ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE); + } + model.setMsg("新建成功!"); + } catch (Exception e) { + e.printStackTrace(); + model.setMsg("新建失败!"); + } + model.redirect("/apiUser/add?msg=" + URLEncoder.encode(model.getMsg(), "UTF-8")); + return model; + } - /** - * 编辑api用户信息 - * - * @param model - * @return - */ - public Object editAction(ApiUserModel model) { - ApiUser apiUser = this.apiUserService.findApiUserById(model.getUserId()); - User user = this.userService.findById(model.getUserId()); - ApiUserBo bo = new ApiUserBo(); - bo.setUserName(user.getUserName()); - bo.setAppKey(apiUser.getAppKey()); - bo.setUserId(user.getId()); - bo.setSiteName(user.getUserName()); - bo.setDisplayName(user.getDisplayName()); - bo.setIsTest(apiUser.getIsTest()); - bo.setPurpose(apiUser.getPurpose()); - bo.setSiteName(apiUser.getSiteName()); - bo.setIp(apiUser.getIp()); + /** + * 编辑api用户信息 + * + * @param model + * @return + */ + public Object editAction(ApiUserModel model) { + ApiUser apiUser = this.apiUserService.findApiUserById(model.getUserId()); + User user = this.userService.findById(model.getUserId()); + ApiUserBo bo = new ApiUserBo(); + bo.setUserName(user.getUserName()); + bo.setAppKey(apiUser.getAppKey()); + bo.setUserId(user.getId()); + bo.setSiteName(user.getUserName()); + bo.setDisplayName(user.getDisplayName()); + bo.setIsTest(apiUser.getIsTest()); + bo.setPurpose(apiUser.getPurpose()); + bo.setSiteName(apiUser.getSiteName()); + bo.setIp(apiUser.getIp()); bo.setCompany(apiUser.getCompany()); - bo.setEmail(apiUser.getEmail()); - bo.setDeadTime(apiUser.getDeadTime()); - bo.setManager(apiUser.getManager()); - bo.setIsMonitor(apiUser.getIsMonitor()); - ApiUserCfg apiUserCfg_rate = apiUserCfgService.findByUserId(apiUser.getId(), ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE); - if(apiUserCfg_rate != null){ - bo.setEvaluateRate((Double) apiUserCfg_rate.getCfgValue()); - } + bo.setEmail(apiUser.getEmail()); + bo.setDeadTime(apiUser.getDeadTime()); + bo.setManager(apiUser.getManager()); + bo.setIsMonitor(apiUser.getIsMonitor()); + ApiUserCfg apiUserCfg_rate = apiUserCfgService.findByUserId(apiUser.getId(), ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE); + if (apiUserCfg_rate != null) { + bo.setEvaluateRate((Double) apiUserCfg_rate.getCfgValue()); + } - ApiUserCfg apiUserCfg_pt = apiUserCfgService.findByUserId(apiUser.getId(), ApiUserCfg.ApiUserCfgKey.PRICE_TYPE); - if(apiUserCfg_pt != null && apiUserCfg_pt.getCfgValue() != null){ - bo.setPriceType(apiUserCfg_pt.getCfgValue().toString()); - } + ApiUserCfg apiUserCfg_pt = apiUserCfgService.findByUserId(apiUser.getId(), ApiUserCfg.ApiUserCfgKey.PRICE_TYPE); + if (apiUserCfg_pt != null && apiUserCfg_pt.getCfgValue() != null) { + bo.setPriceType(apiUserCfg_pt.getCfgValue().toString()); + } - model.setApiUserBo(bo); - if (StringUtils.isNotBlank(model.getMsg()) && model.getMsg().equals("success")) { - model.setMsg("更新成功!"); - } - return model; - } + model.setApiUserBo(bo); + if (StringUtils.isNotBlank(model.getMsg()) && model.getMsg().equals("success")) { + model.setMsg("更新成功!"); + } + return model; + } - /** - * 修改用户登录状态 - * - * @param model - * @return - */ - public Object statusAction(ApiUserModel model) { - ApiUser apiUser = this.apiUserService.findApiUserById(model.getUserId()); - apiUser.setStatus(model.getStatus()); - apiUserService.update(apiUser); - model.setViewType("redirect"); - apiUserAuthorityService.clearApiUserAuthorityCache(apiUser.getId()); - model.setViewParam("location", "/apiUser/list"); - return model; - } + /** + * 修改用户登录状态 + * + * @param model + * @return + */ + public Object statusAction(ApiUserModel model) { + ApiUser apiUser = this.apiUserService.findApiUserById(model.getUserId()); + apiUser.setStatus(model.getStatus()); + apiUserService.update(apiUser); + model.setViewType("redirect"); + apiUserAuthorityService.clearApiUserAuthorityCache(apiUser.getId()); + model.setViewParam("location", "/apiUser/list"); + return model; + } - /** - * 手动修改api用户appkey值 - * - * @param model - * @return - */ - public Object updateAction(ApiUserModel model) { - Long userId = model.getUserId(); - Map dataApiUser = new HashMap(); - dataApiUser.put("email", model.getEmail()); - dataApiUser.put("siteName", model.getSiteName()); - dataApiUser.put("ip", model.getIp()); + /** + * 手动修改api用户appkey值 + * + * @param model + * @return + */ + public Object updateAction(ApiUserModel model) { + Long userId = model.getUserId(); + Map dataApiUser = new HashMap(); +// Map user = new HashMap(); + dataApiUser.put("email", model.getEmail()); +// user.put("password", DigestUtils.md5Hex(model.getPassword())); + dataApiUser.put("siteName", model.getSiteName()); + dataApiUser.put("ip", model.getIp()); dataApiUser.put("company", model.getCompany()); - dataApiUser.put("isTest", model.getIsTest()); - dataApiUser.put("purpose", model.getPurpose()); - dataApiUser.put("deadTime", model.getDeadTime()); - dataApiUser.put("manager", model.getManager()); - dataApiUser.put("isMonitor", model.getIsMonitor()); - this.apiUserService.update(dataApiUser, userId); + dataApiUser.put("isTest", model.getIsTest()); + dataApiUser.put("purpose", model.getPurpose()); + dataApiUser.put("deadTime", model.getDeadTime()); + dataApiUser.put("manager", model.getManager()); + dataApiUser.put("isMonitor", model.getIsMonitor()); + this.apiUserService.update(dataApiUser, userId); + // 更改用户密码 +// this.userService.updateById(user,userId); + // 刷新缓存 +// this.apiUserService.clearApiUserAuthorityCache(userId); - //ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE - modifyUserCfg(userId, ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE, model.getEvaluateRate()); - modifyUserCfg(userId, ApiUserCfg.ApiUserCfgKey.PRICE_TYPE, model.getPriceType()); - model.setViewType("redirect"); - //model.setViewParam("location", "/apiUser/edit?msg=sucess&userId=" + model.getUserId()); - model.setViewParam("location", "/apiUser/list"); - return model; - } + //ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE + modifyUserCfg(userId, ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE, model.getEvaluateRate()); + modifyUserCfg(userId, ApiUserCfg.ApiUserCfgKey.PRICE_TYPE, model.getPriceType()); - void modifyUserCfg(Long userId, ApiUserCfg.ApiUserCfgKey cfgKey, Object val) { - if(userId != null && cfgKey != null){ - ApiUserCfg apiUserCfg = this.apiUserCfgService.findByUserId(userId, cfgKey); - if(val == null || StringUtils.isEmpty(val.toString())) { - if(null != apiUserCfg){ - apiUserCfgService.delete(apiUserCfg, cfgKey); - } - return; - } + model.setViewType("redirect"); + //model.setViewParam("location", "/apiUser/edit?msg=sucess&userId=" + model.getUserId()); + model.setViewParam("location", "/apiUser/list"); + return model; + } - if(cfgKey == ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE) { - try{ - double rate = Double.parseDouble(val.toString()); - if(Double.compare(rate, 0) == 0){ - if(null != apiUserCfg){ - apiUserCfgService.delete(apiUserCfg, cfgKey); - return; - } - } - }catch(Exception e){ - e.printStackTrace(); - } - } + public Object doEditPwdAction(ApiUserModel model) { + Long userId = model.getUserId(); + Map user = new HashMap(); + user.put("password", DigestUtils.md5Hex(model.getPassword())); +// +// // 更改用户密码 + this.userService.updateById(user,userId); + // 刷新缓存 + this.apiUserService.clearApiUserAuthorityCache(userId); - if(null == apiUserCfg){ - apiUserCfg = new ApiUserCfg(); - } - apiUserCfg.setUserId(userId); - apiUserCfg.setCreatedDate(new Date()); - apiUserCfg.setCfgValue(val); - apiUserCfgService.save(apiUserCfg, cfgKey); - } - } + model.setViewType("redirect"); + model.setViewParam("location", "/apiUser/edit?userId="+userId); + return model; + } + public Object editPwdAction(ApiUserModel model) { + Long userId = model.getUserId(); + User user = this.userService.findById(userId); + ApiUserBo bo = new ApiUserBo(); + bo.setUserName(user.getUserName()); + bo.setDisplayName(user.getDisplayName()); + model.setApiUserBo(bo); + return model; + } - /** - * 重置appkey值,默认为userid md5加上useridmd5再md5, 64位 - * - * @param model - * @return - */ - public Object resetAction(ApiUserModel model) { - String appkey = DigestUtils.md5Hex(String.valueOf(model.getUserId())) - + DigestUtils.md5Hex(DigestUtils.md5Hex(String.valueOf(model.getUserId()))); + void modifyUserCfg(Long userId, ApiUserCfg.ApiUserCfgKey cfgKey, Object val) { + if (userId != null && cfgKey != null) { + ApiUserCfg apiUserCfg = this.apiUserCfgService.findByUserId(userId, cfgKey); + if (val == null || StringUtils.isEmpty(val.toString())) { + if (null != apiUserCfg) { + apiUserCfgService.delete(apiUserCfg, cfgKey); + } + return; + } - Map data = new HashMap(); - data.put("appKey", appkey.toUpperCase()); - this.apiUserService.update(data, model.getUserId()); - model.setViewType("redirect"); - model.setViewParam("location", "/apiUser/edit?userId=" + model.getUserId()); - return model; - } + if (cfgKey == ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE) { + try { + double rate = Double.parseDouble(val.toString()); + if (Double.compare(rate, 0) == 0) { + if (null != apiUserCfg) { + apiUserCfgService.delete(apiUserCfg, cfgKey); + return; + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } - public Object checkUserNameAction(ApiUserModel model) { - model.setViewType("json"); - model.setViewParam("config", null); - User user = userService.findByUserName(model.getUserName()); - if (user != null) { - model.setMsg("此用户名已经存在!"); - return model; - } - return model; - } + if (null == apiUserCfg) { + apiUserCfg = new ApiUserCfg(); + } + apiUserCfg.setUserId(userId); + apiUserCfg.setCreatedDate(new Date()); + apiUserCfg.setCfgValue(val); + apiUserCfgService.save(apiUserCfg, cfgKey); + } + } - public Object loadConfigAction(@Param(name="uri") String uri, @Param(name="userId") long userId){ - JsonModel json = new JsonModel(); - ApiJsonViewConfig config = apiUserAuthorityService.findViewConfig(userId, uri); - json.setJsonModel(config); - return json; - } + /** + * 重置appkey值,默认为userid md5加上useridmd5再md5, 64位 + * + * @param model + * @return + */ + public Object resetAction(ApiUserModel model) { + String appkey = DigestUtils.md5Hex(String.valueOf(model.getUserId())) + + DigestUtils.md5Hex(DigestUtils.md5Hex(String.valueOf(model.getUserId()))); - public Object saveConfigAction(ApiJsonViewConfig config,@Param(name="fields") String fields){ - if(StringUtils.isNotBlank(fields)){ - List availableFields = new ArrayList(); - for(String field : fields.split("\r\n")){ - field = DataUtil.trim(field); - if(StringUtils.isNotBlank(field)){ - availableFields.add(field); - } - } - config.setFields(availableFields); - } - apiUserAuthorityService.saveViewConfig(config); - return new JsonModel(); - } + Map data = new HashMap(); + data.put("appKey", appkey.toUpperCase()); + this.apiUserService.update(data, model.getUserId()); + model.setViewType("redirect"); + model.setViewParam("location", "/apiUser/edit?userId=" + model.getUserId()); + return model; + } - public Object cityAction(ApiUserModel model) throws IllegalAccessException { - ApiUser apiUser = this.apiUserService.findApiUserById(model.getUserId()); - User user = this.userService.findById(apiUser.getId()); - ApiUserAuthority apiUserAuthority=apiUserAuthorityService.findByUserId(model.getUserId()); - Map cityCreditMap=apiUserAuthority.getCityCreditMap(); - model.setDisplayName(user.getDisplayName() == null ? "" : user.getDisplayName()); - model.setCityFirstLetters(Arrays.asList(getCityFirstLetter())); - List serverAreaList = serverAreaService.findAll();// Load城市列表 - if (StringUtils.isBlank(model.getType()) || "all".equals(model.getType())) {// 字母分组列表 - model.setServerAreaList(null); - } else { // 首字母查询 - List> serverAreaLetterList = new ArrayList>();// Load城市列表 - for (ServerArea serverArea : serverAreaList) { - if (serverArea.getSpell().substring(0, 1).toUpperCase().equals(model.getType())) { - 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); - } + public Object checkUserNameAction(ApiUserModel model) { + model.setViewType("json"); + model.setViewParam("config", null); + User user = userService.findByUserName(model.getUserName()); + if (user != null) { + model.setMsg("此用户名已经存在!"); + return model; + } + return model; + } - StringBuffer openCitys = new StringBuffer();// Load城市列表 - if (StringUtils.isBlank(apiUser.getCity())) { - } else if ("all".equals(apiUser.getCity())) { - openCitys.append("全部城市"); - } else { - int cnt = 0; - if(StringUtils.isNotBlank(apiUser.getCity()) && !apiUser.getCity().endsWith(",")){ - apiUser.setCity(apiUser.getCity() + ","); - } - for (ServerArea serverArea : serverAreaList) { - if (apiUser.getCity().indexOf(serverArea.getSpell() + ",") > -1) { - cnt++; - if (cnt == 1) { - openCitys.append(serverArea.getDisplay()); - } else { - openCitys.append(","); - openCitys.append(serverArea.getDisplay()); - } - } - } - openCitys.append(";
共" + cnt + "个城市"); - } - model.setOpenCitys(openCitys.toString()); - model.setCitys(apiUser.getCity()); - return model; - } + public Object loadConfigAction(@Param(name = "uri") String uri, @Param(name = "userId") long userId) { + JsonModel json = new JsonModel(); + ApiJsonViewConfig config = apiUserAuthorityService.findViewConfig(userId, uri); + json.setJsonModel(config); + return json; + } - public Object citySaveAction(ApiUserModel model) throws IllegalAccessException { - model.setViewType("json"); - model.setViewParam("config", null); - List serverAreaList = serverAreaService.findAll(); - ApiUser apiUser = this.apiUserService.findApiUserById(model.getUserId()); - ApiUserAuthority apiUserAuthority=apiUserAuthorityService.findByUserId(model.getUserId()); - Map cityCreditMap=apiUserAuthority.getCityCreditMap(); - if(null==cityCreditMap){ - cityCreditMap=new HashMap(); - } - if (model.getCitys().equals("all")) { - apiUser.setCity("all"); - apiUser.setCreationDate(apiUser.getCreationDate() == null ? new Date() : apiUser.getCreationDate()); - this.apiUserService.update(apiUser); - } else if (model.getCitys().equals("disAll")) { - apiUser.setCity(null); - apiUser.setCreationDate(apiUser.getCreationDate() == null ? new Date() : apiUser.getCreationDate()); - this.apiUserService.update(apiUser); - } else { - String _check_citys = model.getCitys() == null ? "" : model.getCitys(); - String _un_check_citys = model.getUnCheckCitys() == null ? "" : model.getUnCheckCitys(); - String displayNames= model.getDisplayName() == null ? "" : model.getDisplayName(); - String credits=model.getCredits() == null ? "" : model.getCredits(); - String uncitys=model.getUncitys() == null ? "" : model.getUncitys(); - String[] uncity = StringUtils.split(uncitys,"|"); - for(int i=0;i availableFields = new ArrayList(); + for (String field : fields.split("\r\n")) { + field = DataUtil.trim(field); + if (StringUtils.isNotBlank(field)) { + availableFields.add(field); + } + } + config.setFields(availableFields); + } + apiUserAuthorityService.saveViewConfig(config); + return new JsonModel(); + } - String[] newCitys = StringUtils.split(_check_citys, ","); - for (String city : newCitys) { - if (citys.indexOf("," + city + ",") == -1) { - citys = citys + city + ","; - } - } - String[] delCitys = StringUtils.split(_un_check_citys, ","); - for (String city : delCitys) { - if (citys.indexOf("," + city + ",") > -1) { - citys = citys.replace(city + ",", ""); - } - } - citys = citys.replaceAll("^,","").replaceAll(",$",""); - apiUser.setCity(citys); - } - apiUser.setCreationDate(apiUser.getCreationDate() == null ? new Date() : apiUser.getCreationDate()); - this.apiUserService.update(apiUser); - - apiUserAuthorityService.update(apiUserAuthority); - } - return model; - } + public Object cityAction(ApiUserModel model) throws IllegalAccessException { + ApiUser apiUser = this.apiUserService.findApiUserById(model.getUserId()); + User user = this.userService.findById(apiUser.getId()); + ApiUserAuthority apiUserAuthority = apiUserAuthorityService.findByUserId(model.getUserId()); + Map cityCreditMap = apiUserAuthority.getCityCreditMap(); + model.setDisplayName(user.getDisplayName() == null ? "" : user.getDisplayName()); + model.setCityFirstLetters(Arrays.asList(getCityFirstLetter())); + List serverAreaList = serverAreaService.findAll();// Load城市列表 + if (StringUtils.isBlank(model.getType()) || "all".equals(model.getType())) {// 字母分组列表 + model.setServerAreaList(null); + } else { // 首字母查询 + List> serverAreaLetterList = new ArrayList>();// Load城市列表 + for (ServerArea serverArea : serverAreaList) { + if (serverArea.getSpell().substring(0, 1).toUpperCase().equals(model.getType())) { + 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); + } - /** - * 所有api用户的信息展示 - * - * @param model - * @return - */ - public Object authAction(ApiUserModel model) throws IllegalAccessException { - /** - * OpenResource open中公开出的接口资源 User 本地user ApiUserAuthority 用户的权限信息 - * - * @param ApiUser - * :用户的资料信息 - * @param AuthorityBo - * :用户的appKey username、等资料 - */ - List openResourceList = openResourceService.findAll(); - List authorityBoList = new ArrayList(); - ApiUserAuthority authority = apiUserAuthorityService.findByUserId(model.getUserId()); - if(authority == null){ - authority = new ApiUserAuthority(); - authority.setOpenResourseUris(new ArrayList()); - apiUserAuthorityService.save(authority); - } - User user = this.userService.findById(model.getUserId()); - model.setDisplayName(user.getDisplayName() == null ? "" : user.getDisplayName()); - Map urisMap = authority.getOpenResourseUrisMap(); - for (OpenResource openResource : openResourceList) { - AuthorityBo bo = new AuthorityBo(); - BeanUtils.copyProperties(openResource, bo); - if (authority != null) { - bo.setHasAuth(authority.getOpenResourseUris().contains(bo.getUri())); - model.setSupportLatLng(authority.isSupportLatLng()); - bo.setLimitCountMap(authority.getLimitCountMap()); - bo.setTotalCountMap(authority.getTotalCountMap()); - bo.setIsCheckCount(urisMap==null?0:(urisMap.get(bo.getUri())==null?0:urisMap.get(bo.getUri()))); - } - //apiVisitCountService.findApiVisitAllCount(user.getUserId(), null); - if(bo.isHasAuth()){ - long curVistedCount = apiVisitCountService.findApiVisitCountByDay(model.getUserId(), openResource.getUri(), DateUtil.truncateDay(new Date())); - long total = apiVisitCountService.findApiVisitAllCount(model.getUserId(), openResource.getUri(), DateUtil.truncateDay(new Date())); - bo.setCurVisitedCount(curVistedCount); - bo.setTotalVisitedCount(total); - } - - authorityBoList.add(bo); - } - model.setAuthority(authority); - model.setAuthorityBoList(authorityBoList); - return model; - } + StringBuffer openCitys = new StringBuffer();// Load城市列表 + if (StringUtils.isBlank(apiUser.getCity())) { + } else if ("all".equals(apiUser.getCity())) { + openCitys.append("全部城市"); + } else { + int cnt = 0; + if (StringUtils.isNotBlank(apiUser.getCity()) && !apiUser.getCity().endsWith(",")) { + apiUser.setCity(apiUser.getCity() + ","); + } + for (ServerArea serverArea : serverAreaList) { + if (apiUser.getCity().indexOf(serverArea.getSpell() + ",") > -1) { + cnt++; + if (cnt == 1) { + openCitys.append(serverArea.getDisplay()); + } else { + openCitys.append(","); + openCitys.append(serverArea.getDisplay()); + } + } + } + openCitys.append(";
共" + cnt + "个城市"); + } + model.setOpenCitys(openCitys.toString()); + model.setCitys(apiUser.getCity()); + return model; + } - public Object openuriAction(ApiUserModel model){ - List authorityBoList = new ArrayList(); - List openResourceList = openResourceService.findAll(); - String userId=model.getUserId().toString(); - for(OpenResource openResource:openResourceList){ - String uri=openResource.getUri(); - AuthorityBo bo = new AuthorityBo(); - BeanUtils.copyProperties(openResource, bo); - OpenResourceCount open= openResourceCountService.findByUserId(userId, uri); - Long count=0L; - if(open!=null && open.getCount()!=null){ - count=open.getCount(); - } - bo.setCount(count); - authorityBoList.add(bo); - } - Collections.sort(authorityBoList, new Comparator() { + public Object citySaveAction(ApiUserModel model) throws IllegalAccessException { + model.setViewType("json"); + model.setViewParam("config", null); + List serverAreaList = serverAreaService.findAll(); + ApiUser apiUser = this.apiUserService.findApiUserById(model.getUserId()); + ApiUserAuthority apiUserAuthority = apiUserAuthorityService.findByUserId(model.getUserId()); + Map cityCreditMap = apiUserAuthority.getCityCreditMap(); + if (null == cityCreditMap) { + cityCreditMap = new HashMap(); + } + if (model.getCitys().equals("all")) { + apiUser.setCity("all"); + apiUser.setCreationDate(apiUser.getCreationDate() == null ? new Date() : apiUser.getCreationDate()); + this.apiUserService.update(apiUser); + } else if (model.getCitys().equals("disAll")) { + apiUser.setCity(null); + apiUser.setCreationDate(apiUser.getCreationDate() == null ? new Date() : apiUser.getCreationDate()); + this.apiUserService.update(apiUser); + } else { + String _check_citys = model.getCitys() == null ? "" : model.getCitys(); + String _un_check_citys = model.getUnCheckCitys() == null ? "" : model.getUnCheckCitys(); + String displayNames = model.getDisplayName() == null ? "" : model.getDisplayName(); + String credits = model.getCredits() == null ? "" : model.getCredits(); + String uncitys = model.getUncitys() == null ? "" : model.getUncitys(); + String[] uncity = StringUtils.split(uncitys, "|"); + for (int i = 0; i < uncity.length; i++) { + if (cityCreditMap.containsKey(uncity[i])) { + cityCreditMap.remove(uncity[i]); + } + } + if (StringUtils.isNotBlank(displayNames)) { + String[] display = StringUtils.split(displayNames, "|"); + String[] cre = StringUtils.split(credits, "|"); + for (int k = 0; k < display.length; k++) { + if (cre[k].equals("null")) { + cityCreditMap.remove(display[k]); + } else { + cityCreditMap.put(display[k], Double.parseDouble(cre[k])); + } + } + } + apiUserAuthority.setCityCreditMap(cityCreditMap); + + if (StringUtils.isBlank(apiUser.getCity())) { + apiUser.setCity(model.getCitys()); + } else if (apiUser.getCity().equals("all")) { + StringBuffer citys = new StringBuffer(); + int _all = 0; + for (ServerArea serverArea : serverAreaList) { + if (_un_check_citys.indexOf(serverArea.getSpell()) == -1) { + _all++; + if (_all == 1) { + citys.append(serverArea.getSpell()); + } else { + citys.append(","); + citys.append(serverArea.getSpell()); + } + } + } + apiUser.setCity(citys.toString()); + } else { + String citys = apiUser.getCity(); + if (StringUtils.isBlank(citys)) { + citys = ","; + } else { + if (!citys.endsWith(",")) { + citys += ","; + } + if (!citys.startsWith(",")) { + citys = "," + citys; + } + } + + String[] newCitys = StringUtils.split(_check_citys, ","); + for (String city : newCitys) { + if (citys.indexOf("," + city + ",") == -1) { + citys = citys + city + ","; + } + } + String[] delCitys = StringUtils.split(_un_check_citys, ","); + for (String city : delCitys) { + if (citys.indexOf("," + city + ",") > -1) { + citys = citys.replace(city + ",", ""); + } + } + citys = citys.replaceAll("^,", "").replaceAll(",$", ""); + apiUser.setCity(citys); + } + apiUser.setCreationDate(apiUser.getCreationDate() == null ? new Date() : apiUser.getCreationDate()); + this.apiUserService.update(apiUser); + + apiUserAuthorityService.update(apiUserAuthority); + } + return model; + } + + /** + * 所有api用户的信息展示 + * + * @param model + * @return + */ + public Object authAction(ApiUserModel model) throws IllegalAccessException { + /** + * OpenResource open中公开出的接口资源 User 本地user ApiUserAuthority 用户的权限信息 + * + * @param ApiUser + * :用户的资料信息 + * @param AuthorityBo + * :用户的appKey username、等资料 + */ + List openResourceList = openResourceService.findAll(); + List authorityBoList = new ArrayList(); + ApiUserAuthority authority = apiUserAuthorityService.findByUserId(model.getUserId()); + if (authority == null) { + authority = new ApiUserAuthority(); + authority.setOpenResourseUris(new ArrayList()); + apiUserAuthorityService.save(authority); + } + User user = this.userService.findById(model.getUserId()); + model.setDisplayName(user.getDisplayName() == null ? "" : user.getDisplayName()); + Map urisMap = authority.getOpenResourseUrisMap(); + + // 用户有的uri + String flag = model.getMsg(); + List userResources = new ArrayList(); + + if ("0".equals(flag)) { + for (OpenResource openResource : openResourceList) { + if (!authority.getOpenResourseUris().contains(openResource.getUri())) { + userResources.add(openResource); + } + } + } else { + for (OpenResource openResource : openResourceList) { + if (authority.getOpenResourseUris().contains(openResource.getUri())) { + userResources.add(openResource); + } + } + } + + // 改成遍历用户有的uri + for (OpenResource openResource : userResources) { + AuthorityBo bo = new AuthorityBo(); + BeanUtils.copyProperties(openResource, bo); + if (authority != null) { + bo.setHasAuth(authority.getOpenResourseUris().contains(bo.getUri())); + bo.setHasAuth(authority.getOpenResourseUris().contains(bo.getUri())); + model.setSupportLatLng(authority.isSupportLatLng()); + bo.setLimitCountMap(authority.getLimitCountMap()); + bo.setTotalCountMap(authority.getTotalCountMap()); + bo.setIsCheckCount(urisMap == null ? 0 : (urisMap.get(bo.getUri()) == null ? 0 : urisMap.get(bo.getUri()))); + } + //apiVisitCountService.findApiVisitAllCount(user.getUserId(), null); + if (bo.isHasAuth()) { + long curVistedCount = apiVisitCountService.findApiVisitCountByDay(model.getUserId(), openResource.getUri(), DateUtil.truncateDay(new Date())); + long total = apiVisitCountService.findApiVisitAllCount(model.getUserId(), openResource.getUri(), DateUtil.truncateDay(new Date())); + bo.setCurVisitedCount(curVistedCount); + bo.setTotalVisitedCount(total); + } + + authorityBoList.add(bo); + } + model.setAuthority(authority); + model.setAuthorityBoList(authorityBoList); + return model; + } + + public Object openuriAction(ApiUserModel model) { + List authorityBoList = new ArrayList(); + List openResourceList = openResourceService.findAll(); + String userId = model.getUserId().toString(); + for (OpenResource openResource : openResourceList) { + String uri = openResource.getUri(); + AuthorityBo bo = new AuthorityBo(); + BeanUtils.copyProperties(openResource, bo); + OpenResourceCount open = openResourceCountService.findByUserId(userId, uri); + Long count = 0L; + if (open != null && open.getCount() != null) { + count = open.getCount(); + } + bo.setCount(count); + authorityBoList.add(bo); + } + Collections.sort(authorityBoList, new Comparator() { @Override public int compare(AuthorityBo o1, AuthorityBo o2) { if (o1.getCount() > o2.getCount()) { @@ -605,9 +659,9 @@ public class ApiUserController { } }); - model.setAuthorityBoList(authorityBoList); - return model; - } + model.setAuthorityBoList(authorityBoList); + return model; + } public Object saveAuthAction(ApiUserModel model, HttpServletRequest request) throws IllegalAccessException { @@ -640,13 +694,13 @@ public class ApiUserController { totalCountMap.put(model.getUri(), model.getSum()); authority.setTotalCountMap(totalCountMap); } - if(model.getIsCheckCount() !=null) { - Map urisMap = authority.getOpenResourseUrisMap(); - if(urisMap==null) { - urisMap = new HashMap(); - } - urisMap.put(model.getUri(), model.getIsCheckCount()); - authority.setOpenResourseUrisMap(urisMap); + if (model.getIsCheckCount() != null) { + Map urisMap = authority.getOpenResourseUrisMap(); + if (urisMap == null) { + urisMap = new HashMap(); + } + urisMap.put(model.getUri(), model.getIsCheckCount()); + authority.setOpenResourseUrisMap(urisMap); } if (model.isHasAuth() && !authority.getOpenResourseUris().contains(model.getUri())) { authority.getOpenResourseUris().add(model.getUri()); @@ -675,17 +729,17 @@ public class ApiUserController { List openResourceList = openResourceService.findAll(); boolean save = false; - if (authority == null) { + if (authority == null) { save = true; authority = new ApiUserAuthority(); } authority.setUserId(userId); authority.setSupportLatLng(model.isSupportLatLng()); - Map limit = string2map(model.getLimitCountMap()); - Map total = string2map(model.getTotalCountMap()); - Map uriMap = string2map(model.getOpenResourseUrisMap()); - authority.setLimitCountMap(limit); - authority.setTotalCountMap(total); + Map limit = string2map(model.getLimitCountMap()); + Map total = string2map(model.getTotalCountMap()); + Map uriMap = string2map(model.getOpenResourseUrisMap()); + authority.setLimitCountMap(limit); + authority.setTotalCountMap(total); List uris = new ArrayList(); for (OpenResource openResource : openResourceList) { if (model.getUri().indexOf(openResource.getUri()) > -1) { @@ -693,13 +747,13 @@ public class ApiUserController { } } authority.setOpenResourseUris(uris); - Map openResourseUrisMap = authority.getOpenResourseUrisMap(); - if(null!=uriMap&&!uriMap.isEmpty()) { - for(String url : uriMap.keySet()) { - openResourseUrisMap.put(url, uriMap.get(url)); + Map openResourseUrisMap = authority.getOpenResourseUrisMap(); + if (null != uriMap && !uriMap.isEmpty()) { + for (String url : uriMap.keySet()) { + openResourseUrisMap.put(url, uriMap.get(url)); } } - + if (save) { apiUserAuthorityService.update(authority); } else { @@ -708,1002 +762,1002 @@ public class ApiUserController { return model; } - public Object clickStatAction(ApiUserModel model) { - return model; - } - - public Object pandectAction(ApiUserModel model) throws Throwable{ - Date startDate = null; - Date endDate = null; - - if(model.getWay()==null){ - model.setWay(0); - } - if(StringUtils.isNotBlank(model.getQuery())){ - - startDate = DateUtil.add(DateUtil.formatToYYYYMMDD(new Date()), Integer.parseInt(model.getQuery())); - endDate = DateUtil.parseStringToDate(DateUtil.formatToYYYYMMDD(new Date())); - } - - if(StringUtils.isNotBlank(model.getBegDate())){ - startDate = DateUtil.parseStringToDate(model.getBegDate()); - } - if(StringUtils.isNotBlank(model.getEndDate())){ - endDate = DateUtil.parseStringToDate(model.getEndDate()); - } - - - if(startDate == null && endDate==null){ - startDate = DateUtil.add(DateUtil.formatToYYYYMMDD(new Date()), -8); - endDate = DateUtil.parseStringToDate(DateUtil.formatToYYYYMMDD(new Date())); - model.setQuery("-8"); - } - - - List analys = openUriAnalyService.findOpenUriAnalyLogs(model.getUserId(), null, startDate, endDate); - - if(startDate!= null && endDate!=null && startDate!=endDate && !model.getQuery().equals("-1")){ - Map map = new HashMap(); - List list = new ArrayList(); - for(OpenUriAnaly bo : analys){ - Integer count = (Integer) map.get(DateUtil.formatToYYYYMMDD(bo.getStatDate())); - if(count == null){ - if(!list.contains(bo.getStatDate())){ - list.add(bo.getStatDate()); - } - map.put(DateUtil.formatToYYYYMMDD(bo.getStatDate()), bo.getUrlClickCount()); - }else{ - map.put(DateUtil.formatToYYYYMMDD(bo.getStatDate()), count + bo.getUrlClickCount()); - } - - } - - Collections.sort(list); - if(model.getQuery().equals("-14")){ - List> ret = new ArrayList>(); - String d1 = DateUtil.formatToYYYYMMDD(startDate); - List times = null; - String d2 = DateUtil.formatToYYYYMMDD(endDate); - while(!d1.equals(d2)){ - if(ret.size()==0 ||times.size()==7){ - times = new ArrayList(); - ret.add(times); - } - times.add(d1); - d1 = DateUtil.formatToYYYYMMDD(DateUtil.add(DateUtil.parseStringToDate(d1), 1)); - } - List dates = ret.get(0); - List weeks = new ArrayList(); - for(String date : dates){ - String day = DateUtil.getWeekOfDate(date, new SimpleDateFormat("yyyy-MM-dd")); - weeks.add(day); - } - model.setxAxis(toXAxis2(weeks)); - model.setChartSeries(toSeries2(map, ret)); - - }else{ - model.setxAxis(toXAxis(list)); - model.setChartSeries(toSeries(map, list)); - } + public Object clickStatAction(ApiUserModel model) { + return model; + } - }else{ - int totalCount = 0; - for(OpenUriAnaly bo : analys){ - totalCount = totalCount + bo.getUrlClickCount(); - } - model.setTotalCount(totalCount); - } - - return model; - } - - private String toSeries(Map map, List list){ - String s = ""; - for(int i=0;i map, List> dates){ - String s = ""; - for(int k=0; k dateList = dates.get(k); - String temp = ""; - for(int i=0;i bos, List list){ - JSONArray ja = new JSONArray(); - for(Date temp : list){ - String tempStr = DateUtil.formatToYYYYMMDD(temp); - for(StatAnalyBo bo : bos){ - String dateStr = bo.getKey(); - if(dateStr.equals(tempStr)){ - ja.put(bo.getCount()); - break; - } - } - - } - return ja.toString(); - } - - - private String toXAxis(List list){ - String categories = ""; - for(int i=0;i list){ - String categories = ""; - for(int i=0;i cities; - if(StringUtils.isNotBlank(citys)){ - cities = Arrays.asList(StringUtils.split(citys,"|")); - }else{ - cities = new ArrayList(); - } - List analys = openUriAnalyService.findOpenUriAnalyLogs(model.getUserId(), null, startDate, endDate); - List bos = null; - List eachCityBos=null; - if(model.getWay() == null){ - model.setWay(1); - } + if (model.getWay() == null) { + model.setWay(0); + } + if (StringUtils.isNotBlank(model.getQuery())) { - if(model.getWay()==1){ - bos = createAnalyBosByUser(analys); - }else if(model.getWay() == 2){ - bos = createAnalyBosByLink(analys); - }else if(model.getWay() == 3){ - if(cities.size()!=0) { - List apiCountCities = apiCountCityService.findApiCountCity(cities, startDate, endDate); - eachCityBos = getEachCityBos(apiCountCities); - } - bos = createAnalyBosByLink(analys); - } - if(model.getWay()==1){ - long date = DateUtil.parseStringToDate("2016-11-23").getTime(); - if(startDate.getTime()>=date && endDate.getTime()>date){ - List apiInvokeStatisticalList = apiInvokeStatisticalService.findApiInvokeStatisticalList(model.getUserId(), startDate, endDate); - if(bos!=null){ - for (StatAnalyBo boTemp : bos) { - Integer userId = boTemp.getUserId(); - Integer successEffectiveTime=0; - Integer successInvalidTime=0; - Integer defeatTime=0; - for (ApiInvokeStatistical apiInvokeStatistical : apiInvokeStatisticalList) { - if(apiInvokeStatistical.getUserId().equals(userId.toString())){ - successEffectiveTime=successEffectiveTime+apiInvokeStatistical.getSuccessEffectiveTime(); - successInvalidTime=successInvalidTime+apiInvokeStatistical.getSuccessInvalidTime(); - defeatTime=defeatTime+apiInvokeStatistical.getDefeatTime(); - } - } - boTemp.setSuccessEffectiveTime(successEffectiveTime); - boTemp.setSuccessInvalidTime(successInvalidTime); - boTemp.setDefeatTime(defeatTime); - } - } - } - 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){ - total += apiVisitCount.getVisitCount(); - } - boTemp.setBillingCount(total); - } + startDate = DateUtil.add(DateUtil.formatToYYYYMMDD(new Date()), Integer.parseInt(model.getQuery())); + endDate = DateUtil.parseStringToDate(DateUtil.formatToYYYYMMDD(new Date())); + } + + if (StringUtils.isNotBlank(model.getBegDate())) { + startDate = DateUtil.parseStringToDate(model.getBegDate()); + } + if (StringUtils.isNotBlank(model.getEndDate())) { + endDate = DateUtil.parseStringToDate(model.getEndDate()); + } + + + if (startDate == null && endDate == null) { + startDate = DateUtil.add(DateUtil.formatToYYYYMMDD(new Date()), -8); + endDate = DateUtil.parseStringToDate(DateUtil.formatToYYYYMMDD(new Date())); + model.setQuery("-8"); + } + + + List analys = openUriAnalyService.findOpenUriAnalyLogs(model.getUserId(), null, startDate, endDate); + + if (startDate != null && endDate != null && startDate != endDate && !model.getQuery().equals("-1")) { + Map map = new HashMap(); + List list = new ArrayList(); + for (OpenUriAnaly bo : analys) { + Integer count = (Integer) map.get(DateUtil.formatToYYYYMMDD(bo.getStatDate())); + if (count == null) { + if (!list.contains(bo.getStatDate())) { + list.add(bo.getStatDate()); + } + map.put(DateUtil.formatToYYYYMMDD(bo.getStatDate()), bo.getUrlClickCount()); + } else { + map.put(DateUtil.formatToYYYYMMDD(bo.getStatDate()), count + bo.getUrlClickCount()); + } + + } + + Collections.sort(list); + if (model.getQuery().equals("-14")) { + List> ret = new ArrayList>(); + String d1 = DateUtil.formatToYYYYMMDD(startDate); + List times = null; + String d2 = DateUtil.formatToYYYYMMDD(endDate); + while (!d1.equals(d2)) { + if (ret.size() == 0 || times.size() == 7) { + times = new ArrayList(); + ret.add(times); + } + times.add(d1); + d1 = DateUtil.formatToYYYYMMDD(DateUtil.add(DateUtil.parseStringToDate(d1), 1)); + } + List dates = ret.get(0); + List weeks = new ArrayList(); + for (String date : dates) { + String day = DateUtil.getWeekOfDate(date, new SimpleDateFormat("yyyy-MM-dd")); + weeks.add(day); + } + model.setxAxis(toXAxis2(weeks)); + model.setChartSeries(toSeries2(map, ret)); + + } else { + model.setxAxis(toXAxis(list)); + model.setChartSeries(toSeries(map, list)); + } + + } else { + int totalCount = 0; + for (OpenUriAnaly bo : analys) { + totalCount = totalCount + bo.getUrlClickCount(); + } + model.setTotalCount(totalCount); + } + + return model; + } + + private String toSeries(Map map, List list) { + String s = ""; + for (int i = 0; i < list.size(); i++) { + Date date = list.get(i); + int count = (Integer) map.get(DateUtil.formatToYYYYMMDD(date)); + if (i + 1 == list.size()) { + s = s + String.valueOf(count); + } else { + s = s + String.valueOf(count) + ","; + } + } + + return "{name:'访问量',data:[" + s + "]}"; + } + + private String toSeries2(Map map, List> dates) { + String s = ""; + for (int k = 0; k < dates.size(); k++) { + List dateList = dates.get(k); + String temp = ""; + for (int i = 0; i < dateList.size(); i++) { + String date = dateList.get(i); + int count = (Integer) map.get(date); + + if (i + 1 == dateList.size()) { + String name = "上周"; + if (k == 1) { + name = "最近7天"; + } + temp = "{name:'" + name + "',data:[" + temp + String.valueOf(count) + "]}"; + } else { + temp = temp + String.valueOf(count) + ","; + } + } + if (k == 1) { + s = s + "," + temp; + } else { + s = temp; + } + + } + + return s; + } + + private String toSeries(List bos, List list) { + JSONArray ja = new JSONArray(); + for (Date temp : list) { + String tempStr = DateUtil.formatToYYYYMMDD(temp); + for (StatAnalyBo bo : bos) { + String dateStr = bo.getKey(); + if (dateStr.equals(tempStr)) { + ja.put(bo.getCount()); + break; + } + } + + } + return ja.toString(); + } + + + private String toXAxis(List list) { + String categories = ""; + for (int i = 0; i < list.size(); i++) { + Date date = list.get(i); + //ja.put(DateUtil.formatToYYYYMMDD(date)); + if (i + 1 == list.size()) { + categories = categories + "'" + DateUtil.formatToYYYYMMDD(date) + "'"; + } else { + categories = categories + "'" + DateUtil.formatToYYYYMMDD(date) + "',"; + } + } + + return categories; + } + + private String toXAxis2(List list) { + String categories = ""; + for (int i = 0; i < list.size(); i++) { + String value = list.get(i); + //ja.put(DateUtil.formatToYYYYMMDD(date)); + if (i + 1 == list.size()) { + categories = categories + "'" + value + "'"; + } else { + categories = categories + "'" + value + "',"; + } + } + + return categories; + } + + public Object apiVisitStatAction(ApiUserModel model) { + 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()); + } + + } + if (startDate != null) { + model.setBegDate(DateUtil.formatToYYYYMMDD(startDate)); + } + + if (endDate != null) { + model.setEndDate(DateUtil.formatToYYYYMMDD(endDate)); + } + + String citys = model.getCitys(); + List cities; + if (StringUtils.isNotBlank(citys)) { + cities = Arrays.asList(StringUtils.split(citys, "|")); + } else { + cities = new ArrayList(); + } + List analys = openUriAnalyService.findOpenUriAnalyLogs(model.getUserId(), null, startDate, endDate); + List bos = null; + List eachCityBos = null; + if (model.getWay() == null) { + model.setWay(1); + } + + if (model.getWay() == 1) { + bos = createAnalyBosByUser(analys); + } else if (model.getWay() == 2) { + bos = createAnalyBosByLink(analys); + } else if (model.getWay() == 3) { + if (cities.size() != 0) { + List apiCountCities = apiCountCityService.findApiCountCity(cities, startDate, endDate); + eachCityBos = getEachCityBos(apiCountCities); + } + bos = createAnalyBosByLink(analys); + } + if (model.getWay() == 1) { + long date = DateUtil.parseStringToDate("2016-11-23").getTime(); + if (startDate.getTime() >= date && endDate.getTime() > date) { + List apiInvokeStatisticalList = apiInvokeStatisticalService.findApiInvokeStatisticalList(model.getUserId(), startDate, endDate); + if (bos != null) { + for (StatAnalyBo boTemp : bos) { + Integer userId = boTemp.getUserId(); + Integer successEffectiveTime = 0; + Integer successInvalidTime = 0; + Integer defeatTime = 0; + for (ApiInvokeStatistical apiInvokeStatistical : apiInvokeStatisticalList) { + if (apiInvokeStatistical.getUserId().equals(userId.toString())) { + successEffectiveTime = successEffectiveTime + apiInvokeStatistical.getSuccessEffectiveTime(); + successInvalidTime = successInvalidTime + apiInvokeStatistical.getSuccessInvalidTime(); + defeatTime = defeatTime + apiInvokeStatistical.getDefeatTime(); + } + } + boTemp.setSuccessEffectiveTime(successEffectiveTime); + boTemp.setSuccessInvalidTime(successInvalidTime); + boTemp.setDefeatTime(defeatTime); + } + } + } + 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) { + total += apiVisitCount.getVisitCount(); + } + boTemp.setBillingCount(total); + } + + List apiUsers = apiUserService.findApiUserByIds(userIds); + Map idUserMap = new HashMap(); + for (ApiUser apiUser : apiUsers) { + idUserMap.put(apiUser.getId(), apiUser); + } + for (StatAnalyBo boTemp : bos) { + ApiUser apiUser = idUserMap.get(Long.valueOf(boTemp.getUserId())); + if (apiUser != null) { + boTemp.setPurpose(apiUser.getPurpose()); + } + } + } + if (model.getWay() != 3) { + model.setStatAnalyBoList(sortStatAnaly(bos)); + model.setChartSeries(toChartString(bos)); + } else { + model.setChartSeries(toChartString(bos)); + model.setEachCityBoList(eachCityBos); + } + List resources = openResourceService.findOpenResource(null); + model.setResourceMap(converMapData(resources)); + return model; + } + + + public Object userVisitStatAction(ApiUserModel model) { + Date startDate = null; + Date endDate = null; + if (StringUtils.isNotBlank(model.getBegDate())) { + startDate = DateUtil.parseStringToDate(model.getBegDate()); + } + if (StringUtils.isNotBlank(model.getEndDate())) { + endDate = DateUtil.parseStringToDate(model.getEndDate()); + } + + List analys = openUriAnalyService.findOpenUriAnalyLogs(model.getUserId(), model.getUri(), startDate, endDate); + List bos = null; + + if (StringUtils.isBlank(model.getQuery()) && model.getWay() == 2) { + model.setQuery("uri"); + } else if (StringUtils.isBlank(model.getQuery()) && model.getWay() == 1) { + model.setQuery("user"); + } - List apiUsers = apiUserService.findApiUserByIds(userIds); - Map idUserMap = new HashMap(); - for(ApiUser apiUser : apiUsers){ - idUserMap.put(apiUser.getId(), apiUser); - } - for (StatAnalyBo boTemp : bos) { - ApiUser apiUser = idUserMap.get(Long.valueOf(boTemp.getUserId())); - if(apiUser != null){ - boTemp.setPurpose(apiUser.getPurpose()); - } - } - } - if(model.getWay()!=3) { - model.setStatAnalyBoList(sortStatAnaly(bos)); - model.setChartSeries(toChartString(bos)); - } - else { - model.setChartSeries(toChartString(bos)); - model.setEachCityBoList(eachCityBos); - } - List resources = openResourceService.findOpenResource(null); - model.setResourceMap(converMapData(resources)); - return model; - } - - - public Object userVisitStatAction(ApiUserModel model){ - Date startDate = null; - Date endDate = null; - if(StringUtils.isNotBlank(model.getBegDate())){ - startDate = DateUtil.parseStringToDate(model.getBegDate()); - } - if(StringUtils.isNotBlank(model.getEndDate())){ - endDate = DateUtil.parseStringToDate(model.getEndDate()); - } - - List analys = openUriAnalyService.findOpenUriAnalyLogs(model.getUserId(), model.getUri(), startDate, endDate); - List bos = null; - - if(StringUtils.isBlank(model.getQuery())&&model.getWay()==2){ - model.setQuery("uri"); - }else if(StringUtils.isBlank(model.getQuery())&&model.getWay()==1){ - model.setQuery("user"); - } - // if(model.getWay()==1){ // bos = createAnalyBosByUser(analys); // model.setChartSeries(toChartString(bos)); // }else if(model.getWay() == 2){ - if(model.getWay() == 2){ - User user = userService.findById(model.getUserId()); - if(user!=null){ - model.setUserName(user.getDisplayName()); - } - } - - if(model.getQuery().equals("uri")){ - bos = createAnalyBosByLink(analys); - model.setChartSeries(toChartString(bos)); - }if(model.getQuery().equals("day")){ - bos = createAnalyByCity(analys, "day"); - - List list = new ArrayList(); - - for(OpenUriAnaly bo : analys){ - if(!list.contains(bo.getStatDate())){ - list.add(bo.getStatDate()); - } - } - Collections.sort(list); - model.setxAxis(toXAxis(list)); - model.setChartSeries(toSeries(bos, list)); - - }else if(model.getQuery().equals("time")){ - bos = createAnalyByCity(analys, "time"); - model.setChartSeries(toChartString(bos)); - }else if(model.getQuery().equals("user")){ - bos = createAnalyBosByUser(analys); - model.setChartSeries(toChartString(bos)); - } - + if (model.getWay() == 2) { + User user = userService.findById(model.getUserId()); + if (user != null) { + model.setUserName(user.getDisplayName()); + } + } + + if (model.getQuery().equals("uri")) { + bos = createAnalyBosByLink(analys); + model.setChartSeries(toChartString(bos)); + } + if (model.getQuery().equals("day")) { + bos = createAnalyByCity(analys, "day"); + + List list = new ArrayList(); + + for (OpenUriAnaly bo : analys) { + if (!list.contains(bo.getStatDate())) { + list.add(bo.getStatDate()); + } + } + Collections.sort(list); + model.setxAxis(toXAxis(list)); + model.setChartSeries(toSeries(bos, list)); + + } else if (model.getQuery().equals("time")) { + bos = createAnalyByCity(analys, "time"); + model.setChartSeries(toChartString(bos)); + } else if (model.getQuery().equals("user")) { + bos = createAnalyBosByUser(analys); + model.setChartSeries(toChartString(bos)); + } + // } - - long date = DateUtil.parseStringToDate("2016-11-23").getTime(); - if("uri".equals(model.getQuery()) && startDate.getTime()>=date && endDate.getTime()>date){ - List apiInvokeStatisticalList = apiInvokeStatisticalService.findApiInvokeStatisticalList(model.getUserId(), startDate, endDate); - if(bos!=null && apiInvokeStatisticalList.size()>0){ - Map> resultMap = getCountByUri(apiInvokeStatisticalList); - for (StatAnalyBo boTemp : bos) { - 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")); - } - } - } - for (StatAnalyBo boTemp : bos) { - List apiVisitCounts = apiVisitCountService.findAllApiVisitCount(model.getUserId(), boTemp.getKey(), startDate, endDate); - int total = 0; - for(ApiVisitCount apiVisitCount : apiVisitCounts){ - total += apiVisitCount.getVisitCount(); - } - boTemp.setBillingCount(total); - } - - List resources = openResourceService.findOpenResource(null); - model.setResourceMap(converMapData(resources)); - model.setStatAnalyBoList(sortStatAnaly(bos)); - - return model; - } - - public Object detailVisitStatAction(ApiUserModel model){ - Date startDate = null; - Date endDate = null; - if(StringUtils.isNotBlank(model.getBegDate())){ - startDate = DateUtil.parseStringToDate(model.getBegDate()); - } - if(StringUtils.isNotBlank(model.getEndDate())){ - endDate = DateUtil.parseStringToDate(model.getEndDate()); - } - - - List analys = openUriAnalyService.findOpenUriAnalyLogs(model.getUserId(), model.getUri(), startDate, endDate); - if(StringUtils.isBlank(model.getQuery())){ - model.setQuery("city"); - } - - List bos = null; - if(model.getQuery().equals("city")){ - bos = createAnalyByCity(analys, "city"); - }else if(model.getQuery().equals("time")){ - bos = createAnalyByCity(analys, "time"); - } - - model.setStatAnalyBoList(sortStatAnaly(bos)); - model.setChartSeries(toChartString(bos)); - - User user = userService.findById(model.getUserId()); - if(user!=null){ - model.setUserName(user.getDisplayName()); - }else{ - model.setUserName(model.getUserId().toString()); - } - return model; - } - public Object importExcelAction(HttpServletRequest request,ApiUserModel model){ - String citys=request.getParameter("city"); - String begDate=request.getParameter("begDate"); - String enDate=request.getParameter("endDate"); - Date startDate = null; - Date endDate = null; - if(StringUtils.isBlank(begDate) && StringUtils.isBlank(enDate)){ - startDate = DateUtil.add(DateUtil.formatToYYYYMMDD(new Date()), -7); - endDate = DateUtil.parseStringToDate(DateUtil.formatToYYYYMMDD(new Date())); - }else{ - if(StringUtils.isNotBlank(begDate)){ - startDate = DateUtil.parseStringToDate(begDate); - } - if(StringUtils.isNotBlank(enDate)){ - endDate = DateUtil.parseStringToDate(enDate); - } + long date = DateUtil.parseStringToDate("2016-11-23").getTime(); + if ("uri".equals(model.getQuery()) && startDate.getTime() >= date && endDate.getTime() > date) { + List apiInvokeStatisticalList = apiInvokeStatisticalService.findApiInvokeStatisticalList(model.getUserId(), startDate, endDate); + if (bos != null && apiInvokeStatisticalList.size() > 0) { + Map> resultMap = getCountByUri(apiInvokeStatisticalList); + for (StatAnalyBo boTemp : bos) { + 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")); + } + } + } + for (StatAnalyBo boTemp : bos) { + List apiVisitCounts = apiVisitCountService.findAllApiVisitCount(model.getUserId(), boTemp.getKey(), startDate, endDate); + int total = 0; + for (ApiVisitCount apiVisitCount : apiVisitCounts) { + total += apiVisitCount.getVisitCount(); + } + boTemp.setBillingCount(total); + } - } - String Array[]=StringUtils.split(citys,"|"); - List cities=new ArrayList(); - if(Array!=null) { - for (int i = 0; i < Array.length; i++) { - cities.add(Array[i]); - } - } - List apiCountCities =null; - List eachCityBos=null; - if(cities.size()!=0) { - apiCountCities=apiCountCityService.findApiCountCity(cities, startDate, endDate); - eachCityBos = getEachCityBos(apiCountCities); - } + List resources = openResourceService.findOpenResource(null); + model.setResourceMap(converMapData(resources)); + model.setStatAnalyBoList(sortStatAnaly(bos)); - HSSFWorkbook workbook = new HSSFWorkbook(); - HSSFCellStyle cellStyle = workbook.createCellStyle(); - cellStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER); - cellStyle.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER); - HSSFSheet sheet = workbook.createSheet("数据导出"); - HSSFRow row = sheet.createRow(0); - HSSFCell cell0 = row.createCell(0); - HSSFCell cell1 = row.createCell(1); - HSSFCell cell2 = row.createCell(2); - HSSFCell cell3= row.createCell(3); - HSSFCell cell4= row.createCell(4); - HSSFCell cell5= row.createCell(5); - cell0.setCellValue("城市"); - cell1.setCellValue("调用总量"); - cell2.setCellValue("成功调用次数"); - cell3.setCellValue("占比"); - cell4.setCellValue("失败调用次数"); - cell5.setCellValue("占比"); - if(null!=eachCityBos) { - for (int i = 0; i < eachCityBos.size(); i++) { - HSSFRow rows = sheet.createRow(i + 1); - HSSFCell cel0 = rows.createCell(0); - HSSFCell cel1 = rows.createCell(1); - HSSFCell cel2 = rows.createCell(2); - HSSFCell cel3 = rows.createCell(3); - HSSFCell cel4 = rows.createCell(4); - HSSFCell cel5 = rows.createCell(5); - cel0.setCellValue(eachCityBos.get(i).getCity()); - cel1.setCellValue(eachCityBos.get(i).getSumTime()); - cel2.setCellValue(eachCityBos.get(i).getSuccessTime()); - cel3.setCellValue(getFour(eachCityBos.get(i).getSuccessRate()) * 100 + "%"); - cel4.setCellValue(eachCityBos.get(i).getFailTime()); - cel5.setCellValue(getFour(eachCityBos.get(i).getFailRate()) * 100 + "%"); - } - } - HttpServletResponse response = ActionContext.getContext().getResponse(); - response.setCharacterEncoding("UTF-8"); - response.setContentType("application/x-download;charset=UTF-8"); - response.setHeader( "Content-Disposition", "attachment;filename=daochu.xls"); - try { - OutputStream os=response.getOutputStream(); - workbook.write(os); - os.flush(); - } catch (IOException e) { - e.printStackTrace(); - } - return null; - } - - private List sortApiBo(List bos){ - Collections.sort(bos, new Comparator() { - @Override - public int compare(OpenUriAnalyBo o1, OpenUriAnalyBo o2) { - if(o1.getUrlClickCount() > o2.getUrlClickCount()) { - return -1; - }else if(o1.getUrlClickCount() < o2.getUrlClickCount()) { - return 1; - } - return 0; - } - }); - - return bos; - } - private List sortStatAnaly(List bos){ - Collections.sort(bos, new Comparator() { - @Override - public int compare(StatAnalyBo o1, StatAnalyBo o2) { - if(o1.getCount() > o2.getCount()) { - return -1; - }else if(o1.getCount() < o2.getCount()) { - return 1; - } - return 0; - } - }); - - return bos; - } - private Map converMapData(List resources){ - Map map = new HashMap(); - for(OpenResource resource : resources){ - map.put(resource.getUri(), resource.getName()); - } - return map; - } - - - private List createAnalyBosByLink(List analys){ + return model; + } + + public Object detailVisitStatAction(ApiUserModel model) { + Date startDate = null; + Date endDate = null; + if (StringUtils.isNotBlank(model.getBegDate())) { + startDate = DateUtil.parseStringToDate(model.getBegDate()); + } + if (StringUtils.isNotBlank(model.getEndDate())) { + endDate = DateUtil.parseStringToDate(model.getEndDate()); + } - Map ret = new HashMap(); - Map> urlCodeMap = new HashMap>(); - int total = 0; - for(OpenUriAnaly openUriAnaly : analys){ - Integer temp = ret.get(openUriAnaly.getUrl()); - if(temp == null){ - ret.put(openUriAnaly.getUrl(), openUriAnaly.getUrlClickCount()); - }else{ - ret.put(openUriAnaly.getUrl(), temp + openUriAnaly.getUrlClickCount()); - } - Map codeMap = urlCodeMap.get(openUriAnaly.getUrl()); - if(codeMap == null){ - codeMap = new HashMap(); - urlCodeMap.put(openUriAnaly.getUrl(), codeMap); - } - Map analyCodeMap = openUriAnaly.getCodeMap(); - for(String code : analyCodeMap.keySet()){ - Integer count = (Integer) analyCodeMap.get(code); - if("200".equals(code)){ - Integer successCount = codeMap.get("successCount"); - if(successCount == null){ - codeMap.put("successCount", count); - }else{ - codeMap.put("successCount", successCount + count); - } - }else{ - Integer defeatCount = codeMap.get("defeatCount"); - if(defeatCount == null){ - codeMap.put("defeatCount", count); - }else{ - codeMap.put("defeatCount", defeatCount + count); - } - } - } - total = total + openUriAnaly.getUrlClickCount(); - } + List analys = openUriAnalyService.findOpenUriAnalyLogs(model.getUserId(), model.getUri(), startDate, endDate); + if (StringUtils.isBlank(model.getQuery())) { + model.setQuery("city"); + } - List bos = new ArrayList(); - int index = 0; - double totalPercent = 0; - for(String url : ret.keySet()){ - Integer count = ret.get(url); - double percent = 0; - if(index+1==ret.size()){ - percent = 100 - totalPercent; - }else{ - double a1 = count; - double val = a1*10000/(double)total; - percent = DataUtil.roundDouble(val/100, 2); - totalPercent = totalPercent + percent; - } - StatAnalyBo bo = new StatAnalyBo(); - bo.setKey(url); - bo.setCount(count); - bo.setPercent(percent); - Map codeMap = urlCodeMap.get(url); - bo.setSuccessTime(codeMap.get("successCount")); - bo.setDefeatTime(codeMap.get("defeatCount")); - if(codeMap.get("successCount") != null){ - bo.setSuccessRate(DataUtil.roundDouble((codeMap.get("successCount") * 100)/(double)count, 2)); - } - bos.add(bo); + List bos = null; + if (model.getQuery().equals("city")) { + bos = createAnalyByCity(analys, "city"); + } else if (model.getQuery().equals("time")) { + bos = createAnalyByCity(analys, "time"); + } - } - return bos; - } + model.setStatAnalyBoList(sortStatAnaly(bos)); + model.setChartSeries(toChartString(bos)); - private List getEachCityBos(List list){ - List eachCityBos=new ArrayList(); - Map> map=new HashMap>(); - for(ApiCountCity apiCountCity:list){ - if(map.containsKey(apiCountCity.getCity())){ - List list1=new ArrayList(); - List list2=map.get(apiCountCity.getCity()); - list1.add(list2.get(0)+apiCountCity.getSuccess()); - list1.add(list2.get(1)+apiCountCity.getFail()); - map.put(apiCountCity.getCity(),list1); - } - else { - List list1=new ArrayList(); - list1.add(apiCountCity.getSuccess()); - list1.add(apiCountCity.getFail()); - map.put(apiCountCity.getCity(),list1); - } - } - for(Object o:map.keySet()){ - List listm=map.get(o); - String city=o.toString(); - int success=listm.get(0); - int fail=listm.get(1); - int sum=success+fail; - double successTimeRate=getFour((double)success/(double)sum); - double failTimeRate=getFour((double)fail/(double)sum); - EachCityBo eachCityBo=new EachCityBo(); - eachCityBo.setCity(city); - eachCityBo.setSumTime(sum); - eachCityBo.setSuccessTime(success); - eachCityBo.setFailTime(fail); - eachCityBo.setSuccessRate(successTimeRate); - eachCityBo.setFailRate(failTimeRate); - eachCityBos.add(eachCityBo); - } - return eachCityBos; - } + User user = userService.findById(model.getUserId()); + if (user != null) { + model.setUserName(user.getDisplayName()); + } else { + model.setUserName(model.getUserId().toString()); + } + return model; + } - private double getFour(double m){ - BigDecimal b = new BigDecimal(m); - double f1 = b.setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue(); - return f1; - } - - private List createAnalyByCity(List analys, String field){ - Map> ret = new HashMap>(); - int total = 0; - for(OpenUriAnaly openUriAnaly : analys){ - Map resultMap = null; - if(field.equals("day")){ - resultMap = (Map) ret.get(DateUtil.formatToYYYYMMDD(openUriAnaly.getStatDate())); - if(resultMap == null){ - resultMap = new HashMap(); - ret.put(DateUtil.formatToYYYYMMDD(openUriAnaly.getStatDate()), resultMap); - } - Integer count = (Integer) resultMap.get("count"); - if(count == null){ - resultMap.put("count", openUriAnaly.getUrlClickCount()); - }else{ - resultMap.put("count", count + openUriAnaly.getUrlClickCount()); - } - total = total + openUriAnaly.getUrlClickCount(); - }else{ - if(field.equals("city")){ - resultMap = openUriAnaly.getCityMap(); - }else if(field.equals("time")){ - resultMap = openUriAnaly.getTimeMap(); - } - Iterator it = resultMap.keySet().iterator(); - while(it.hasNext()){ - String key = it.next(); - int count = (Integer) resultMap.get(key); - Map dataMap = (Map) ret.get(key); - if(dataMap == null){ - dataMap = new HashMap(); - ret.put(key, dataMap); - dataMap.put("count", count); - }else{ - dataMap.put("count", (Integer) dataMap.get("count")+count); - } - total = total + count; - } - } - } - - - Iterator it = ret.keySet().iterator(); - - List bos = new ArrayList(); - int index = 0; - double totalPercent = 0; - while(it.hasNext()){ - String key = (String) it.next(); - Map detailMap = ret.get(key); - - int count = (Integer) detailMap.get("count"); - double percent = 0; - - if(index+1==ret.size()){ - percent = 100 - totalPercent; - }else{ - double a1 = count; - double val = a1*10000/(double)total; - int scale = 2; - percent = DataUtil.roundDouble(val/100, scale); - totalPercent = totalPercent + percent; - } - index++; - - StatAnalyBo bo = new StatAnalyBo(); - bo.setKey(key); - bo.setPercent(percent); - bo.setCount(count); - bos.add(bo); - } - - - return bos; - } - - private List createAnalyBosByUser(List analys){ - Map ret = new HashMap(); - - int total = 0; - for(OpenUriAnaly openUriAnaly : analys){ - OpenUriAnaly temp = ret.get(openUriAnaly.getApiUserId()); - if(temp == null){ - ret.put(openUriAnaly.getApiUserId(), openUriAnaly); - }else{ - temp.setUrlClickCount(temp.getUrlClickCount()+openUriAnaly.getUrlClickCount()); - ret.put(openUriAnaly.getApiUserId(), temp); - } - - total = total + openUriAnaly.getUrlClickCount(); - } - List bos = new ArrayList(); - Iterator it = ret.keySet().iterator(); - - List users = this.userService.findAllUsers(); - - int index = 0; - double totalPercent = 0; - while(it.hasNext()){ - OpenUriAnaly openUriAnaly = ret.get(it.next()); - - double percent = 0; - - if(index+1==ret.size()){ - percent = 100 - totalPercent; - }else{ - double a1 = openUriAnaly.getUrlClickCount(); - double val = a1*10000/(double)total; - int scale = 2; - percent = DataUtil.roundDouble(val/100, scale); - //percent = getPercent(percent, scale, val); - totalPercent = totalPercent + percent; - } - index++; - - String name = null; - for(User user : users){ - if(openUriAnaly.getApiUserId()==user.getId()){ - name = user.getDisplayName(); - break; - } - } - - StatAnalyBo bo = new StatAnalyBo(); - if(StringUtils.isNotBlank(name)){ - bo.setKey(name); - }else{ - bo.setKey(openUriAnaly.getApiUserId().toString()); - } - - bo.setCount(openUriAnaly.getUrlClickCount()); - bo.setPercent(percent); - bo.setUserId(openUriAnaly.getApiUserId()); - bos.add(bo); - } - return bos; - } - - private double getPercent(double percent, int scale, double val){ - if(percent==0){ - while(scale<=8){ - if(percent==0){ - scale = scale+1; - percent = DataUtil.roundDouble(val/100, scale); - }else{ - break; - } - } - } - return percent; - } - - private String toChartString(List bos, int way) { - JSONArray ja = new JSONArray(); - for (OpenUriAnalyBo bo : bos) { + public Object importExcelAction(HttpServletRequest request, ApiUserModel model) { + String citys = request.getParameter("city"); + String begDate = request.getParameter("begDate"); + String enDate = request.getParameter("endDate"); + Date startDate = null; + Date endDate = null; + if (StringUtils.isBlank(begDate) && StringUtils.isBlank(enDate)) { + startDate = DateUtil.add(DateUtil.formatToYYYYMMDD(new Date()), -7); + endDate = DateUtil.parseStringToDate(DateUtil.formatToYYYYMMDD(new Date())); + } else { + if (StringUtils.isNotBlank(begDate)) { + startDate = DateUtil.parseStringToDate(begDate); + } + if (StringUtils.isNotBlank(enDate)) { + endDate = DateUtil.parseStringToDate(enDate); + } + + } + String Array[] = StringUtils.split(citys, "|"); + List cities = new ArrayList(); + if (Array != null) { + for (int i = 0; i < Array.length; i++) { + cities.add(Array[i]); + } + } + List apiCountCities = null; + List eachCityBos = null; + if (cities.size() != 0) { + apiCountCities = apiCountCityService.findApiCountCity(cities, startDate, endDate); + eachCityBos = getEachCityBos(apiCountCities); + } + + HSSFWorkbook workbook = new HSSFWorkbook(); + HSSFCellStyle cellStyle = workbook.createCellStyle(); + cellStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER); + cellStyle.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER); + HSSFSheet sheet = workbook.createSheet("数据导出"); + HSSFRow row = sheet.createRow(0); + HSSFCell cell0 = row.createCell(0); + HSSFCell cell1 = row.createCell(1); + HSSFCell cell2 = row.createCell(2); + HSSFCell cell3 = row.createCell(3); + HSSFCell cell4 = row.createCell(4); + HSSFCell cell5 = row.createCell(5); + cell0.setCellValue("城市"); + cell1.setCellValue("调用总量"); + cell2.setCellValue("成功调用次数"); + cell3.setCellValue("占比"); + cell4.setCellValue("失败调用次数"); + cell5.setCellValue("占比"); + if (null != eachCityBos) { + for (int i = 0; i < eachCityBos.size(); i++) { + HSSFRow rows = sheet.createRow(i + 1); + HSSFCell cel0 = rows.createCell(0); + HSSFCell cel1 = rows.createCell(1); + HSSFCell cel2 = rows.createCell(2); + HSSFCell cel3 = rows.createCell(3); + HSSFCell cel4 = rows.createCell(4); + HSSFCell cel5 = rows.createCell(5); + cel0.setCellValue(eachCityBos.get(i).getCity()); + cel1.setCellValue(eachCityBos.get(i).getSumTime()); + cel2.setCellValue(eachCityBos.get(i).getSuccessTime()); + cel3.setCellValue(getFour(eachCityBos.get(i).getSuccessRate()) * 100 + "%"); + cel4.setCellValue(eachCityBos.get(i).getFailTime()); + cel5.setCellValue(getFour(eachCityBos.get(i).getFailRate()) * 100 + "%"); + } + } + HttpServletResponse response = ActionContext.getContext().getResponse(); + response.setCharacterEncoding("UTF-8"); + response.setContentType("application/x-download;charset=UTF-8"); + response.setHeader("Content-Disposition", "attachment;filename=daochu.xls"); + try { + OutputStream os = response.getOutputStream(); + workbook.write(os); + os.flush(); + } catch (IOException e) { + e.printStackTrace(); + } + return null; + } + + private List sortApiBo(List bos) { + Collections.sort(bos, new Comparator() { + @Override + public int compare(OpenUriAnalyBo o1, OpenUriAnalyBo o2) { + if (o1.getUrlClickCount() > o2.getUrlClickCount()) { + return -1; + } else if (o1.getUrlClickCount() < o2.getUrlClickCount()) { + return 1; + } + return 0; + } + }); + + return bos; + } + + private List sortStatAnaly(List bos) { + Collections.sort(bos, new Comparator() { + @Override + public int compare(StatAnalyBo o1, StatAnalyBo o2) { + if (o1.getCount() > o2.getCount()) { + return -1; + } else if (o1.getCount() < o2.getCount()) { + return 1; + } + return 0; + } + }); + + return bos; + } + + private Map converMapData(List resources) { + Map map = new HashMap(); + for (OpenResource resource : resources) { + map.put(resource.getUri(), resource.getName()); + } + return map; + } + + + private List createAnalyBosByLink(List analys) { + + + Map ret = new HashMap(); + Map> urlCodeMap = new HashMap>(); + int total = 0; + for (OpenUriAnaly openUriAnaly : analys) { + Integer temp = ret.get(openUriAnaly.getUrl()); + if (temp == null) { + ret.put(openUriAnaly.getUrl(), openUriAnaly.getUrlClickCount()); + } else { + ret.put(openUriAnaly.getUrl(), temp + openUriAnaly.getUrlClickCount()); + } + Map codeMap = urlCodeMap.get(openUriAnaly.getUrl()); + if (codeMap == null) { + codeMap = new HashMap(); + urlCodeMap.put(openUriAnaly.getUrl(), codeMap); + } + Map analyCodeMap = openUriAnaly.getCodeMap(); + for (String code : analyCodeMap.keySet()) { + Integer count = (Integer) analyCodeMap.get(code); + if ("200".equals(code)) { + Integer successCount = codeMap.get("successCount"); + if (successCount == null) { + codeMap.put("successCount", count); + } else { + codeMap.put("successCount", successCount + count); + } + } else { + Integer defeatCount = codeMap.get("defeatCount"); + if (defeatCount == null) { + codeMap.put("defeatCount", count); + } else { + codeMap.put("defeatCount", defeatCount + count); + } + } + } + total = total + openUriAnaly.getUrlClickCount(); + } + + List bos = new ArrayList(); + int index = 0; + double totalPercent = 0; + for (String url : ret.keySet()) { + Integer count = ret.get(url); + double percent = 0; + if (index + 1 == ret.size()) { + percent = 100 - totalPercent; + } else { + double a1 = count; + double val = a1 * 10000 / (double) total; + percent = DataUtil.roundDouble(val / 100, 2); + totalPercent = totalPercent + percent; + } + StatAnalyBo bo = new StatAnalyBo(); + bo.setKey(url); + bo.setCount(count); + bo.setPercent(percent); + Map codeMap = urlCodeMap.get(url); + bo.setSuccessTime(codeMap.get("successCount")); + bo.setDefeatTime(codeMap.get("defeatCount")); + if (codeMap.get("successCount") != null) { + bo.setSuccessRate(DataUtil.roundDouble((codeMap.get("successCount") * 100) / (double) count, 2)); + } + bos.add(bo); + + } + return bos; + } + + private List getEachCityBos(List list) { + List eachCityBos = new ArrayList(); + Map> map = new HashMap>(); + for (ApiCountCity apiCountCity : list) { + if (map.containsKey(apiCountCity.getCity())) { + List list1 = new ArrayList(); + List list2 = map.get(apiCountCity.getCity()); + list1.add(list2.get(0) + apiCountCity.getSuccess()); + list1.add(list2.get(1) + apiCountCity.getFail()); + map.put(apiCountCity.getCity(), list1); + } else { + List list1 = new ArrayList(); + list1.add(apiCountCity.getSuccess()); + list1.add(apiCountCity.getFail()); + map.put(apiCountCity.getCity(), list1); + } + } + for (Object o : map.keySet()) { + List listm = map.get(o); + String city = o.toString(); + int success = listm.get(0); + int fail = listm.get(1); + int sum = success + fail; + double successTimeRate = getFour((double) success / (double) sum); + double failTimeRate = getFour((double) fail / (double) sum); + EachCityBo eachCityBo = new EachCityBo(); + eachCityBo.setCity(city); + eachCityBo.setSumTime(sum); + eachCityBo.setSuccessTime(success); + eachCityBo.setFailTime(fail); + eachCityBo.setSuccessRate(successTimeRate); + eachCityBo.setFailRate(failTimeRate); + eachCityBos.add(eachCityBo); + } + return eachCityBos; + } + + private double getFour(double m) { + BigDecimal b = new BigDecimal(m); + double f1 = b.setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue(); + return f1; + } + + private List createAnalyByCity(List analys, String field) { + Map> ret = new HashMap>(); + int total = 0; + for (OpenUriAnaly openUriAnaly : analys) { + Map resultMap = null; + if (field.equals("day")) { + resultMap = (Map) ret.get(DateUtil.formatToYYYYMMDD(openUriAnaly.getStatDate())); + if (resultMap == null) { + resultMap = new HashMap(); + ret.put(DateUtil.formatToYYYYMMDD(openUriAnaly.getStatDate()), resultMap); + } + Integer count = (Integer) resultMap.get("count"); + if (count == null) { + resultMap.put("count", openUriAnaly.getUrlClickCount()); + } else { + resultMap.put("count", count + openUriAnaly.getUrlClickCount()); + } + total = total + openUriAnaly.getUrlClickCount(); + } else { + if (field.equals("city")) { + resultMap = openUriAnaly.getCityMap(); + } else if (field.equals("time")) { + resultMap = openUriAnaly.getTimeMap(); + } + Iterator it = resultMap.keySet().iterator(); + while (it.hasNext()) { + String key = it.next(); + int count = (Integer) resultMap.get(key); + Map dataMap = (Map) ret.get(key); + if (dataMap == null) { + dataMap = new HashMap(); + ret.put(key, dataMap); + dataMap.put("count", count); + } else { + dataMap.put("count", (Integer) dataMap.get("count") + count); + } + total = total + count; + } + } + } + + + Iterator it = ret.keySet().iterator(); + + List bos = new ArrayList(); + int index = 0; + double totalPercent = 0; + while (it.hasNext()) { + String key = (String) it.next(); + Map detailMap = ret.get(key); + + int count = (Integer) detailMap.get("count"); + double percent = 0; + + if (index + 1 == ret.size()) { + percent = 100 - totalPercent; + } else { + double a1 = count; + double val = a1 * 10000 / (double) total; + int scale = 2; + percent = DataUtil.roundDouble(val / 100, scale); + totalPercent = totalPercent + percent; + } + index++; + + StatAnalyBo bo = new StatAnalyBo(); + bo.setKey(key); + bo.setPercent(percent); + bo.setCount(count); + bos.add(bo); + } + + + return bos; + } + + private List createAnalyBosByUser(List analys) { + Map ret = new HashMap(); + + int total = 0; + for (OpenUriAnaly openUriAnaly : analys) { + OpenUriAnaly temp = ret.get(openUriAnaly.getApiUserId()); + if (temp == null) { + ret.put(openUriAnaly.getApiUserId(), openUriAnaly); + } else { + temp.setUrlClickCount(temp.getUrlClickCount() + openUriAnaly.getUrlClickCount()); + ret.put(openUriAnaly.getApiUserId(), temp); + } + + total = total + openUriAnaly.getUrlClickCount(); + } + List bos = new ArrayList(); + Iterator it = ret.keySet().iterator(); + + List users = this.userService.findAllUsers(); + + int index = 0; + double totalPercent = 0; + while (it.hasNext()) { + OpenUriAnaly openUriAnaly = ret.get(it.next()); + + double percent = 0; + + if (index + 1 == ret.size()) { + percent = 100 - totalPercent; + } else { + double a1 = openUriAnaly.getUrlClickCount(); + double val = a1 * 10000 / (double) total; + int scale = 2; + percent = DataUtil.roundDouble(val / 100, scale); + //percent = getPercent(percent, scale, val); + totalPercent = totalPercent + percent; + } + index++; + + String name = null; + for (User user : users) { + if (openUriAnaly.getApiUserId() == user.getId()) { + name = user.getDisplayName(); + break; + } + } + + StatAnalyBo bo = new StatAnalyBo(); + if (StringUtils.isNotBlank(name)) { + bo.setKey(name); + } else { + bo.setKey(openUriAnaly.getApiUserId().toString()); + } + + bo.setCount(openUriAnaly.getUrlClickCount()); + bo.setPercent(percent); + bo.setUserId(openUriAnaly.getApiUserId()); + bos.add(bo); + } + return bos; + } + + private double getPercent(double percent, int scale, double val) { + if (percent == 0) { + while (scale <= 8) { + if (percent == 0) { + scale = scale + 1; + percent = DataUtil.roundDouble(val / 100, scale); + } else { + break; + } + } + } + return percent; + } + + private String toChartString(List bos, int way) { + JSONArray ja = new JSONArray(); + for (OpenUriAnalyBo bo : bos) { JSONArray array = new JSONArray(); array.put(way == 1 ? bo.getName() : bo.getUrl()); array.put(bo.getPercent()); ja.put(array); - } - return ja.toString(); - } - - private String toChartString(List bos) { - JSONArray ja = new JSONArray(); - for (StatAnalyBo bo : bos) { - JSONArray array = new JSONArray(); - if(StringUtils.isNotBlank(bo.getKey())){ - if(bo.getKey().equals("level_0")){ - array.put("0s"); - }else if(bo.getKey().equals("level_1")){ - array.put("1s以下"); - }else if(bo.getKey().equals("level_2")){ - array.put("1-2s以下"); - }else if(bo.getKey().equals("level_3")){ - array.put("2-3s以下"); - }else if(bo.getKey().equals("level_4")){ - array.put("3s以上"); - }else if(bo.getKey().equals("level_100")){ - array.put("暂无数据"); - }else{ - array.put(bo.getKey()); - } - }else{ - array.put(bo.getUserId()); - } - - array.put(bo.getPercent()); - ja.put(array); - } - return ja.toString(); - } + } + return ja.toString(); + } - /** - * 页面查询条件 - * - * @return - */ - private String[] getCityFirstLetter() { - String[] cityFirstLetter = { "A", "B", "C", "D", "E", "F", "G", "H", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", - "T", "W", "X", "Y", "Z" }; - return cityFirstLetter; - } + private String toChartString(List bos) { + JSONArray ja = new JSONArray(); + for (StatAnalyBo bo : bos) { + JSONArray array = new JSONArray(); + if (StringUtils.isNotBlank(bo.getKey())) { + if (bo.getKey().equals("level_0")) { + array.put("0s"); + } else if (bo.getKey().equals("level_1")) { + array.put("1s以下"); + } else if (bo.getKey().equals("level_2")) { + array.put("1-2s以下"); + } else if (bo.getKey().equals("level_3")) { + array.put("2-3s以下"); + } else if (bo.getKey().equals("level_4")) { + array.put("3s以上"); + } else if (bo.getKey().equals("level_100")) { + array.put("暂无数据"); + } else { + array.put(bo.getKey()); + } + } else { + array.put(bo.getUserId()); + } - - private Map> getCountByUri(List apiInvokeStatisticalList){ - Map> resultMap = new HashMap>(); - for (ApiInvokeStatistical apiInvokeStatistical : apiInvokeStatisticalList) { - Map detailMap = resultMap.get(apiInvokeStatistical.getRequestURI()); - if(detailMap == null){ - detailMap = new HashMap(); - resultMap.put(apiInvokeStatistical.getRequestURI(), detailMap); - } - Integer successEffectiveCount = detailMap.get("successEffectiveCount"); - Integer successInvalidCount = detailMap.get("successInvalidCount"); - Integer defeatCount = detailMap.get("defeatCount"); - if(successEffectiveCount != null){ - successEffectiveCount = successEffectiveCount + apiInvokeStatistical.getSuccessEffectiveTime(); - }else{ - successEffectiveCount = apiInvokeStatistical.getSuccessEffectiveTime(); - } - if(successInvalidCount != null){ - successInvalidCount = successInvalidCount + apiInvokeStatistical.getSuccessInvalidTime(); - }else{ - successInvalidCount = apiInvokeStatistical.getSuccessInvalidTime();; - } - if(defeatCount != null){ - defeatCount = defeatCount + apiInvokeStatistical.getDefeatTime(); - }else{ - defeatCount = apiInvokeStatistical.getDefeatTime(); - } - - detailMap.put("successEffectiveCount", successEffectiveCount); - detailMap.put("successInvalidCount", successInvalidCount); - detailMap.put("defeatCount", defeatCount); - } - - return resultMap; - } - public void setApiUserService(ApiUserService apiUserService) { - this.apiUserService = apiUserService; - } + array.put(bo.getPercent()); + ja.put(array); + } + return ja.toString(); + } - public UserService getUserService() { - return userService; - } + /** + * 页面查询条件 + * + * @return + */ + private String[] getCityFirstLetter() { + String[] cityFirstLetter = {"A", "B", "C", "D", "E", "F", "G", "H", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", + "T", "W", "X", "Y", "Z"}; + return cityFirstLetter; + } - public void setUserService(UserService userService) { - this.userService = userService; - } - public void setApiUserAuthorityService(ApiUserAuthorityService apiUserAuthorityService) { - this.apiUserAuthorityService = apiUserAuthorityService; - } + private Map> getCountByUri(List apiInvokeStatisticalList) { + Map> resultMap = new HashMap>(); + for (ApiInvokeStatistical apiInvokeStatistical : apiInvokeStatisticalList) { + Map detailMap = resultMap.get(apiInvokeStatistical.getRequestURI()); + if (detailMap == null) { + detailMap = new HashMap(); + resultMap.put(apiInvokeStatistical.getRequestURI(), detailMap); + } + Integer successEffectiveCount = detailMap.get("successEffectiveCount"); + Integer successInvalidCount = detailMap.get("successInvalidCount"); + Integer defeatCount = detailMap.get("defeatCount"); + if (successEffectiveCount != null) { + successEffectiveCount = successEffectiveCount + apiInvokeStatistical.getSuccessEffectiveTime(); + } else { + successEffectiveCount = apiInvokeStatistical.getSuccessEffectiveTime(); + } + if (successInvalidCount != null) { + successInvalidCount = successInvalidCount + apiInvokeStatistical.getSuccessInvalidTime(); + } else { + successInvalidCount = apiInvokeStatistical.getSuccessInvalidTime(); + ; + } + if (defeatCount != null) { + defeatCount = defeatCount + apiInvokeStatistical.getDefeatTime(); + } else { + defeatCount = apiInvokeStatistical.getDefeatTime(); + } - public void setOpenResourceService(OpenResourceService openResourceService) { - this.openResourceService = openResourceService; - } + detailMap.put("successEffectiveCount", successEffectiveCount); + detailMap.put("successInvalidCount", successInvalidCount); + detailMap.put("defeatCount", defeatCount); + } - public void setServerAreaService(ServerAreaService serverAreaService) { - this.serverAreaService = serverAreaService; - } + return resultMap; + } - public void setApiVisitCountService(ApiVisitCountService apiVisitCountService) { - this.apiVisitCountService = apiVisitCountService; - } + public void setApiUserService(ApiUserService apiUserService) { + this.apiUserService = apiUserService; + } - public void setOpenResourceCountService( - OpenResourceCountService openResourceCountService) { - this.openResourceCountService = openResourceCountService; - } - - - public void setOpenUriAnalyService(OpenUriAnalyService openUriAnalyService) { - this.openUriAnalyService = openUriAnalyService; - } + public UserService getUserService() { + return userService; + } - public void setApiUserCfgService(ApiUserCfgService apiUserCfgService) { - this.apiUserCfgService = apiUserCfgService; - } + public void setUserService(UserService userService) { + this.userService = userService; + } - public ApiInvokeStatisticalService getApiInvokeStatisticalService() { - return apiInvokeStatisticalService; - } + public void setApiUserAuthorityService(ApiUserAuthorityService apiUserAuthorityService) { + this.apiUserAuthorityService = apiUserAuthorityService; + } - public void setApiInvokeStatisticalService( - ApiInvokeStatisticalService apiInvokeStatisticalService) { - this.apiInvokeStatisticalService = apiInvokeStatisticalService; - } + public void setOpenResourceService(OpenResourceService openResourceService) { + this.openResourceService = openResourceService; + } - public void setApiCountCityService(ApiCountCityService apiCountCityService) { - this.apiCountCityService = apiCountCityService; - } + public void setServerAreaService(ServerAreaService serverAreaService) { + this.serverAreaService = serverAreaService; + } - public Map string2map(String str) - { - Map map = new HashMap(); - String [] a = str.split(","); + public void setApiVisitCountService(ApiVisitCountService apiVisitCountService) { + this.apiVisitCountService = apiVisitCountService; + } - for (String i : a) - { - String [] b = i.split(":"); - if (b.length > 1) - { - map.put(b[0],Integer.parseInt(b[1])); - } - } - return map; - } + public void setOpenResourceCountService( + OpenResourceCountService openResourceCountService) { + this.openResourceCountService = openResourceCountService; + } - public Object priceRatingAction(ApiUserModel model) throws IllegalAccessException { - ApiUserAuthority apiUserAuthority = apiUserAuthorityService.findByUserId(model.getUserId()); - if (apiUserAuthority != null && apiUserAuthority.getPriceRatingMap() != null){ - model.setPriceRatingMap(apiUserAuthority.getPriceRatingMap()); - }else{ - Map map = new HashMap(); - map.put("one",0.61); - map.put("newOne",0.61); - map.put("two",0.61); - map.put("three",0.61); - map.put("four",0.61); - map.put("five",0.61); - model.setPriceRatingMap(map); - } - if ( apiUserAuthority != null && apiUserAuthority.getCreditLevelStatus() != null) { - model.setCreditLevelStatus(apiUserAuthority.getCreditLevelStatus()); - } - ApiUser apiUser = apiUserService.findApiUserById(model.getUserId()); - if (apiUser != null) { - if (apiUser.getCompany() != null) { - model.setCompany(apiUser.getCompany()); - } - } - model.setUserId(model.getUserId()); - return model; - } + public void setOpenUriAnalyService(OpenUriAnalyService openUriAnalyService) { + this.openUriAnalyService = openUriAnalyService; + } - public Object savePriceRateingAction(ApiUserModel model) throws IllegalAccessException { - ApiUserAuthority apiUserAuthority = apiUserAuthorityService.findByUserId(model.getUserId()); - Map map = new HashMap(); - map.put("one",model.getOne()); - map.put("newOne",model.getNewOne()); - map.put("two",model.getTwo()); - map.put("three",model.getThree()); - map.put("four",model.getFour()); - map.put("five",model.getFive()); - apiUserAuthority.setPriceRatingMap(map); - apiUserAuthority.setCreditLevelStatus(model.getCreditLevelStatus()); - apiUserAuthorityService.update(apiUserAuthority); - model.setViewType("redirect"); - model.setViewParam("location", "/apiUser/list"); - return model; - } + public void setApiUserCfgService(ApiUserCfgService apiUserCfgService) { + this.apiUserCfgService = apiUserCfgService; + } + + public ApiInvokeStatisticalService getApiInvokeStatisticalService() { + return apiInvokeStatisticalService; + } + + public void setApiInvokeStatisticalService( + ApiInvokeStatisticalService apiInvokeStatisticalService) { + this.apiInvokeStatisticalService = apiInvokeStatisticalService; + } + + public void setApiCountCityService(ApiCountCityService apiCountCityService) { + this.apiCountCityService = apiCountCityService; + } + + public Map string2map(String str) { + Map map = new HashMap(); + String[] a = str.split(","); + + for (String i : a) { + String[] b = i.split(":"); + if (b.length > 1) { + map.put(b[0], Integer.parseInt(b[1])); + } + } + return map; + } + + public Object priceRatingAction(ApiUserModel model) throws IllegalAccessException { + ApiUserAuthority apiUserAuthority = apiUserAuthorityService.findByUserId(model.getUserId()); + if (apiUserAuthority != null && apiUserAuthority.getPriceRatingMap() != null) { + model.setPriceRatingMap(apiUserAuthority.getPriceRatingMap()); + } else { + Map map = new HashMap(); + map.put("one", 0.61); + map.put("newOne", 0.61); + map.put("two", 0.61); + map.put("three", 0.61); + map.put("four", 0.61); + map.put("five", 0.61); + model.setPriceRatingMap(map); + } + if (apiUserAuthority != null && apiUserAuthority.getCreditLevelStatus() != null) { + model.setCreditLevelStatus(apiUserAuthority.getCreditLevelStatus()); + } + ApiUser apiUser = apiUserService.findApiUserById(model.getUserId()); + if (apiUser != null) { + if (apiUser.getCompany() != null) { + model.setCompany(apiUser.getCompany()); + } + } + model.setUserId(model.getUserId()); + + return model; + } + + public Object savePriceRateingAction(ApiUserModel model) throws IllegalAccessException { + ApiUserAuthority apiUserAuthority = apiUserAuthorityService.findByUserId(model.getUserId()); + Map map = new HashMap(); + map.put("one", model.getOne()); + map.put("newOne", model.getNewOne()); + map.put("two", model.getTwo()); + map.put("three", model.getThree()); + map.put("four", model.getFour()); + map.put("five", model.getFive()); + apiUserAuthority.setPriceRatingMap(map); + apiUserAuthority.setCreditLevelStatus(model.getCreditLevelStatus()); + apiUserAuthorityService.update(apiUserAuthority); + model.setViewType("redirect"); + model.setViewParam("location", "/apiUser/list"); + return model; + } } diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/auth.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/auth.ftl index 387007283..9e0ea31e6 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/auth.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/auth.ftl @@ -10,7 +10,27 @@ <#include "/common_js.ftl" /> - + +<#-- 灏嗚〃澶村浐瀹�--> + @@ -31,12 +51,13 @@
- Ap + + API鏁伴噺锛� ${authorityBoList?size}涓� +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> - - + + + + + <#if (apiUserBoList??&&apiUserBoList?size>0)> + <#list apiUserBoList as bo> + style="background-color:#C3C3C3"> + + + + + + + + + + + + + + + + +
uri - 鎻忚堪 + API鍚嶇О 鏄惁鏈夋潈闄�鍏ㄩ�� @@ -63,7 +84,7 @@ ${bo.uri!} - ${bo.description!} + ${bo.name!} checked id="auth_${bo_index + 1}" > diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl index 31fb2f51a..3f8d5a463 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl @@ -43,10 +43,20 @@ ${apiUserBo.userName!}<#if (apiUserBo.displayName??)>(${apiUserBo.displayName!})
瀵嗙爜
瀵嗙爜
瀵嗙爜 +     淇敼瀵嗙爜 +
璐︽埛绫诲瀷 @@ -151,15 +161,15 @@ return re.test(strIP) } - $("#resetPwd").click(function () { - if (confirm('纭閲嶇疆瀵嗙爜涓恒��123456銆戯紵')) { - $.get('resetPwd', - "userId=" + $("#userId").val(), - function (data) { - alert(status); - }) - } - }) + // $("#resetPwd").click(function () { + // if (confirm('纭閲嶇疆瀵嗙爜涓恒��123456銆戯紵')) { + // $.get('resetPwd', + // "userId=" + $("#userId").val(), + // function (data) { + // alert(status); + // }) + // } + // }) diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/editPwd.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/editPwd.ftl new file mode 100644 index 000000000..3ccfe2210 --- /dev/null +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/editPwd.ftl @@ -0,0 +1,54 @@ +<#ftl attributes={"content_type":"text/html; charset=UTF-8"}> +<#compress> + + + + + api鐢ㄦ埛瀵嗙爜淇敼 + + + <#include "/common_js.ftl" /> + + + + + + <#include "/layout/header.ftl" /> +
+
+ + + + + + + + + + + + + + + + +
鐢ㄦ埛鍚�${apiUserBo.userName!}<#if (apiUserBo.displayName??)>(${apiUserBo.displayName!})
鏂板瘑鐮�
+
+
+ + + + \ No newline at end of file diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/list.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/list.ftl index 37afef638..e16556d06 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/list.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/list.ftl @@ -1,150 +1,179 @@ <#ftl attributes={"content_type":"text/html; charset=UTF-8"}> <#compress> - - - - - api鐢ㄦ埛鍒楄〃 - - <#include "/common_js.ftl" /> - - - <#include "/layout/header.ftl" /> -
- ${msg!''} - -
-
-
- 鍏辨湁鐢ㄦ埛${apiUserBoList?size}涓� -
- - - - - + + + + + api鐢ㄦ埛鍒楄〃 + + <#include "/common_js.ftl" /> + + <#-- 灏嗚〃澶村浐瀹�--> + + + + <#include "/layout/header.ftl" /> +
+ ${msg!''} + +
+
+
+ 鍏辨湁鐢ㄦ埛${apiUserBoList?size}涓� +
+
- ID - - 鏄电О -
+ + + + - - + + - + - + - - - - <#if (apiUserBoList??&&apiUserBoList?size>0)> - <#list apiUserBoList as bo> - style="background-color:#C3C3C3"> - - - - - - - - - - - - - - - - -
+ ID + + 鏄电О + 璐︽埛鐢ㄩ�� - username - - password - + username + + password + 閿�鍞礋璐d汉 鍏徃 - appKey - + appKey + 璐︽埛绫诲瀷 璐︽埛鐢ㄩ�� - 鏄惁鐩戞帶 - + 鏄惁鐩戞帶 + 鍒版湡鏃堕棿 - 鎿嶄綔 -
- ${bo.userId!} - - ${bo.displayName!} - - <#if bo.purpose?? && bo.purpose == 1> - API - <#elseif bo.purpose?? && bo.purpose == 2> - PDS - <#elseif bo.purpose?? && bo.purpose == 4> - 鎴跨敓娲� - - - ${bo.userName!} - - <#if bo.password?? && bo.password == t_util.md5Hex('123456')> - 鍒濆瀵嗙爜 - <#else> - ****** - - - ${bo.manager!} - - ${bo.company!} - - ${bo.appKey!} - - <#if bo.isTest==0> - 姝e紡璐︽埛 - <#else> - 娴嬭瘯璐︽埛 - - - <#if bo.purpose?? && bo.purpose == 1> - API - <#elseif bo.purpose?? && bo.purpose == 2> - PDS - <#elseif bo.purpose?? && bo.purpose == 4> - 鎴跨敓娲� - - - <#if bo.isMonitor==1> - 鏄� - <#else> - 鍚� - - - <#if bo.deadTime??> - ${bo.deadTime?string("yyyy骞碝M鏈坉d鏃�")} - - - 鏉冮檺鎺у埗 - 鍩庡競绠$悊 - 浠锋牸璇勭骇 - <#if bo.status==0> - 绂佺敤 - <#else> - 鍐嶅惎鐢� - -
-
-
- - +
+ 鎿嶄綔 +
+ ${bo.userId!} + + ${bo.displayName!} + + <#if bo.purpose?? && bo.purpose == 1> + API + <#elseif bo.purpose?? && bo.purpose == 2> + PDS + <#elseif bo.purpose?? && bo.purpose == 4> + 鎴跨敓娲� + + + ${bo.userName!} + + <#if bo.password?? && bo.password == t_util.md5Hex('123456')> + 鍒濆瀵嗙爜 + <#else> + ****** + + + ${bo.manager!} + + ${bo.company!} + + ${bo.appKey!} + + <#if bo.isTest==0> + 姝e紡璐︽埛 + <#else> + 娴嬭瘯璐︽埛 + + + <#if bo.purpose?? && bo.purpose == 1> + API + <#elseif bo.purpose?? && bo.purpose == 2> + PDS + <#elseif bo.purpose?? && bo.purpose == 4> + 鎴跨敓娲� + + + <#if bo.isMonitor==1> + 鏄� + <#else> + 鍚� + + + <#if bo.deadTime??> + ${bo.deadTime?string("yyyy骞碝M鏈坉d鏃�")} + + + API鏉冮檺鎺у埗 + 鏂板API + 鍩庡競绠$悊 + 浠锋牸璇勭骇 + <#if bo.status==0> + 绂佺敤 + <#else> + 鍐嶅惎鐢� + +
+
+ + + \ No newline at end of file diff --git a/projects/fangjia-bkoff/src/main/webapp/openResource/list.ftl b/projects/fangjia-bkoff/src/main/webapp/openResource/list.ftl index 9944cfa86..629c14ec4 100644 --- a/projects/fangjia-bkoff/src/main/webapp/openResource/list.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/openResource/list.ftl @@ -8,6 +8,25 @@ .up {color: green;} #spinner{width:500px;height:100px;margin:30px 0 0 100px;text-align:center;padding-top:50px;border:2px solid #CCC;} #checkMsg{width:500px;margin:30px 0 0 100px;padding:10px 0 10px 50px;text-align:left;border:2px solid #CCC;} + + <#-- 灏嗚〃澶村浐瀹�--> + table { + width: 100%; + border-collapse: collapse; + table-layout: fixed; + } + + th, td { + border: 1px solid #dddddd; + text-align: left; + padding: 8px; + } + + th { + position: sticky; + top: 0; + background-color: #f2f2f2; + } diff --git a/projects/fangjia-bkoff/src/main/webapp/style/address/main.css.baiduyun.uploading.cfg b/projects/fangjia-bkoff/src/main/webapp/style/address/main.css.baiduyun.uploading.cfg deleted file mode 100644 index 74aacef5a..000000000 Binary files a/projects/fangjia-bkoff/src/main/webapp/style/address/main.css.baiduyun.uploading.cfg and /dev/null differ diff --git a/projects/fangjia-bkoff/src/main/webapp/style/audit/list.css.baiduyun.uploading.cfg b/projects/fangjia-bkoff/src/main/webapp/style/audit/list.css.baiduyun.uploading.cfg deleted file mode 100644 index f612f71b5..000000000 Binary files a/projects/fangjia-bkoff/src/main/webapp/style/audit/list.css.baiduyun.uploading.cfg and /dev/null differ diff --git a/projects/fangjia-bkoff/src/main/webapp/style/theme.css.baiduyun.uploading.cfg b/projects/fangjia-bkoff/src/main/webapp/style/theme.css.baiduyun.uploading.cfg deleted file mode 100644 index 0c2959a18..000000000 Binary files a/projects/fangjia-bkoff/src/main/webapp/style/theme.css.baiduyun.uploading.cfg and /dev/null differ diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDao.java new file mode 100644 index 000000000..7b38443f2 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDao.java @@ -0,0 +1,8 @@ +package com.fangjia.dal.mongo.dao; + +import com.fangjia.dal.mongo.model.AdministrativeDivision; +import com.fangjia.dal.MongoDao; + +public interface AdministrativeDivisionDao extends MongoDao { + AdministrativeDivision findcityByCode(String code); +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDaoImpl.java new file mode 100644 index 000000000..a737f3157 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeDivisionDaoImpl.java @@ -0,0 +1,23 @@ +package com.fangjia.dal.mongo.dao; + + +import com.fangjia.dal.mongo.model.AdministrativeDivision; +import com.fangjia.dal.MongoDaoImpl; +import com.fangjia.dal.QueryParam; +import org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +public class AdministrativeDivisionDaoImpl extends MongoDaoImpl implements AdministrativeDivisionDao { + @Override + public AdministrativeDivision findcityByCode(String code) { + if (StringUtils.isBlank(code)) { + return new AdministrativeDivision(); + } + List params = new ArrayList(); + params.add(new QueryParam("mcaCityCode", QueryParam.EQUAL_OPERATOR, code)); + params.add(new QueryParam("level", QueryParam.EQUAL_OPERATOR, "城市")); + return (AdministrativeDivision) findFirstByParams(params); + } +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AdministrativeDivision.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AdministrativeDivision.java new file mode 100644 index 000000000..abe9b0816 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AdministrativeDivision.java @@ -0,0 +1,148 @@ +package com.fangjia.dal.mongo.model; + +import com.fangjia.dal.DatastoreCategory; +import com.fangjia.dal.MongoEntity; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity +@Table(name = "fangjia.administrative_division") + +public class AdministrativeDivision implements MongoEntity { + + private static final long serialVersionUID = -8379446820760559477L; + + private String id; + private String province; + private String city; + private String district; + private String mcaProvinceCode; + private String mcaDistrictCode; + private String mcaCityCode; + private String level; + private String cityShort; + private String distShort; + private String provShort; + private String code; + private String administer; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "_id") + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + + public String getProvince() { + return province; + } + + public void setProvince(String province) { + this.province = province; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getDistrict() { + return district; + } + + public void setDistrict(String district) { + this.district = district; + } + + @Column(name = "mca_province_code") + public String getMcaProvinceCode() { + return mcaProvinceCode; + } + + public void setMcaProvinceCode(String mcaProvinceCode) { + this.mcaProvinceCode = mcaProvinceCode; + } + + @Column(name = "mca_district_code") + public String getMcaDistrictCode() { + return mcaDistrictCode; + } + + public void setMcaDistrictCode(String mcaDistrictCode) { + this.mcaDistrictCode = mcaDistrictCode; + } + + @Column(name = "mca_city_code") + public String getMcaCityCode() { + return mcaCityCode; + } + + public void setMcaCityCode(String mcaCityCode) { + this.mcaCityCode = mcaCityCode; + } + + @Column(name = "level") + public String getLevel() { + return level; + } + + public void setLevel(String level) { + this.level = level; + } + + @Column(name = "city_short") + public String getCityShort() { + return cityShort; + } + + public void setCityShort(String cityShort) { + this.cityShort = cityShort; + } + + @Column(name = "dist_short") + public String getDistShort() { + return distShort; + } + + public void setDistShort(String distShort) { + this.distShort = distShort; + } + + @Column(name = "prov_short") + public String getProvShort() { + return provShort; + } + + public void setProvShort(String provShort) { + this.provShort = provShort; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getAdminister() { + return administer; + } + + public void setAdminister(String administer) { + this.administer = administer; + } +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java index 07d036ae8..e7dc05ae8 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java @@ -206,7 +206,7 @@ public class AddrSvcController { //新匹配接口 json = request.getJsonContent("http://192.168.0.100:32080/FangJiaNlpService/match", params, "UTF-8"); BasicModel basicModel = new BasicModel(200, "ok"); - if (json != null && json.size()>0) { + if (json != null && json.size() > 0) { basicModel.setResult(CommonDtoUtils.transformV(MatchedBuildingDto.class, json)); } mav.setModel(basicModel); @@ -284,16 +284,16 @@ public class AddrSvcController { //新匹配接口 json = request.getJsonContent("http://192.168.0.100:32080/FangJiaNlpService/match", params, "UTF-8"); BasicModel basicModel = new BasicModel(200, "ok"); - if (json != null && json.size()>0) { + if (json != null && json.size() > 0) { MatchedBuildingDto dto = CommonDtoUtils.transformV(MatchedBuildingDto.class, json); - District district = districtService.findByNameAndAlias(dto.getCity(), dto.getDistrict(), dto.getName(),"district"); + District district = districtService.findByNameAndAlias(dto.getCity(), dto.getDistrict(), dto.getName(), "district"); if (null != district) { DistrictStatBo statBo = districtStatService.findCurrentDistrictStat(new DistrictKey(dto.getCity(), dto.getDistrict(), dto.getName())); - if(null != statBo){ - if(statBo.getDistrictStat()!=null){ + if (null != statBo) { + if (statBo.getDistrictStat() != null) { dto.setAvgPrice(statBo.getDistrictStat().getAvgPrice()); - }else if(statBo.getVillaDistrictStat()!=null){ + } else if (statBo.getVillaDistrictStat() != null) { dto.setAvgPrice(statBo.getVillaDistrictStat().getAvgPrice()); } @@ -310,6 +310,102 @@ public class AddrSvcController { return mav; } + /** + * 五级地址标准化 + * + * @param model + * @return + */ + public Object fiveLevelStructureAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : null); + params.put("refCity", StringUtils.isNotBlank(model.getRefCity()) ? model.getRefCity() : null); + params.put("address", model.getAddress()); + // 默认不输出省市区的代码 + params.put("showCode", StringUtils.isNotBlank(model.getShowCode()) ? model.getShowCode() : "0"); + params.put("complete", "true"); + params.put("addressAssessment", "true"); + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/v3/structure", params, "UTF-8"); + } catch (Exception e) { + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/v3/structure", params, "UTF-8"); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + if (json != null) { + int code = json.getInt("msgCode"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if (json.containsKey("result")) { + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 涉农识别-新规则 + * + * @param model + * @return + */ + public Object villageIdentifyAction(AddressModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : null); + params.put("address", model.getAddress()); + params.put("type", StringUtils.isNotBlank(model.getType()) ? model.getType() : null); + params.put("showFullValue", StringUtils.isNotBlank(model.getShowFullValue()) ? model.getShowFullValue() : null); + params.put("showTestValue", StringUtils.isNotBlank(model.getShowTestValue()) ? model.getShowTestValue() : null); + Integer radius = model.getRadius(); + params.put("radius", (radius != null && radius != 0) ? radius.toString() : null); + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/villageIdentify", params, "UTF-8"); + } catch (Exception e) { + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/villageIdentify", params, "UTF-8"); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + if (json != null) { + int code = json.getInt("msgCode"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if (json.containsKey("result")) { + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + public void setDistrictStatService(DistrictStatService districtStatService) { this.districtStatService = districtStatService; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java index cf00f9e9c..c50eb7af6 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java @@ -83,3246 +83,3251 @@ import java.util.regex.Pattern; @Authority(role = Role.USER) public class AddressController { - private AddressService addressService; - private DistrictService districtService; - private EvaluationService evaluationService; - private CommDataService commDataService; - private RegionBlockService regionBlockService; - private BaiduApiService baiduApiService; - private AddressParser addressParser; - private ServerAreaService serverAreaService; - private AddressParserService addressParserService; - private WaitCrawlKeywordsService waitCrawlKeywordsService; - private HouseLoudongService houseLoudongService; - private FjtEvaluationService fjtEvaluationService; - private AddressMatchProxyService addressMatchProxyService; - - private final static String AK = OpenConfig.getConfig().getBaiduAk(); - private final static Logger LOGGER = LoggerFactory.getLogger(AddressController.class); - - private static Map> districts_cache = new HashMap>(); - - private static final String FJW_LEVEL = "5CAE1FAC646CB2D8"; - private static final String GRADE_AREA = "区域评分"; - private static final String GRADE_CITY = "城市评分"; - private static final String GRADE_NATION = "全国评分"; - private static final String GRADE_CONSUME = "消费评分"; - - public final static OpenConfig CONFIG = OpenConfig.getConfig(); - private static final String ES_USER = "developer"; - private static final String ES_PASSWORD = "5e8edd851d2fdfbd7415232c67367cc3"; - - /** - * @deprecated see parse2Action - * @param model - * @return - */ - @Authority(role = Role.USER) - public Object parseAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setModel(addressParser.parse(model.getCity(), model.getAddress(), model.getTarget(), model.isNearby())); - return mav; - } - - @Authority(role = Role.USER) - public Object parse2Action(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - if (ServerAreaData.getServerAreaByCity(model.getCity()) == null) { - HashMap resMap = new HashMap(); - resMap.put("status", 0); - resMap.put("precise", -1); - resMap.put("searchKey", model.getAddress()); - mav.setModel(resMap); - return mav; - } - mav.setModel(addressParser.parse2(model.getCity(), model.getAddress(), model.getTarget(), model.isNearby())); - return mav; - } - - /** - * 解析地址,能够返回多个结果 参数有:city 城市 address 地址 includeMaps - * 匹配的结果是否包含来自地图的数据,true表示结果包含来自地图的数据 max 返回的结果集中最多条数 - * - * @param model - * @return - */ - @Authority(role = Role.USER) - public Object parseAsListAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setModel( - addressParser.parseAsList(model.getCity(), model.getAddress(), model.isIncludeMaps(), model.getMax())); - return mav; - } - - @Authority(role = Role.USER) - public Object cacheFlushAction(AddesssMatchModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - String result = addressMatchProxyService.cacheFlush(convertModelToMap(model)); - mav.setModel(result); - return mav; - } - - @Authority(role = Role.USER) - public Object analyzeAction(AddressModel model){ - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("城市不能为空")); - return mav; - } - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - HttpRequest request = new HttpRequest(); - Map params = new HashMap(); - params.put("address", model.getAddress()); - params.put("city", model.getCity()); - try { - JSONObject result = request.getJsonContent("http://192.168.0.19:38080/FangJiaHelper/address/analyze/api", params, "UTF-8"); - mav.setModel(BasicModel.buildOKModel().setResult(result)); - } catch (HttpRequestException e) { - e.printStackTrace(); - } - return mav; - } - - public Object rateAction(@Valid RateModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - JSONArray dataList; - try { - dataList = JSONArray.fromObject(model.getData()); - } catch (Exception e) { - mav.setModel(BasicModel.buildBadRequestModel("数据格式错误")); - return mav; - } - List metaDatas = new ArrayList(dataList.size()); - JSONObject item; - AddressMatchMetaData metaData; - Map idMap = new HashMap(dataList.size()); - for (int i = 0; i < dataList.size(); i++) { - item = dataList.getJSONObject(i); - metaData = new AddressMatchMetaData(); - if (item.containsKey("city")) { - metaData.setCity(item.getString("city")); - } else { - metaData.setCity(model.getCity()); - } - if (item.containsKey("district")) { - metaData.setDistrict(item.getString("district")); - } - metaData.setMainName(item.getString("name")); - metaData.addName(item.getString("name"), MatchText.MAIN_NAME_PRIORITY); - if (item.containsKey("address")) { - Map addrWeightMap = analyseAddress(model.getCity(), item.getString("address")); - for (String addr : addrWeightMap.keySet()) { - metaData.addAddress(addr, addrWeightMap.get(addr)); - } - } - if (item.containsKey("uid")) { - metaData.setId(item.getString("uid")); - idMap.put(metaData.getId(), item); - } - if (item.containsKey("lng")) { - metaData.setLng(item.getDouble("lng")); - } - if (item.containsKey("lat")) { - metaData.setLat(item.getDouble("lat")); - } - metaData.setBuildingType(BuildingType.DISTRICT); - metaDatas.add(metaData); - } - AddressRate addressRate = addressParserService.rate(model.getCity(), model.getAddress(), metaDatas); - List results = new ArrayList(metaDatas.size()); - for (AddressMatchMetaData meta : addressRate.getMetaData()) { - JSONObject result = idMap.get(meta.getId()); - results.add(result); - } - mav.setModel(BasicModel.buildOKModel().setResult(results)); - return mav; - } - - private Map analyseAddress(String city, String address) { - - if (StringUtils.isBlank(address)) { - return Collections.EMPTY_MAP; - } - try { - Address addr = addressParserService.standardize(city, address); - if (!addr.isAvailable()) { - return Collections.EMPTY_MAP; - } - Map addrWeightMap = new HashMap(); - - if (StringUtils.isNotBlank(addr.getStreet())) { - String street = addr.getStreet(); - List streets = new ArrayList(); - streets.add(street); - if (street.endsWith("弄")) { - addrWeightMap.put(street, MatchText.MAIN_ADDR_PRIORITY); - addrWeightMap.put(street.replaceAll("弄$", "号"), MatchText.GEN_ADDR_PRIORITY); - streets.add(street.replaceAll("弄$", "号")); - } - if (StringUtils.isNotBlank(addr.getStreetNumber())) { - for (String s : streets) { - if (addr.getStreetNumber().endsWith("号")) { - addrWeightMap.put(s + addr.getStreetNumber().replaceAll("号$", "弄"), - MatchText.GEN_ADDR_PRIORITY); - } else if (street.endsWith("弄")) { - addrWeightMap.put(s + addr.getStreetNumber().replaceAll("弄$", "号"), - MatchText.GEN_ADDR_PRIORITY); - } - } - } - - if (CollectionUtils.isNotEmpty(addr.getStreetNumbers())) { - addrWeightMap.put(street + addr.getStreetNumber(), MatchText.MAIN_ADDR_PRIORITY); - for (String s : streets) { - for (String streetNumber : addr.getStreetNumbers()) { - if (streetNumber.endsWith("号")) { - addrWeightMap.put(s + streetNumber.replaceAll("号$", "弄"), MatchText.GEN_ADDR_PRIORITY); - } else if (street.endsWith("弄")) { - addrWeightMap.put(s + streetNumber.replaceAll("弄$", "号"), MatchText.GEN_ADDR_PRIORITY); - } - } - } - } - - } else { - addrWeightMap.put(addr.getMiniAddress(), MatchText.MAIN_ADDR_PRIORITY); - } - return addrWeightMap; - } catch (Exception e) { - - } - return Collections.EMPTY_MAP; - - } - - public Object standardizeAction(AddressModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - Address address = addressParserService.standardize(model.getCity(), model.getAddress()); - mav.setModel(BasicModel.buildOKModel().setResult(address)); - return mav; - } - - public Object realCertificateAction(AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (!OpenConfig.getConfig().addressMatchEnabled()) { - mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); - return mav; - } - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - MatchParams matchParams = new MatchParams(); - matchParams.setCity(model.getCity()); - matchParams.setAddress(model.getAddress()); - matchParams.setAddressParserGoal(AddressParserGoal.Certificate); - matchParams.setPreciseLevel(PreciseLevel.STRICT); - Building building = addressParserService.certificate(matchParams); - Address address = building.getSearchAddress(); - UniversalDto dto = UniversalDto.newDto(); - dto.append("province", address.getProvince()); - dto.append("city", address.getCity()); - if (address.getDistrict() != null) { - dto.append("district", address.getDistrict()); - } else { - dto.append("district", building.getDistrict()); - } - dto.append("developmentZone", address.getDevelopmentZone()); - dto.append("township", address.getTownship()); - dto.append("street", address.getStreet()); - dto.append("streetNumber", address.getStreetNumber()); - dto.append("name", building.getSuggestName()); - dto.append("buildingNumber", address.getBuildingNumber()); - dto.append("unitNumber", address.getUnitNumber()); - dto.append("roomNumber", address.getRoomNumber()); - dto.append("formattedAddress", address.getFormattedAddress()); - dto.append("certified", address.getCertified()); - dto.append("floor", address.getFloor()); - mav.setModel(BasicModel.buildOKModel().setResult(dto)); - return mav; - } - - public Object certificateAction(AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - String result = addressMatchProxyService.certificate(convertModelToMap(model)); - if (result != null) { - mav.setModel(result); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - public Object authAction(AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - String result = addressMatchProxyService.auth(convertModelToMap(model)); - if (result != null) { - mav.setModel(result); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - public Object realAuthAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - if (!OpenConfig.getConfig().addressMatchEnabled()) { - mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); - return mav; - } - MatchParams matchParams = new MatchParams(); - matchParams.setCity(model.getCity()); - matchParams.setAddress(model.getAddress()); - matchParams.setAddressParserGoal(AddressParserGoal.Certificate); - matchParams.setUseMap(true); - Building building = addressParserService.certificate(matchParams); - Address address = building.getSearchAddress(); - UniversalDto dto = UniversalDto.newDto(); - dto.append("province", address.getProvince()); - dto.append("city", address.getCity()); - dto.append("district", address.getDistrict()); - dto.append("developmentZone", address.getDevelopmentZone()); - dto.append("township", address.getTownship()); - dto.append("street", address.getStreet()); - dto.append("streetNumber", address.getStreetNumber()); - dto.append("buildingNumber", address.getBuildingNumber()); - dto.append("unitNumber", address.getUnitNumber()); - dto.append("roomNumber", address.getRoomNumber()); - dto.append("formattedAddress", address.getFormattedAddress()); - List certified = address.getCertified(); - if (certified.contains("roomNumber")) { - dto.append("authLevel", "A"); - } else if (certified.contains("buildingNumber")) { - dto.append("authLevel", "B"); - } else { - dto.append("authLevel", "C"); - } - mav.setModel(BasicModel.buildOKModel().setResult(dto)); - return mav; - } - - public Map analyseAddress(String address) { - Map ret = new HashMap(); - ret.put("address", address); - if (districts_cache.isEmpty()) { - List serverAreas = serverAreaService.findAll(); - for (ServerArea serverArea : serverAreas) { - if (StringUtils.isBlank(serverArea.getProvince())) { - continue; - } - String city = serverArea.getDisplay(); - String province = serverArea.getProvince(); - List cities = districts_cache.get(province); - if (cities == null) { - cities = new ArrayList(); - districts_cache.put(province, cities); - } - if (!cities.contains(city)) { - cities.add(city); - } - } - } - - for (Entry> p : districts_cache.entrySet()) { - if (address.startsWith(p.getKey())) { - ret.put("province", p.getKey()); - List cities = p.getValue(); - if (cities.size() == 1 && cities.contains(p.getKey())) {// 直辖市 - ret.put("city", p.getKey()); - } else { - String temp = address.substring(p.getKey().length());// 移除省份 - if (temp.startsWith("省") || temp.startsWith("市") || temp.startsWith("县") || temp.startsWith("区")) { - temp = temp.substring(1); - } - for (String c : cities) { - if (temp.startsWith(c)) { - ret.put("city", c); - break; - } - } - } - break; - } - } - return ret; - } - - @Authority(role = Role.USER) - public Object matchAction(AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - String result = addressMatchProxyService.parser(convertModelToMap(model)); - if (result != null) { - JSONObject json = JSONObject.fromObject(result); - BasicModel resultModel = new BasicModel(json.getInt("code"), json.getString("msg")); - resultModel.setResult(json.get("result")); - mav.setModel(resultModel); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - /** - * 地址匹配第二个版本,基于第一个版本的逻辑,对匹配出的结果进行正确性的判断 - * @author yinjihuan - * @param model - * @return - */ - @Authority(role = Role.USER) - public Object matchV2Action(AddesssMatchModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - String result = addressMatchProxyService.parser(convertModelToMap(model)); - JSONObject json = JSONObject.fromObject(result); - BasicModel resultModel = new BasicModel(json.getInt("code"), json.getString("msg")); - if (result != null) { - JSONObject jsonResult = (JSONObject) json.get("result"); - if (jsonResult != null && jsonResult.getDouble("credit") > 0) { - CheckMatchDistrictCorrectParam param = new CheckMatchDistrictCorrectParam(); - String city = jsonResult.getString("city"); - String region = jsonResult.getString("district"); - String name = jsonResult.getString("name"); - param.setCity(city); - param.setRegion(region); - param.setName(name); - param.setInputAddress(model.getAddress()); - if (jsonResult.containsKey("lng")) { - param.setBlng(jsonResult.getDouble("lng")); - } - if (jsonResult.containsKey("lat")) { - param.setBlat(jsonResult.getDouble("lat")); - } - param.setDebug(model.isDebug()); - District district = districtService.findDistrict(new DistrictKey(city, region, name), "district"); - if (district != null && district.getLng() != null && district.getLng() > 0) { - param.setGlng(district.getLng() / 10000000000.0); - param.setGlat(district.getLat() / 10000000000.0); - } - MatchDistrictResult matchResult = addressMatchProxyService.checkMatchDistrictCorrect(param); - jsonResult.put("matchResult", matchResult); - if (jsonResult.containsKey("category")) { - if ("office".equals(jsonResult.getString("category"))) { - jsonResult.put("propertyType", "写字楼"); - } else if ("shop".equals(jsonResult.getString("category"))) { - jsonResult.put("propertyType", "商铺"); - } - } - } else if (jsonResult != null) { - // 判断是否为自然村 - boolean matchedVillage = false; - try { - if (jsonResult.get("searchAddress") != null) { - JSONObject searchAddress = (JSONObject) jsonResult.get("searchAddress"); - String city = searchAddress.containsKey("city") ? searchAddress.getString("city") : null; - String region = searchAddress.containsKey("district") ? searchAddress.getString("district") : null; - String name = searchAddress.containsKey("keywords") ? searchAddress.getString("keywords") : null; - String township = searchAddress.containsKey("township") ? searchAddress.getString("township") : null; - if (StringUtils.isNotBlank(city) && StringUtils.isNotBlank(region) && StringUtils.isNotBlank(name)) { - List villages = findVillage(city, region, name); - if (CollectionUtils.isNotEmpty(villages)) { - if (villages.size() == 1 || StringUtils.isBlank(township)) { - JSONObject village = villages.get(0).getJSONObject("_source"); - jsonResult.put("id", villages.get(0).getString("_id")); - jsonResult.put("province", village.getString("province")); - jsonResult.put("city", village.getString("city")); - jsonResult.put("district", village.getString("region")); - jsonResult.put("township", village.getString("township")); - jsonResult.put("name", village.getString("name")); - jsonResult.put("lng", village.getJSONObject("location").getDouble("lon")); - jsonResult.put("lat", village.getJSONObject("location").getDouble("lat")); - jsonResult.put("propertyType", "自然村"); - matchedVillage = true; - } else { - for (JSONObject source : villages) { - JSONObject village = source.getJSONObject("_source"); - if (village.getString("township").contains(township) || township.contains(village.getString("township"))) { - jsonResult.put("id", source.getString("_id")); - jsonResult.put("province", village.getString("province")); - jsonResult.put("city", village.getString("city")); - jsonResult.put("district", village.getString("region")); - jsonResult.put("township", village.getString("township")); - jsonResult.put("name", village.getString("name")); - jsonResult.put("lng", village.getJSONObject("location").getDouble("lon")); - jsonResult.put("lat", village.getJSONObject("location").getDouble("lat")); - jsonResult.put("propertyType", "自然村"); - matchedVillage = true; - break; - } - } - } - } - } - } - } catch(Exception ex) { - ex.printStackTrace(); - } - if (matchedVillage == false) { - jsonResult.put("matchResult", new MatchDistrictResult()); - } - } - resultModel.setResult(json.get("result")); - mav.setModel(resultModel); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - public Object realMatchAction(@Valid AddesssMatchModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (!OpenConfig.getConfig().addressMatchEnabled()) { - mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); - return mav; - } - String address = model.getAddress(); - address = address.replaceAll("@@", "#");// 框架无法处理参数带有#的Buge 用@@代替 - BuildingType buildingType = null; - if (StringUtils.isNotBlank(model.getCategory())) { - if ("property".equals(model.getCategory())) { - model.setCategory("district"); - } - try { - buildingType = BuildingType.valueOf(model.getCategory().toUpperCase()); - } catch (Exception e) { - - } - } - PreciseLevel preciseLevel = PreciseLevel.FUZZY; - if ("strict".equals(model.getPreciseLevel())) { - preciseLevel = PreciseLevel.STRICT; - } - MatchParams params = new MatchParams(); - params.setCity(model.getCity()); - params.setSuggestDistrict(model.getSuggestDistrict()); - params.setSuggestName(model.getSuggestName()); - params.setAddress(address); - params.setBuildingType(buildingType); - params.setPreciseLevel(preciseLevel); - params.setProvince(model.getProvince()); - params.setUseMap(model.isUseMap()); - params.setDebugName(model.getDebugName()); - long start = System.currentTimeMillis(); - Building building = addressParserService.parser(params); - long end = System.currentTimeMillis(); - if (end - start > 200) { - LOGGER.warn("匹配parser耗时:\t" + (end - start) + "ms"); - } - if ("true".equalsIgnoreCase(model.getVerify())) { - verify(building); - } - BasicModel baseModel = BasicModel.buildOKModel(); - Map result = convertBuildingToMap(building); - if (!APIConstant.SUPER_USER_TOKEN.equals(model.getToken())) { - submitFetchTask(building); - result.remove("precise"); - result.remove("searchAddress"); - result.remove("map"); - } - baseModel.setResult(result); - mav.setModel(baseModel); - return mav; - } - - Map convertBuildingToMap(Building building) { - Map result = new LinkedHashMap(); - if (building != null) { - result.put("id", building.getId()); - result.put("credit", building.getCredit()); - result.put("precise", building.getPrecise()); - result.put("province", building.getProvince()); - result.put("city", building.getCity()); - result.put("district", building.getDistrict()); - result.put("name", building.getName()); - result.put("suggestName", building.getSuggestName()); - result.put("map", building.getMap()); - result.put("propertyType", building.getPropertyType()); - result.put("township", building.getTownship()); - result.put("suggestAddress", building.getSuggestAddress()); - if ("district".equals(building.getCategory())) { - result.put("category", "property"); - } else { - result.put("category", building.getCategory()); - } - result.put("address", building.getAddress()); - result.put("block", building.getBlock()); - result.put("lng", building.getLng()); - result.put("lat", building.getLat()); - result.put("alias", building.getAlias()); - result.put("searchAddress", building.getSearchAddress()); - } - return result; - } - - public Object cleanCacheAction(final AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (!OpenConfig.getConfig().addressMatchEnabled()) { - mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); - return mav; - } - new Thread() { - @Override - public void run() { - addressParserService.clearCache(model.getCity()); - } - }.start(); - mav.setModel(BasicModel.buildOKModel().setMsg("开始刷新缓存")); - return mav; - } - - @Authority(role = Role.NONE) - public Object realMatchAllAction(@Valid AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (!OpenConfig.getConfig().addressMatchEnabled()) { - mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); - return mav; - } - String address = model.getAddress(); - address = address.replaceAll("@@", "#");// 框架无法处理参数带有#的Buge 用@@代替 - BuildingType buildingType = null; - if (StringUtils.isNotBlank(model.getCategory())) { - if ("property".equals(model.getCategory())) { - model.setCategory("district"); - } - buildingType = BuildingType.valueOf(model.getCategory().toUpperCase()); - } - PreciseLevel preciseLevel = PreciseLevel.FUZZY; - if ("strict".equals(model.getPreciseLevel())) { - preciseLevel = PreciseLevel.STRICT; - } - MatchParams params = new MatchParams(); - params.setCity(model.getCity()); - params.setSuggestDistrict(model.getSuggestDistrict()); - params.setAddress(address); - params.setBuildingType(buildingType); - params.setPreciseLevel(preciseLevel); - params.setProvince(model.getProvince()); - params.setSuggestName(model.getSuggestName()); - AddressParseResult addressParseResult = addressParserService.parserAll(params); - List buildings = addressParseResult.getBuildings(); - List> buildingObjs = new ArrayList>(buildings.size()); - for (Building building : buildings) { - buildingObjs.add(convertBuildingToMap(building)); - } - BasicModel baseModel = BasicModel.buildOKModel(); - baseModel.setResult(buildingObjs); - mav.setModel(baseModel); - return mav; - } - - @Authority(role = Role.USER) - public Object matchAllAction(AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - String result = addressMatchProxyService.parserAll(convertModelToMap(model)); - if (result != null) { - mav.setModel(result); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - public Map convertModelToMap(AddesssMatchModel model) { - - Map params = new HashMap(); - Class clzz = model.getClass(); - for (Field field : clzz.getDeclaredFields()) { - field.setAccessible(true); - String paramName = field.getName(); - try { - Object val = field.get(model); - if (val != null) { - params.put(paramName, val.toString()); - } - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - } - return params; - } - - private void verify(Building building) { - String city = building.getCity(); - String region = building.getDistrict(); - String name = null; - if (building.getPrecise() > -1) { - name = building.getName(); - } else { - name = building.getSearchAddress().getOrgKeywords(); - } - if (StringUtils.isNotBlank(region) && StringUtils.isNotBlank(name)) { - String buildingNumber = AddressParserUtil - .standardizeBuildingNumber(building.getSearchAddress().getOrgBuildingNumber()); - if (buildingNumber != null) { - if (houseLoudongService.findHouseLoudong(city, region, name, buildingNumber, null, null) != null) { - building.getSearchAddress().setBuildingNumberCertified(true); - } else if (fjtEvaluationService.findFjtEvaluationByConditions(city, region, name, buildingNumber, - null) != null) { - building.getSearchAddress().setBuildingNumberCertified(true); - } else if (evaluationService.findEvaluationByNum(city, region, name, buildingNumber, null) != null) { - building.getSearchAddress().setBuildingNumberCertified(true); - } - } - - String roomNumber = AddressParserUtil.standardizeRoomNumber(building.getSearchAddress().getOrgRoomNumber()); - if (roomNumber != null) { - if (houseLoudongService.findHouseLoudong(city, region, name, null, null, roomNumber) != null) { - building.getSearchAddress().setRoomNumberCertified(true); - } else if (fjtEvaluationService.findFjtEvaluationByConditions(city, region, name, null, - roomNumber) != null) { - building.getSearchAddress().setRoomNumberCertified(true); - } else if (evaluationService.findEvaluationByNum(city, region, name, null, roomNumber) != null) { - building.getSearchAddress().setRoomNumberCertified(true); - } - } - } - } - - @Authority(role = Role.NONE) - public Object sendFetchTaskAction(AddressModel model) { - - RestfulModelAndView json = new RestfulModelAndView(); - WaitCrawlKeywords waitCrawlKeywords = new WaitCrawlKeywords(); - waitCrawlKeywords.setCity(model.getCity()); - waitCrawlKeywords.setDateCreated(new Date()); - waitCrawlKeywords.setRead(0); - waitCrawlKeywords.setKeywords(model.getAddress()); - waitCrawlKeywordsService.save(waitCrawlKeywords); - json.setModel(waitCrawlKeywords); - - return json; - } - - private void submitFetchTask(Building building) { - if (building.getPrecise() == -1) { - List keywords = new ArrayList(); - Address address = building.getSearchAddress(); - if (StringUtils.isNotBlank(address.getKeywords()) && address.getKeywords().length() > 2) { - keywords.add(address.getKeywords()); - } else if (address.getOrgAddress().length() > 2 && address.getOrgAddress().length() < 10) {// 一般小区名不会超过10个字 - keywords.add(address.getOrgAddress()); - } - if (address.isStandardAddress()) { - if (address.getStreetNumbers() != null) { - for (String b : address.getStreetNumbers()) { - keywords.add(address.getStreet() + b); - } - } else { - keywords.add(address.getStreet()); - } - } - keywords = DataUtil.uniqueList(keywords); - for (String k : keywords) { - WaitCrawlKeywords waitCrawlKeywords = new WaitCrawlKeywords(); - waitCrawlKeywords.setCity(address.getCity()); - waitCrawlKeywords.setDateCreated(new Date()); - waitCrawlKeywords.setRead(0); - waitCrawlKeywords.setKeywords(k); - waitCrawlKeywordsService.save(waitCrawlKeywords); - } - } - } - - /** - * 从Excel表中加载测试数据 - * - * @return - */ - private List> loadTestDataFromExcel(String excelFileName) { - List> ret = new ArrayList>(); - FileInputStream fileInputStream = null; - try { - fileInputStream = new FileInputStream(excelFileName); - HSSFWorkbook workbook = new HSSFWorkbook(fileInputStream); - HSSFSheet sheet = workbook.getSheetAt(0); - // 行号 - boolean isFirstRow = true; - for (Row row : sheet) { - if (isFirstRow) { - // 第一行,过掉 - isFirstRow = false; - continue; - } - - // 得到列数 - // row.getPhysicalNumberOfCells(); - String in_name = row.getCell(1).toString(); - if (in_name.equals("")) { - // 跳过空内容 - continue; - } - Map data = new HashMap(); - // 第0列:城市 - data.put("city", row.getCell(0).toString()); - // 第一列:输入地址 - data.put("in_name", in_name); - // 第二列:期望名称,用于验证 - Cell cell = row.getCell(2); - if (cell != null) { - data.put("out_name", cell.toString()); - } - ret.add(data); - } - } catch (IOException e) { - e.printStackTrace(); - } finally { - if (fileInputStream != null) { - try { - fileInputStream.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return ret; - } - - /** - * 从Excel表中加载测试数据 - * - * @return - */ - private List> loadJingDongTestDataFromExcel(String excelFileName) { - - List> ret = new ArrayList>(); - FileInputStream fileInputStream = null; - try { - fileInputStream = new FileInputStream(excelFileName); - HSSFWorkbook workbook = new HSSFWorkbook(fileInputStream); - HSSFSheet sheet = workbook.getSheetAt(0); - // 行号 - boolean isFirstRow = true; - for (Row row : sheet) { - if (isFirstRow) {// 第一行,过掉 - isFirstRow = false; - continue; - } - String province = row.getCell(0).toString(); - String city = row.getCell(1).toString(); - String in_address = row.getCell(2).toString(); - if (StringUtils.isBlank(in_address) || StringUtils.isBlank(city) || StringUtils.isBlank(province)) { // 跳过空内容 - System.out.println("-->" + row.getRowNum()); - continue; - } - - Map formate = analyseAddress(in_address); - Map data = new HashMap(); - data.put("in_address", in_address); - data.put("city", city); - String formattedAddress = new String(in_address); - List huanxian = Arrays.asList("中环外环之间", "内环以内", "内环中环之间", "中环以内", "外环以外", "(内环高速以里)", "外环外其它地区", - "五环以外", "六环以内", "内环到三环里", "内环到二环里", "二环里", "三环到四环之间", "二环到三环", "四环到五环之间", "二环到三环", "五环至六环之间", - "五环到六环之间", "五环到六环之间", "三环以内", "四环到五环内", "六环以外(其他地区)", "六环以外(张家湾镇、台湖镇、漷县镇)", "六环以外(宋庄镇)", - "一环到二环", "六环以外", "四环至五环之间", "六环外(马驹桥镇)"); - for (String a : huanxian) { - formattedAddress = formattedAddress.replace(a, ""); - } - data.put("formatted_in_address", formattedAddress); - data.put("province", province); - if (formate.get("city") != null) { - data.put("formatedCity", formate.get("city")); - } else { - if (city.endsWith("市") || city.endsWith("县")) { - city = city.substring(0, city.length() - 1); - } else { - if (province.endsWith("市")) { - city = province.substring(0, province.length() - 1); - } else { - city = province; - } - } - data.put("formatedCity", city); - } - ret.add(data); - } - } catch (IOException e) { - e.printStackTrace(); - } finally { - if (fileInputStream != null) { - try { - fileInputStream.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return ret; - } - - private JSONObject addTerm(String name, String value){ - JSONObject term = new JSONObject(); - JSONObject match = new JSONObject(); - match.put(name, value); - term.put("term", match); - return term; - } - - private JSONObject addMatchPhrase(String name, String value){ - JSONObject term = new JSONObject(); - JSONObject match = new JSONObject(); - match.put(name, value); - term.put("match_phrase", match); - return term; - } - - /*** - * 获取自然村 - * @param city - * @param region - * @param name - * @return - */ - private List findVillage(String city, String region, String name) { - JSONObject reqBody = new JSONObject(); - reqBody.put("from", 0); - reqBody.put("size", 5); - JSONObject query = new JSONObject(); - JSONObject bool = new JSONObject(); - JSONArray must = new JSONArray(); - must.add(addTerm("city", city)); - must.add(addTerm("region", region)); - must.add(addTerm("name", name)); - bool.put("must", must); - query.put("bool", bool); - reqBody.put("query", query); - Base64 token = new Base64(); - String authenticationEncoding = token.encodeAsString((""+ES_USER+":"+ES_PASSWORD+"").getBytes()); - HttpRequest request = new HttpRequest(); - Map headers = new HashMap(); - headers.put("Content-Type", "application/json"); - headers.put("Authorization", "Basic "+authenticationEncoding+""); - try { - String response = request.postWithBody("http://192.168.0.45:9200/village/_search", reqBody, headers, "UTF-8"); - JSONObject json = JSONObject.fromObject(response); - if(!json.containsKey("hits") || !json.getJSONObject("hits").containsKey("hits")){ - return Collections.emptyList(); - } - JSONArray hits = json.getJSONObject("hits").getJSONArray("hits"); - List results = new ArrayList(); - for(int i=0 ;i < hits.size(); i++){ - JSONObject jsonObject = hits.getJSONObject(i); - results.add(jsonObject); - } - return results; - - } catch (HttpRequestException e) { - e.printStackTrace(); - } - return Collections.emptyList(); - } - - /** - * 加载测试数据 - * - * @return - */ - private List> loadTestData() { - BufferedReader reader = null; - List> ret = new ArrayList>(); - try { - reader = new BufferedReader( - new InputStreamReader(new FileInputStream("D:\\data\\addr\\test20140923.txt"), "utf-8")); - boolean isFirst = true; - while (true) { - String line = reader.readLine(); - if (line == null) { - break; - } - if (isFirst) { - isFirst = false; - int c = line.charAt(0); - if (c == 65279) { - // 去掉UTF-8中头标示 - line = line.substring(1); - } - } - ret.add(parseTestData(line)); - } - } catch (Exception e) { - e.printStackTrace(); - } finally { - if (reader != null) { - try { - reader.close(); - } catch (IOException e) { - - } - } - } - return ret; - } - - /** - * 解析测试数据,其中输入字符串为以TAB分隔的字符串,例如: in_name:经济技术开发区贵园北里丁区 out_name:贵园北里 - * - * @param s - * @return - */ - private Map parseTestData(String s) { - Map ret = new HashMap(); - String[] columns = s.split("\t"); - for (String column : columns) { - int index = column.indexOf(":"); - String key; - String value; - if (index > 0) { - key = column.substring(0, index); - value = column.substring(index + 1); - ret.put(key, value); - } - } - return ret; - } - - @Authority(role = Role.USER) - public Object parseAddressAction(AddressModel model) throws Exception { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (model.getCity() == null || model.getAddress() == null) { - return mav; - } - District district = addressService.parseAddress(model.getCity(), model.getAddress()); - if (district != null) { - Map resMap = new HashMap(); - resMap.put("city", district.getCity()); - resMap.put("region", district.getRegion()); - resMap.put("districtName", district.getName()); - resMap.put("address", district.getAddress()); - mav.setModel(resMap); - } - return mav; - } - - @Authority(role = Role.USER) - public Object geocoderAction(AddressModel model) throws Exception { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - - if (model.getCity() == null || model.getAddress() == null) { - return mav; - } - - double[] lngLat = addressService.getLngLat(model.getCity(), model.getAddress(), AK); - Map resMap = new HashMap(); - resMap.put("lng", lngLat[0]); - resMap.put("lat", lngLat[1]); - mav.setModel(resMap); - return mav; - } - - @Authority(role = Role.USER) - public Object geocoderBaiduToGoogleAction(AddressModel model) throws Exception { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - - if (model.getCity() == null || model.getAddress() == null) { - return mav; - } - - double[] lngLat = addressService.getLngLat(model.getCity(), model.getAddress(), AK); - Map resMap = new HashMap(); - resMap.put("lng", lngLat[0]); - resMap.put("lat", lngLat[1]); - mav.setModel(resMap); - return mav; - } - - @Deprecated - @Authority(role = Role.USER) - public Object addressEvaluationAction(AddressModel model) throws Exception { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - - if (model.getCity() == null || model.getAddress() == null || model.getArea() == null) { - return mav; - } - - Map resMap = new HashMap(); - resMap.put("totalPrice", - addressService.evaluationByAddress(model.getCity(), model.getAddress(), model.getArea(), AK)); - mav.setModel(resMap); - return mav; - } - - @Deprecated - @Authority(role = Role.USER) - public Object addressEvaluation2Action(AddressModel model) throws Exception { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - - if (model.getCity() == null || model.getAddress() == null || model.getArea() == null) { - return mav; - } - - Date weekend = DateUtil.getThisSunday(new Date()); - if (model.getWeekend() != null) { - weekend = DateUtil.getThisSunday(model.getWeekend()); - } - - Map resMap = new HashMap(); - resMap.put("totalPrice", 0); - - District district = addressService.parseAddress(model.getCity(), model.getAddress()); - if (district == null) { - double[] lngLatBaidu = addressService.getLngLat(model.getCity(), model.getAddress(), AK); - if (lngLatBaidu == null) { - mav.setModel(resMap); - return mav; - } - double[] lngLatGoogle = addressService.geoconvBaiduToGoogle(lngLatBaidu[0], lngLatBaidu[1]); - double lng = lngLatGoogle[0]; - double lat = lngLatGoogle[1]; - List params = new ArrayList(); - SdQuery sdQuery = new SdQuery(); - if (lat < -90 && lat > 90 && lng < -180 && lng > 180) { - mav.setModel(resMap); - return mav; - } - params.add(new QueryParam("city", model.getCity())); - params.add(new QueryParam("visible", 0)); - sdQuery.setPoint(lat + "," + lng); - sdQuery.setField("lat_lng"); - sdQuery.setDistance("" + (500 / 1000d)); - params.add(new QueryParam(QueryParam.SD_PARAM_NAME, sdQuery)); - List districts = districtService.findAllByParams(params, 0, 3); - - int totalPrice = 0; - int tc = 0; - for (District dis : districts) { - Evaluation evaluation = new Evaluation(); - evaluation.setCity(dis.getCity()); - evaluation.setRegion(dis.getRegion()); - evaluation.setDistrictName(dis.getName()); - evaluation.setArea(model.getArea()); - evaluation.setSource("api_diZhiGuJia"); - evaluation = evaluationService.saveEvaluation(evaluation, weekend); - if (evaluation.getTotalPrice() != null && evaluation.getTotalPrice() > 0) { - totalPrice += evaluation.getTotalPrice(); - tc++; - } - } - if (tc > 0) { - resMap.put("totalPrice", totalPrice / tc); - } - // } - } else { - Evaluation evaluation = new Evaluation(); - evaluation.setCity(district.getCity()); - evaluation.setRegion(district.getRegion()); - evaluation.setDistrictName(district.getName()); - evaluation.setArea(model.getArea()); - evaluation.setSource("api_diZhiGuJia"); - evaluation = evaluationService.saveEvaluation(evaluation, weekend); - resMap.put("totalPrice", evaluation.getTotalPrice()); - - District dist = districtService.findDistrict( - new DistrictKey(district.getCity(), district.getRegion(), district.getName()), "district"); - if (null != dist) { - if (null != dist.getCarSiteCount() && dist.getCarSiteCount() > 0) { - resMap.put("carSiteCount", dist.getCarSiteCount()); - } - } - - CommData commData = commDataService.findCommDataByCity(district.getCity(), district.getRegion(), - district.getName(), "district"); - if (null != commData && commData.getLastCount() > 0) { - resMap.put("householdCount", commData.getLastCount()); - } - } - mav.setModel(resMap); - return mav; - } - - @Authority(role = Role.USER) - public Object addressStandardParserAction(AddressModel model) throws Exception { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - Map resMap = addressService.parseSelectAddressInfo(model.getCity(), model.getAddress()); - mav.setModel(resMap); - return mav; - } - - @Authority(role = Role.USER) - public Object addressStandardAction(AddressModel model) throws Exception { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - - model.setAddress(AddressParserUtils.filteSpecialChar(model.getAddress())); - Map resMap = addressService.parseSelectAddressInfo(model.getCity(), model.getAddress()); - resMap.put("oldAddress", model.getAddress()); - - if (resMap.get("city") == null || model.getAddress() == null) { - return mav; - } - - District district = null; - // 根据地址查找小区 - if (resMap.get("address") != null) { - district = addressService.parseAddress(resMap.get("city").toString(), resMap.get("address").toString()); - } - // 根据地址中提取出的小区名称查小区 - String oldName = resMap.get("oldName") != null ? resMap.get("oldName").toString() : null;// 地址中疑似小区 - if (district == null && null != oldName) { - district = addressService.parseAddress(resMap.get("city").toString(), oldName); - // 百度查小区 - if (district == null && null != oldName) { - Map ret = baiduApiService.mapSearchSimple(resMap.get("city").toString(), oldName, AK); - List rets = (List) ret.get("content"); - if (null != rets) { - boolean flag = false; - for (Map vo : rets) { - List> vs = (List>) vo.get("cla"); - if (vs == null) { - continue; - } - for (List list : vs) { - String s = list.get(1); - if (s.indexOf("小区") != -1 || s.indexOf("楼盘") != -1) { - flag = true; - resMap.put("name", oldName); - String baiduAddress = (String) vo.get("addr"); - if (StringUtils.isNotBlank(baiduAddress)) { - - if (StringUtils.isBlank((String) resMap.get("address"))) { - resMap.put("address", baiduAddress); - } - - } - - break; - } - } - } - - if (!flag && resMap.get("address") == null) { - resMap.put("address", oldName); - } - } - } - } - - if (district != null) { - District dist = districtService.findDistrict( - new DistrictKey(district.getCity(), district.getRegion(), district.getName()), "district"); - if (dist != null) { - district = dist; - } - resMap.put("status", "0"); - } else { - resMap.put("status", "1"); - } - - // 当businessMatch=1,并且进行小区匹配没有成功的情况下,进行商铺写字楼匹配 通过keyword查找 - if (null != model.getBusinessMatch() && model.getBusinessMatch() == 1 && resMap.get("status").equals("1") - && StringUtils.isNotBlank((String) resMap.get("city"))) { - if (StringUtils.isNotBlank(oldName)) { - district = districtService.findFirstByKeyword((String) resMap.get("city"), oldName); - } - - if (null == district && StringUtils.isNotBlank((String) resMap.get("address"))) { - district = districtService.findFirstByKeyword((String) resMap.get("city"), - (String) resMap.get("address")); - } - } - - if (district != null) { - - resMap.put("name", district.getName()); - resMap.put("region", district.getRegion()); - resMap.put("block", district.getBlock()); - resMap.put("cat", district.getCategory()); - resMap.put("alias", district.getAlias()); - - String tempAddress = (String) resMap.get("address"); - if (StringUtils.isBlank(tempAddress)) { - resMap.put("address", district.getAddress()); - } else { - if (tempAddress.indexOf("弄") == -1 && tempAddress.indexOf("号") == -1 || tempAddress.indexOf("街") == -1 - || tempAddress.indexOf("路") == -1) { - resMap.put("address", district.getAddress()); - } - } - } - - String lastAddress = (String) resMap.get("address"); - if (StringUtils.isNotBlank(lastAddress)) { - if (lastAddress.length() < 2) { - resMap.put("address", null); - } else { - resMap.put("address", AddressParserUtils.filteSpecialChar(resMap.get("address").toString())); - } - - } - resMap.remove("louDong"); - mav.setModel(resMap); - return mav; - } - - public Object address2DistrictAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - - String orgCity = model.getCity(); - String orgAddress = AddressParserUtils.filteSpecialChar(model.getAddress()); - if (StringUtils.isBlank(orgCity) || StringUtils.isBlank(orgAddress)) { - return mav; - } - - Map resMap = addressService.parseSelectAddressInfo(orgCity, orgAddress); - resMap.put("oldAddress", orgAddress); - resMap.remove("louDong"); - - if (null == resMap.get("city")) { - return mav; - } - - String city = (String) resMap.get("city"); - District district = null; - // 小区库匹配 - String address = (String) resMap.get("address"); - if (StringUtils.isNotBlank(address)) { - // 地址、小区名、别名匹配 - List params = new ArrayList(4); - params.add(new QueryParam("city", city)); - params.add(new QueryParam("category", "district")); - params.add(new QueryParam("visible", 0)); - - TermQuery q1 = new TermQuery(new Term("name", address)); - TermQuery q2 = new TermQuery(new Term("alias", address)); - TermQuery q3 = new TermQuery(new Term("address", address)); - BooleanQuery bq = new BooleanQuery(); - bq.add(q1, Occur.SHOULD); - bq.add(q2, Occur.SHOULD); - bq.add(q3, Occur.SHOULD); - params.add(new QueryParam(QueryParam.SR_PARAM_NAME, new SrQuery(bq))); - - List ds = districtService.findAllByParams(params, 0, 1); - if (CollectionUtils.isNotEmpty(ds)) { - district = ds.get(0); - } - } - - // 根据地址中提取出的小区名称查小区 - String oldName = StringUtils.trim((String) resMap.get("oldName")); - if (null == district && StringUtils.isNotBlank(oldName)) { - // 小区名、别名匹配 - List params = new ArrayList(4); - params.add(new QueryParam("city", city)); - params.add(new QueryParam("category", "district")); - params.add(new QueryParam("visible", 0)); - - TermQuery q1 = new TermQuery(new Term("name", oldName)); - TermQuery q2 = new TermQuery(new Term("alias", oldName)); - BooleanQuery bq = new BooleanQuery(); - bq.add(q1, Occur.SHOULD); - bq.add(q2, Occur.SHOULD); - params.add(new QueryParam(QueryParam.SR_PARAM_NAME, new SrQuery(bq))); - - List ds = districtService.findAllByParams(params, 0, 1); - if (CollectionUtils.isNotEmpty(ds)) { - district = ds.get(0); - } - } - - // 地址库匹配 - if (null == district) { - // todo - } - - if (null == district) { - resMap.put("status", 1); - } else { - resMap.put("status", 0); - resMap.put("name", district.getName()); - resMap.put("region", district.getRegion()); - resMap.put("block", district.getBlock()); - resMap.put("cat", district.getCategory()); - resMap.put("alias", district.getAlias()); - - String tempAddress = (String) resMap.get("address"); - if (StringUtils.isBlank(tempAddress)) { - resMap.put("address", district.getAddress()); - } else { - if (tempAddress.indexOf("弄") == -1 && tempAddress.indexOf("号") == -1 || tempAddress.indexOf("街") == -1 - || tempAddress.indexOf("路") == -1) { - resMap.put("address", district.getAddress()); - } - } - } - - String lastAddress = (String) resMap.get("address"); - if (StringUtils.isNotBlank(lastAddress)) { - if (lastAddress.length() < 2) { - resMap.put("address", null); - } else { - resMap.put("address", AddressParserUtils.filteSpecialChar(resMap.get("address").toString())); - } - } - - mav.setModel(resMap); - return mav; - } - - private String findStandardRegion(String city, String region) { - - List regionBloks = regionBlockService.getRegionBlockListByCity(city, null); - String s_region = ""; - if (regionBloks.size() > 0) { - for (RegionBlock regionBlock : regionBloks) { - List patterns = regionBlock.getPattern(); - if (null != patterns && patterns.contains(region)) { - s_region = regionBlock.getName(); - break; - } else { - if (regionBlock.getName().indexOf(region) != -1) { - s_region = region; - break; - } - } - } - } else { - s_region = region; - } - return s_region; - } - - /** - * 地址联想提示 (高德官方) /address/su 参数:address city - * 返回:[{"id":"XXXXXXXXX","city":"上海",region:"长宁","name":"xxx","address":"协和路"}] - * - * @return - */ - public Object suAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - try { - List list = addressService.suAmap(model.getCity().trim(), model.getAddress().trim());// su()是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(list); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } - - /** - * 地址真实性检查 (高德官方) /address/check 参数:chooseId address city - * 返回:{type:"存在|不存在|存疑",data:{"id":"XXXXXXXXX","city":"上海",region:"长宁","name":"xxx","address":"协和路"}} - * 存疑的时候才有data返回,返回高德搜索的第一条数据 (超过的时候,找到最大号码返回) - * - * @return - */ - public Object checkAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } - try { - AddressCheckBo bo = addressService.checkAmap(model.getChooseId(), city, model.getAddress().trim());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatAddressCheckBo(bo, city, model)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } - - /** - * 为返回值格式化掉cityCode和AddressId,用于评级和反欺诈 - * - * @param bo - * @return - */ - private AddressCheckBo formatAddressCheckBo2(AddressCheckBo bo, String city, AddressModel model) { - AddressCheck check = bo.getData(); - if (null != check) { - check.setCityCode(null); - if (StringUtils.isEmpty(check.getCity()) || "[]".equals(check.getCity())) { - check.setCity(city); - } - // if (StringUtils.isEmpty(check.getAddress()) || - // "[]".equals(check.getAddress())) { - // check.setAddress(check.getName()); - // } - // 检查相关参数 - if (FJW_LEVEL.equals(model.getDataLevel())) { - bo.setData(check); - } else { - check.setDistrictName(null); - check.setKeyWords(null); - check.setKeyWordsUse(null); - check.setRegion(null); - check.setProvionce(null); - check.setNameUse(null); - check.setAddressUse(null); - check.setAddress2(null); - check.setName2(null); - check.setType(null); - check.setFormatAddress(null); - check.setFormatAddress2(null); - check.setLocation2(null); - check.setLevel(null); - check.setScoreIncity(null); - check.setScoreInnation(null); - check.setPriceScore(null); - check.setAreaScore(null); - check.setEstateScore(null); - bo.setData(check); - } - } - if ("不存在".equals(bo.getType())) { - bo.setType("地址未找到:抱歉,在" + city + "没有找到与'" + model.getAddress() + "'相关的地点"); - } - return bo; - } - - /** - * 查询高德城市及城市编码 - * - * @return - */ - public Object cityAllAction() { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - List list = addressService.findAllCityAmap(); - BasicModel model = new BasicModel(HttpStatusCodeEnum.OK); - model.setResult(list); - mav.setModel(model); - return mav; - } - - /** - * 地址联想提示 (代理) - * - * @return - */ - public Object suAmapAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - try { - List list = addressService.su(model.getCity().trim(), model.getAddress().trim()); - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(list); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } - - /** - * 地址真实性检查 (代理) - * - * @return - */ - public Object checkAmapAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } - try { - AddressCheckBo bo = addressService.check(model.getChooseId(), city, model.getAddress().trim()); - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatAddressCheckBo(bo, city, model)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } - - /** - * 地址评级 - * - * @param model - * (city+address)+addressId - * @return { "code": 200, "msg": "ok", "result": { "data": { "address": "匹配地址", - * "city": "城市", "keyWords": "用户输入", "keyWordsUse": "用户输入格式化", "lat": - * 经纬度, "lng": 经纬度, "name": "匹配POIName", "score": 评分 }, "type": "可能存在" } - * } - */ - public Object gradeAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } - - try { - AddressCheckBo bo = addressService.gradeAmap(model.getChooseId(), city, model.getAddress().trim());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatAddressCheckBo2(bo, city, model)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } - - /** - * 地址反欺诈 (地址验真+周边查询) - * - * @param model - * (city+address)+addressId - * @return { "code": 200, "msg": "ok", "result": { "data": { "address": "匹配地址", - * "city": "城市", "keyWords": "用户输入", "keyWordsUse": "用户输入格式化", "lat": - * 纬度, "lng": 经度, "name": "匹配POIName", "poiList":[ { "name" : - * "文洋大厦停车场(协和路)", "type" : "类型", "address" : "协和路1033号", "lat": 纬度, - * "lng": 经度, "distance":距离 },... ] }, "type": "存在" } } - */ - public Object antiFraudAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } - - try { - AddressCheckBo bo = addressService.antiFraudAmap(model.getChooseId(), city, model.getAddress().trim(), - model.getType(), model.getRadius(), model.getNumber(), model.getPageNo());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatAddressCheckBo2(bo, city, model)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } - - /** - * 地址反欺诈 (地址验真+周边查询) - * - * @param model - * (city+address)+addressId - * @return { "code": 200, "msg": "ok", "result": { "data": { "address": - * "德州路220弄小区", "addressId": "d525e60aab2e84909d2fd998b0af5e8e", "city": - * "上海市", "keyWords": "德州路220弄", "keyWordsUse": "德州路220弄", "lat": - * 31.167814, "lng": 121.495784, "name": "上海后来居上家庭公寓(德州路分店)", "poiMap": - * { "加油站": [ { "address": "杨思路648号", "distance": "642.0m", "lat": - * 31.162078, "lng": 121.496522, "name": "中国石化加油站(杨思路)", "type": "加油站" - * }, { "address": "杨思路2号", "distance": "1.6km", "lat": 31.15627, "lng": - * 121.485031, "name": "中国石油杨思加油站(杨思路)", "type": "加油站" }, ... ] } ... }, - * "type": "存在" } } - */ - public Object antiFraudBAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } - - try { - AddressCheckBo bo = addressService.antiFraudAmapB(model.getChooseId(), city, model.getAddress().trim(), - model.getType(), model.getRadius(), model.getNumber());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatAddressCheckBo2(bo, city, model)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } - - public Object standardAction(AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - String result = addressMatchProxyService.standard(convertModelToMap(model)); - if (result != null) { - JSONObject json = JSONObject.fromObject(result); - int code = json.getInt("code"); - String msg = json.getString("msg"); - BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ - basicModel.setResult(json.get("result")); - } - mav.setModel(basicModel); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - /** - * 地址标准化接口V2 - * - * @param model - * @return - */ - public Object standard2Action(AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - - HttpRequest request = new HttpRequest(); - JSONObject json = null; - Map params = new HashMap(); - params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); - params.put("address", model.getAddress()); - params.put("showCode", model.getShowCode()); - try{ - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structure", params, "UTF-8"); - } catch(Exception e){ - try { - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structure", params, "UTF-8"); - } catch(Exception ex){ - ex.printStackTrace(); - } - } - - if (json != null) { - int code = json.getInt("status"); - String msg = json.getString("msg"); - BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ - basicModel.setResult(json.get("result")); - } - mav.setModel(basicModel); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - /** - * 招商证券POC测试接口封装 - */ - public Object cmbTestAction(AddesssMatchModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - HttpRequest request = new HttpRequest(); - JSONObject json = null; - Map params = new HashMap(); - params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); - params.put("address", model.getAddress()); - try{ - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/cmbTest", params, "UTF-8"); - } catch(Exception e){ - try { - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/cmbTest", params, "UTF-8"); - } catch(Exception ex){ - ex.printStackTrace(); - } - } - - if (json != null) { - int code = json.getInt("status"); - String msg = json.getString("msg"); - BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ - basicModel.setResult(json.get("result")); - } - mav.setModel(basicModel); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - /** - * 五级地址标准化接口 - * - * @param model - * @return - */ - public Object fiveDivisionStructureAction(AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - - HttpRequest request = new HttpRequest(); - JSONObject json = null; - Map params = new HashMap(); - params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); - params.put("address", model.getAddress()); - // 地址验证无效也输出标准化结果 - params.put("flag", "true"); - try{ - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure", params, "UTF-8"); - } catch(Exception e){ - try { - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure", params, "UTF-8"); - } catch(Exception ex){ - ex.printStackTrace(); - } - } - - if (json != null) { - int code = json.getInt("status"); - String msg = json.getString("msg"); - BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ - basicModel.setResult(json.get("result")); - } - mav.setModel(basicModel); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - /** - * 五级行政区划V2地址标准化接口 - * - * @param model - * @return - */ - public Object fiveDivisionStructure2Action(AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - - HttpRequest request = new HttpRequest(); - JSONObject json = null; - Map params = new HashMap(); - params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); - params.put("address", model.getAddress()); - // 地址验证无效也输出标准化结果 - params.put("flag", "true"); - try{ - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure/v2", params, "UTF-8"); - } catch(Exception e){ - try { - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure/v2", params, "UTF-8"); - } catch(Exception ex){ - ex.printStackTrace(); - } - } - - if (json != null) { - int code = json.getInt("status"); - String msg = json.getString("msg"); - BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ - basicModel.setResult(json.get("result")); - } - mav.setModel(basicModel); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - /** - * 详细地址标准化接口 - * - * @param model - * @return - */ - public Object divisionStructureAction(AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - - HttpRequest request = new HttpRequest(); - JSONObject json = null; - Map params = new HashMap(); - params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); - params.put("address", model.getAddress()); - // 地址验证无效也输出标准化结果 - params.put("flag", "true"); - try{ - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/divisionStructure", params, "UTF-8"); - } catch(Exception e){ - try { - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/divisionStructure", params, "UTF-8"); - } catch(Exception ex){ - ex.printStackTrace(); - } - } - - if (json != null) { - int code = json.getInt("status"); - String msg = json.getString("msg"); - BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ - basicModel.setResult(json.get("result")); - } - mav.setModel(basicModel); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - /** - * 地址标准化专用测试接口 - * @param model - * @return - */ - public Object structureAndCompleteAction(AddesssMatchModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - - HttpRequest request = new HttpRequest(); - JSONObject json = null; - Map params = new HashMap(); - params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); - params.put("address", model.getAddress()); - // 地址验证无效也输出标准化结果 - params.put("flag", "true"); - try{ - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structureAndComplete", params, "UTF-8"); - } catch(Exception e){ - try { - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structureAndComplete", params, "UTF-8"); - } catch(Exception ex){ - ex.printStackTrace(); - } - } - - if (json != null) { - int code = json.getInt("status"); - String msg = json.getString("msg"); - BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ - basicModel.setResult(json.get("result")); - } - mav.setModel(basicModel); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - /** - * 地址信息分类接口 - * @param model - * @return - */ - public Object communitySummaryAction(CommunitySummaryRequestDto model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - - HttpRequest request = new HttpRequest(); - JSONObject json = null; - try{ - Map headers = new HashMap(); - headers.put("Content-Type", "application/json"); - - JSONObject reqBody = new JSONObject(); - reqBody.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); - reqBody.put("address", model.getAddress()); - reqBody.put("area", model.getArea()); - reqBody.put("maxFloor", model.getMaxFloor()); - reqBody.put("housePurpose", model.getHousePurpose()); - reqBody.put("memo", model.getMemo()); - - String result = request.postWithBody("http://192.168.0.100:32080/FangJiaAddressService/communitySummary", reqBody ,headers, "UTF-8"); - if(result != null){ - try{ - json = JSONObject.fromObject(result); - } catch(Exception e){ - json = null; - } - } - } catch(Exception e){ - e.printStackTrace(); - } - - if (json != null) { - int code = json.getInt("status"); - String msg = json.getString("msg"); - BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ - basicModel.setResult(json.get("result")); - } - mav.setModel(basicModel); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - /** - * 楼盘评级 - * @param model - * @return - */ - public Object buildingRatingAction(CommunitySummaryRequestDto model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - - HttpRequest request = new HttpRequest(); - JSONObject json = null; - try{ - Map headers = new HashMap(); - headers.put("Content-Type", "application/json"); - - JSONObject reqBody = new JSONObject(); - reqBody.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); - reqBody.put("address", model.getAddress()); - reqBody.put("area", model.getArea()); - reqBody.put("maxFloor", model.getMaxFloor()); - reqBody.put("housePurpose", model.getHousePurpose()); - reqBody.put("memo", model.getMemo()); - String result = request.postWithBody("http://192.168.0.100:32080/FangJiaAddressService/buildingRating", reqBody, headers, "UTF-8"); - if(result != null){ - try{ - json = JSONObject.fromObject(result); - } catch(Exception e){ - json = null; - } - } - } catch(Exception e){ - e.printStackTrace(); - } - - if (json != null) { - int code = json.getInt("status"); - String msg = json.getString("msg"); - BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ - basicModel.setResult(json.get("result")); - } - mav.setModel(basicModel); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - /** - * 财力评级 - * @param model - * @return - */ - public Object financialRatingAction(CommunitySummaryRequestDto model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } - - HttpRequest request = new HttpRequest(); - JSONObject json = null; - try{ - Map headers = new HashMap(); - headers.put("Content-Type", "application/json"); - - JSONObject reqBody = new JSONObject(); - reqBody.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); - reqBody.put("address", model.getAddress()); - reqBody.put("area", model.getArea()); - reqBody.put("maxFloor", model.getMaxFloor()); - reqBody.put("housePurpose", model.getHousePurpose()); - reqBody.put("memo", model.getMemo()); - String result = request.postWithBody("http://192.168.0.100:32080/FangJiaAddressService/financialRating", reqBody, headers,"UTF-8"); - if(result != null){ - try{ - json = JSONObject.fromObject(result); - } catch(Exception e){ - json = null; - } - } - } catch(Exception e){ - e.printStackTrace(); - } - - if (json != null) { - int code = json.getInt("status"); - String msg = json.getString("msg"); - BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ - basicModel.setResult(json.get("result")); - } - mav.setModel(basicModel); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - public Object similarityAction(AddesssMatchModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress_1()) || StringUtils.isBlank(model.getAddress_2())) { - mav.setModel(BasicModel.buildBadRequestModel("两个地址均不能为空")); - return mav; - } - model.setAddress(model.getAddress_1()); - String result1 = addressMatchProxyService.standard(convertModelToMap(model)); - model.setAddress(model.getAddress_2()); - String result2 = addressMatchProxyService.standard(convertModelToMap(model)); - if (result1 != null && result2 != null) { - Map resultMap = addressService.addressSimilarity(result1, result2); - mav.setModel(BasicModel.buildOKModel().setResult(resultMap)); - } else { - mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); - } - return mav; - } - - public Object parseCityAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getProvince())) { - mav.setModel(BasicModel.buildBadRequestModel("province不能为空")); - return mav; - } - if (StringUtils.isBlank(model.getDistrict())) { - mav.setModel(BasicModel.buildBadRequestModel("district不能为空")); - return mav; - } - CityParseBo bo = addressService.cityParse(model.getProvince(), model.getDistrict()); - if (bo.getCity() != null) { - UniversalDto dto = UniversalDto.newDto(); - dto.append("city", bo.getCity()); - mav.setModel(BasicModel.buildOKModel().setResult(dto)); - } else { - mav.setModel(BasicModel.buildModel(40001, bo.getMsg())); - } - return mav; - } - - public Object realStandardAction(AddressModel model) { - - RestfulModelAndView mav = new RestfulModelAndView(); - if (!OpenConfig.getConfig().addressMatchEnabled()) { - mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); - return mav; - } - if (StringUtils.isBlank(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); - return mav; - } + private AddressService addressService; + private DistrictService districtService; + private EvaluationService evaluationService; + private CommDataService commDataService; + private RegionBlockService regionBlockService; + private BaiduApiService baiduApiService; + private AddressParser addressParser; + private ServerAreaService serverAreaService; + private AddressParserService addressParserService; + private WaitCrawlKeywordsService waitCrawlKeywordsService; + private HouseLoudongService houseLoudongService; + private FjtEvaluationService fjtEvaluationService; + private AddressMatchProxyService addressMatchProxyService; + + private final static String AK = OpenConfig.getConfig().getBaiduAk(); + private final static Logger LOGGER = LoggerFactory.getLogger(AddressController.class); + + private static Map> districts_cache = new HashMap>(); + + private static final String FJW_LEVEL = "5CAE1FAC646CB2D8"; + private static final String GRADE_AREA = "区域评分"; + private static final String GRADE_CITY = "城市评分"; + private static final String GRADE_NATION = "全国评分"; + private static final String GRADE_CONSUME = "消费评分"; + + public final static OpenConfig CONFIG = OpenConfig.getConfig(); + private static final String ES_USER = "developer"; + private static final String ES_PASSWORD = "5e8edd851d2fdfbd7415232c67367cc3"; + + /** + * @param model + * @return + * @deprecated see parse2Action + */ + @Authority(role = Role.USER) + public Object parseAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setModel(addressParser.parse(model.getCity(), model.getAddress(), model.getTarget(), model.isNearby())); + return mav; + } + + @Authority(role = Role.USER) + public Object parse2Action(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + if (ServerAreaData.getServerAreaByCity(model.getCity()) == null) { + HashMap resMap = new HashMap(); + resMap.put("status", 0); + resMap.put("precise", -1); + resMap.put("searchKey", model.getAddress()); + mav.setModel(resMap); + return mav; + } + mav.setModel(addressParser.parse2(model.getCity(), model.getAddress(), model.getTarget(), model.isNearby())); + return mav; + } + + /** + * 解析地址,能够返回多个结果 参数有:city 城市 address 地址 includeMaps + * 匹配的结果是否包含来自地图的数据,true表示结果包含来自地图的数据 max 返回的结果集中最多条数 + * + * @param model + * @return + */ + @Authority(role = Role.USER) + public Object parseAsListAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setModel( + addressParser.parseAsList(model.getCity(), model.getAddress(), model.isIncludeMaps(), model.getMax())); + return mav; + } + + @Authority(role = Role.USER) + public Object cacheFlushAction(AddesssMatchModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + String result = addressMatchProxyService.cacheFlush(convertModelToMap(model)); + mav.setModel(result); + return mav; + } + + @Authority(role = Role.USER) + public Object analyzeAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getCity())) { + mav.setModel(BasicModel.buildBadRequestModel("城市不能为空")); + return mav; + } + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + HttpRequest request = new HttpRequest(); + Map params = new HashMap(); + params.put("address", model.getAddress()); + params.put("city", model.getCity()); + try { + JSONObject result = request.getJsonContent("http://192.168.0.19:38080/FangJiaHelper/address/analyze/api", params, "UTF-8"); + mav.setModel(BasicModel.buildOKModel().setResult(result)); + } catch (HttpRequestException e) { + e.printStackTrace(); + } + return mav; + } + + public Object rateAction(@Valid RateModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + JSONArray dataList; + try { + dataList = JSONArray.fromObject(model.getData()); + } catch (Exception e) { + mav.setModel(BasicModel.buildBadRequestModel("数据格式错误")); + return mav; + } + List metaDatas = new ArrayList(dataList.size()); + JSONObject item; + AddressMatchMetaData metaData; + Map idMap = new HashMap(dataList.size()); + for (int i = 0; i < dataList.size(); i++) { + item = dataList.getJSONObject(i); + metaData = new AddressMatchMetaData(); + if (item.containsKey("city")) { + metaData.setCity(item.getString("city")); + } else { + metaData.setCity(model.getCity()); + } + if (item.containsKey("district")) { + metaData.setDistrict(item.getString("district")); + } + metaData.setMainName(item.getString("name")); + metaData.addName(item.getString("name"), MatchText.MAIN_NAME_PRIORITY); + if (item.containsKey("address")) { + Map addrWeightMap = analyseAddress(model.getCity(), item.getString("address")); + for (String addr : addrWeightMap.keySet()) { + metaData.addAddress(addr, addrWeightMap.get(addr)); + } + } + if (item.containsKey("uid")) { + metaData.setId(item.getString("uid")); + idMap.put(metaData.getId(), item); + } + if (item.containsKey("lng")) { + metaData.setLng(item.getDouble("lng")); + } + if (item.containsKey("lat")) { + metaData.setLat(item.getDouble("lat")); + } + metaData.setBuildingType(BuildingType.DISTRICT); + metaDatas.add(metaData); + } + AddressRate addressRate = addressParserService.rate(model.getCity(), model.getAddress(), metaDatas); + List results = new ArrayList(metaDatas.size()); + for (AddressMatchMetaData meta : addressRate.getMetaData()) { + JSONObject result = idMap.get(meta.getId()); + results.add(result); + } + mav.setModel(BasicModel.buildOKModel().setResult(results)); + return mav; + } + + private Map analyseAddress(String city, String address) { + + if (StringUtils.isBlank(address)) { + return Collections.EMPTY_MAP; + } + try { + Address addr = addressParserService.standardize(city, address); + if (!addr.isAvailable()) { + return Collections.EMPTY_MAP; + } + Map addrWeightMap = new HashMap(); + + if (StringUtils.isNotBlank(addr.getStreet())) { + String street = addr.getStreet(); + List streets = new ArrayList(); + streets.add(street); + if (street.endsWith("弄")) { + addrWeightMap.put(street, MatchText.MAIN_ADDR_PRIORITY); + addrWeightMap.put(street.replaceAll("弄$", "号"), MatchText.GEN_ADDR_PRIORITY); + streets.add(street.replaceAll("弄$", "号")); + } + if (StringUtils.isNotBlank(addr.getStreetNumber())) { + for (String s : streets) { + if (addr.getStreetNumber().endsWith("号")) { + addrWeightMap.put(s + addr.getStreetNumber().replaceAll("号$", "弄"), + MatchText.GEN_ADDR_PRIORITY); + } else if (street.endsWith("弄")) { + addrWeightMap.put(s + addr.getStreetNumber().replaceAll("弄$", "号"), + MatchText.GEN_ADDR_PRIORITY); + } + } + } + + if (CollectionUtils.isNotEmpty(addr.getStreetNumbers())) { + addrWeightMap.put(street + addr.getStreetNumber(), MatchText.MAIN_ADDR_PRIORITY); + for (String s : streets) { + for (String streetNumber : addr.getStreetNumbers()) { + if (streetNumber.endsWith("号")) { + addrWeightMap.put(s + streetNumber.replaceAll("号$", "弄"), MatchText.GEN_ADDR_PRIORITY); + } else if (street.endsWith("弄")) { + addrWeightMap.put(s + streetNumber.replaceAll("弄$", "号"), MatchText.GEN_ADDR_PRIORITY); + } + } + } + } + + } else { + addrWeightMap.put(addr.getMiniAddress(), MatchText.MAIN_ADDR_PRIORITY); + } + return addrWeightMap; + } catch (Exception e) { + + } + return Collections.EMPTY_MAP; + + } + + public Object standardizeAction(AddressModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + Address address = addressParserService.standardize(model.getCity(), model.getAddress()); + mav.setModel(BasicModel.buildOKModel().setResult(address)); + return mav; + } + + public Object realCertificateAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (!OpenConfig.getConfig().addressMatchEnabled()) { + mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); + return mav; + } + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + MatchParams matchParams = new MatchParams(); + matchParams.setCity(model.getCity()); + matchParams.setAddress(model.getAddress()); + matchParams.setAddressParserGoal(AddressParserGoal.Certificate); + matchParams.setPreciseLevel(PreciseLevel.STRICT); + Building building = addressParserService.certificate(matchParams); + Address address = building.getSearchAddress(); + UniversalDto dto = UniversalDto.newDto(); + dto.append("province", address.getProvince()); + dto.append("city", address.getCity()); + if (address.getDistrict() != null) { + dto.append("district", address.getDistrict()); + } else { + dto.append("district", building.getDistrict()); + } + dto.append("developmentZone", address.getDevelopmentZone()); + dto.append("township", address.getTownship()); + dto.append("street", address.getStreet()); + dto.append("streetNumber", address.getStreetNumber()); + dto.append("name", building.getSuggestName()); + dto.append("buildingNumber", address.getBuildingNumber()); + dto.append("unitNumber", address.getUnitNumber()); + dto.append("roomNumber", address.getRoomNumber()); + dto.append("formattedAddress", address.getFormattedAddress()); + dto.append("certified", address.getCertified()); + dto.append("floor", address.getFloor()); + mav.setModel(BasicModel.buildOKModel().setResult(dto)); + return mav; + } + + public Object certificateAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + String result = addressMatchProxyService.certificate(convertModelToMap(model)); + if (result != null) { + mav.setModel(result); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + public Object authAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + String result = addressMatchProxyService.auth(convertModelToMap(model)); + if (result != null) { + mav.setModel(result); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + public Object realAuthAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + if (!OpenConfig.getConfig().addressMatchEnabled()) { + mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); + return mav; + } + MatchParams matchParams = new MatchParams(); + matchParams.setCity(model.getCity()); + matchParams.setAddress(model.getAddress()); + matchParams.setAddressParserGoal(AddressParserGoal.Certificate); + matchParams.setUseMap(true); + Building building = addressParserService.certificate(matchParams); + Address address = building.getSearchAddress(); + UniversalDto dto = UniversalDto.newDto(); + dto.append("province", address.getProvince()); + dto.append("city", address.getCity()); + dto.append("district", address.getDistrict()); + dto.append("developmentZone", address.getDevelopmentZone()); + dto.append("township", address.getTownship()); + dto.append("street", address.getStreet()); + dto.append("streetNumber", address.getStreetNumber()); + dto.append("buildingNumber", address.getBuildingNumber()); + dto.append("unitNumber", address.getUnitNumber()); + dto.append("roomNumber", address.getRoomNumber()); + dto.append("formattedAddress", address.getFormattedAddress()); + List certified = address.getCertified(); + if (certified.contains("roomNumber")) { + dto.append("authLevel", "A"); + } else if (certified.contains("buildingNumber")) { + dto.append("authLevel", "B"); + } else { + dto.append("authLevel", "C"); + } + mav.setModel(BasicModel.buildOKModel().setResult(dto)); + return mav; + } + + public Map analyseAddress(String address) { + Map ret = new HashMap(); + ret.put("address", address); + if (districts_cache.isEmpty()) { + List serverAreas = serverAreaService.findAll(); + for (ServerArea serverArea : serverAreas) { + if (StringUtils.isBlank(serverArea.getProvince())) { + continue; + } + String city = serverArea.getDisplay(); + String province = serverArea.getProvince(); + List cities = districts_cache.get(province); + if (cities == null) { + cities = new ArrayList(); + districts_cache.put(province, cities); + } + if (!cities.contains(city)) { + cities.add(city); + } + } + } + + for (Entry> p : districts_cache.entrySet()) { + if (address.startsWith(p.getKey())) { + ret.put("province", p.getKey()); + List cities = p.getValue(); + if (cities.size() == 1 && cities.contains(p.getKey())) {// 直辖市 + ret.put("city", p.getKey()); + } else { + String temp = address.substring(p.getKey().length());// 移除省份 + if (temp.startsWith("省") || temp.startsWith("市") || temp.startsWith("县") || temp.startsWith("区")) { + temp = temp.substring(1); + } + for (String c : cities) { + if (temp.startsWith(c)) { + ret.put("city", c); + break; + } + } + } + break; + } + } + return ret; + } + + @Authority(role = Role.USER) + public Object matchAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + String result = addressMatchProxyService.parser(convertModelToMap(model)); + if (result != null) { + JSONObject json = JSONObject.fromObject(result); + BasicModel resultModel = new BasicModel(json.getInt("code"), json.getString("msg")); + resultModel.setResult(json.get("result")); + mav.setModel(resultModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 地址匹配第二个版本,基于第一个版本的逻辑,对匹配出的结果进行正确性的判断 + * + * @param model + * @return + * @author yinjihuan + */ + @Authority(role = Role.USER) + public Object matchV2Action(AddesssMatchModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + String result = addressMatchProxyService.parser(convertModelToMap(model)); + JSONObject json = JSONObject.fromObject(result); + BasicModel resultModel = new BasicModel(json.getInt("code"), json.getString("msg")); + if (result != null) { + JSONObject jsonResult = (JSONObject) json.get("result"); + if (jsonResult != null && jsonResult.getDouble("credit") > 0) { + CheckMatchDistrictCorrectParam param = new CheckMatchDistrictCorrectParam(); + String city = jsonResult.getString("city"); + String region = jsonResult.getString("district"); + String name = jsonResult.getString("name"); + param.setCity(city); + param.setRegion(region); + param.setName(name); + param.setInputAddress(model.getAddress()); + if (jsonResult.containsKey("lng")) { + param.setBlng(jsonResult.getDouble("lng")); + } + if (jsonResult.containsKey("lat")) { + param.setBlat(jsonResult.getDouble("lat")); + } + param.setDebug(model.isDebug()); + District district = districtService.findDistrict(new DistrictKey(city, region, name), "district"); + if (district != null && district.getLng() != null && district.getLng() > 0) { + param.setGlng(district.getLng() / 10000000000.0); + param.setGlat(district.getLat() / 10000000000.0); + } + MatchDistrictResult matchResult = addressMatchProxyService.checkMatchDistrictCorrect(param); + jsonResult.put("matchResult", matchResult); + if (jsonResult.containsKey("category")) { + if ("office".equals(jsonResult.getString("category"))) { + jsonResult.put("propertyType", "写字楼"); + } else if ("shop".equals(jsonResult.getString("category"))) { + jsonResult.put("propertyType", "商铺"); + } + } + } else if (jsonResult != null) { + // 判断是否为自然村 + boolean matchedVillage = false; + try { + if (jsonResult.get("searchAddress") != null) { + JSONObject searchAddress = (JSONObject) jsonResult.get("searchAddress"); + String city = searchAddress.containsKey("city") ? searchAddress.getString("city") : null; + String region = searchAddress.containsKey("district") ? searchAddress.getString("district") : null; + String name = searchAddress.containsKey("keywords") ? searchAddress.getString("keywords") : null; + String township = searchAddress.containsKey("township") ? searchAddress.getString("township") : null; + if (StringUtils.isNotBlank(city) && StringUtils.isNotBlank(region) && StringUtils.isNotBlank(name)) { + List villages = findVillage(city, region, name); + if (CollectionUtils.isNotEmpty(villages)) { + if (villages.size() == 1 || StringUtils.isBlank(township)) { + JSONObject village = villages.get(0).getJSONObject("_source"); + jsonResult.put("id", villages.get(0).getString("_id")); + jsonResult.put("province", village.getString("province")); + jsonResult.put("city", village.getString("city")); + jsonResult.put("district", village.getString("region")); + jsonResult.put("township", village.getString("township")); + jsonResult.put("name", village.getString("name")); + jsonResult.put("lng", village.getJSONObject("location").getDouble("lon")); + jsonResult.put("lat", village.getJSONObject("location").getDouble("lat")); + jsonResult.put("propertyType", "自然村"); + matchedVillage = true; + } else { + for (JSONObject source : villages) { + JSONObject village = source.getJSONObject("_source"); + if (village.getString("township").contains(township) || township.contains(village.getString("township"))) { + jsonResult.put("id", source.getString("_id")); + jsonResult.put("province", village.getString("province")); + jsonResult.put("city", village.getString("city")); + jsonResult.put("district", village.getString("region")); + jsonResult.put("township", village.getString("township")); + jsonResult.put("name", village.getString("name")); + jsonResult.put("lng", village.getJSONObject("location").getDouble("lon")); + jsonResult.put("lat", village.getJSONObject("location").getDouble("lat")); + jsonResult.put("propertyType", "自然村"); + matchedVillage = true; + break; + } + } + } + } + } + } + } catch (Exception ex) { + ex.printStackTrace(); + } + if (matchedVillage == false) { + jsonResult.put("matchResult", new MatchDistrictResult()); + } + } + resultModel.setResult(json.get("result")); + mav.setModel(resultModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + public Object realMatchAction(@Valid AddesssMatchModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (!OpenConfig.getConfig().addressMatchEnabled()) { + mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); + return mav; + } + String address = model.getAddress(); + address = address.replaceAll("@@", "#");// 框架无法处理参数带有#的Buge 用@@代替 + BuildingType buildingType = null; + if (StringUtils.isNotBlank(model.getCategory())) { + if ("property".equals(model.getCategory())) { + model.setCategory("district"); + } + try { + buildingType = BuildingType.valueOf(model.getCategory().toUpperCase()); + } catch (Exception e) { + + } + } + PreciseLevel preciseLevel = PreciseLevel.FUZZY; + if ("strict".equals(model.getPreciseLevel())) { + preciseLevel = PreciseLevel.STRICT; + } + MatchParams params = new MatchParams(); + params.setCity(model.getCity()); + params.setSuggestDistrict(model.getSuggestDistrict()); + params.setSuggestName(model.getSuggestName()); + params.setAddress(address); + params.setBuildingType(buildingType); + params.setPreciseLevel(preciseLevel); + params.setProvince(model.getProvince()); + params.setUseMap(model.isUseMap()); + params.setDebugName(model.getDebugName()); + long start = System.currentTimeMillis(); + Building building = addressParserService.parser(params); + long end = System.currentTimeMillis(); + if (end - start > 200) { + LOGGER.warn("匹配parser耗时:\t" + (end - start) + "ms"); + } + if ("true".equalsIgnoreCase(model.getVerify())) { + verify(building); + } + BasicModel baseModel = BasicModel.buildOKModel(); + Map result = convertBuildingToMap(building); + if (!APIConstant.SUPER_USER_TOKEN.equals(model.getToken())) { + submitFetchTask(building); + result.remove("precise"); + result.remove("searchAddress"); + result.remove("map"); + } + baseModel.setResult(result); + mav.setModel(baseModel); + return mav; + } + + Map convertBuildingToMap(Building building) { + Map result = new LinkedHashMap(); + if (building != null) { + result.put("id", building.getId()); + result.put("credit", building.getCredit()); + result.put("precise", building.getPrecise()); + result.put("province", building.getProvince()); + result.put("city", building.getCity()); + result.put("district", building.getDistrict()); + result.put("name", building.getName()); + result.put("suggestName", building.getSuggestName()); + result.put("map", building.getMap()); + result.put("propertyType", building.getPropertyType()); + result.put("township", building.getTownship()); + result.put("suggestAddress", building.getSuggestAddress()); + if ("district".equals(building.getCategory())) { + result.put("category", "property"); + } else { + result.put("category", building.getCategory()); + } + result.put("address", building.getAddress()); + result.put("block", building.getBlock()); + result.put("lng", building.getLng()); + result.put("lat", building.getLat()); + result.put("alias", building.getAlias()); + result.put("searchAddress", building.getSearchAddress()); + } + return result; + } + + public Object cleanCacheAction(final AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (!OpenConfig.getConfig().addressMatchEnabled()) { + mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); + return mav; + } + new Thread() { + @Override + public void run() { + addressParserService.clearCache(model.getCity()); + } + }.start(); + mav.setModel(BasicModel.buildOKModel().setMsg("开始刷新缓存")); + return mav; + } + + @Authority(role = Role.NONE) + public Object realMatchAllAction(@Valid AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (!OpenConfig.getConfig().addressMatchEnabled()) { + mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); + return mav; + } + String address = model.getAddress(); + address = address.replaceAll("@@", "#");// 框架无法处理参数带有#的Buge 用@@代替 + BuildingType buildingType = null; + if (StringUtils.isNotBlank(model.getCategory())) { + if ("property".equals(model.getCategory())) { + model.setCategory("district"); + } + buildingType = BuildingType.valueOf(model.getCategory().toUpperCase()); + } + PreciseLevel preciseLevel = PreciseLevel.FUZZY; + if ("strict".equals(model.getPreciseLevel())) { + preciseLevel = PreciseLevel.STRICT; + } + MatchParams params = new MatchParams(); + params.setCity(model.getCity()); + params.setSuggestDistrict(model.getSuggestDistrict()); + params.setAddress(address); + params.setBuildingType(buildingType); + params.setPreciseLevel(preciseLevel); + params.setProvince(model.getProvince()); + params.setSuggestName(model.getSuggestName()); + AddressParseResult addressParseResult = addressParserService.parserAll(params); + List buildings = addressParseResult.getBuildings(); + List> buildingObjs = new ArrayList>(buildings.size()); + for (Building building : buildings) { + buildingObjs.add(convertBuildingToMap(building)); + } + BasicModel baseModel = BasicModel.buildOKModel(); + baseModel.setResult(buildingObjs); + mav.setModel(baseModel); + return mav; + } + + @Authority(role = Role.USER) + public Object matchAllAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + String result = addressMatchProxyService.parserAll(convertModelToMap(model)); + if (result != null) { + mav.setModel(result); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + public Map convertModelToMap(AddesssMatchModel model) { + + Map params = new HashMap(); + Class clzz = model.getClass(); + for (Field field : clzz.getDeclaredFields()) { + field.setAccessible(true); + String paramName = field.getName(); + try { + Object val = field.get(model); + if (val != null) { + params.put(paramName, val.toString()); + } + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + return params; + } + + private void verify(Building building) { + String city = building.getCity(); + String region = building.getDistrict(); + String name = null; + if (building.getPrecise() > -1) { + name = building.getName(); + } else { + name = building.getSearchAddress().getOrgKeywords(); + } + if (StringUtils.isNotBlank(region) && StringUtils.isNotBlank(name)) { + String buildingNumber = AddressParserUtil + .standardizeBuildingNumber(building.getSearchAddress().getOrgBuildingNumber()); + if (buildingNumber != null) { + if (houseLoudongService.findHouseLoudong(city, region, name, buildingNumber, null, null) != null) { + building.getSearchAddress().setBuildingNumberCertified(true); + } else if (fjtEvaluationService.findFjtEvaluationByConditions(city, region, name, buildingNumber, + null) != null) { + building.getSearchAddress().setBuildingNumberCertified(true); + } else if (evaluationService.findEvaluationByNum(city, region, name, buildingNumber, null) != null) { + building.getSearchAddress().setBuildingNumberCertified(true); + } + } + + String roomNumber = AddressParserUtil.standardizeRoomNumber(building.getSearchAddress().getOrgRoomNumber()); + if (roomNumber != null) { + if (houseLoudongService.findHouseLoudong(city, region, name, null, null, roomNumber) != null) { + building.getSearchAddress().setRoomNumberCertified(true); + } else if (fjtEvaluationService.findFjtEvaluationByConditions(city, region, name, null, + roomNumber) != null) { + building.getSearchAddress().setRoomNumberCertified(true); + } else if (evaluationService.findEvaluationByNum(city, region, name, null, roomNumber) != null) { + building.getSearchAddress().setRoomNumberCertified(true); + } + } + } + } + + @Authority(role = Role.NONE) + public Object sendFetchTaskAction(AddressModel model) { + + RestfulModelAndView json = new RestfulModelAndView(); + WaitCrawlKeywords waitCrawlKeywords = new WaitCrawlKeywords(); + waitCrawlKeywords.setCity(model.getCity()); + waitCrawlKeywords.setDateCreated(new Date()); + waitCrawlKeywords.setRead(0); + waitCrawlKeywords.setKeywords(model.getAddress()); + waitCrawlKeywordsService.save(waitCrawlKeywords); + json.setModel(waitCrawlKeywords); + + return json; + } + + private void submitFetchTask(Building building) { + if (building.getPrecise() == -1) { + List keywords = new ArrayList(); + Address address = building.getSearchAddress(); + if (StringUtils.isNotBlank(address.getKeywords()) && address.getKeywords().length() > 2) { + keywords.add(address.getKeywords()); + } else if (address.getOrgAddress().length() > 2 && address.getOrgAddress().length() < 10) {// 一般小区名不会超过10个字 + keywords.add(address.getOrgAddress()); + } + if (address.isStandardAddress()) { + if (address.getStreetNumbers() != null) { + for (String b : address.getStreetNumbers()) { + keywords.add(address.getStreet() + b); + } + } else { + keywords.add(address.getStreet()); + } + } + keywords = DataUtil.uniqueList(keywords); + for (String k : keywords) { + WaitCrawlKeywords waitCrawlKeywords = new WaitCrawlKeywords(); + waitCrawlKeywords.setCity(address.getCity()); + waitCrawlKeywords.setDateCreated(new Date()); + waitCrawlKeywords.setRead(0); + waitCrawlKeywords.setKeywords(k); + waitCrawlKeywordsService.save(waitCrawlKeywords); + } + } + } + + /** + * 从Excel表中加载测试数据 + * + * @return + */ + private List> loadTestDataFromExcel(String excelFileName) { + List> ret = new ArrayList>(); + FileInputStream fileInputStream = null; + try { + fileInputStream = new FileInputStream(excelFileName); + HSSFWorkbook workbook = new HSSFWorkbook(fileInputStream); + HSSFSheet sheet = workbook.getSheetAt(0); + // 行号 + boolean isFirstRow = true; + for (Row row : sheet) { + if (isFirstRow) { + // 第一行,过掉 + isFirstRow = false; + continue; + } + + // 得到列数 + // row.getPhysicalNumberOfCells(); + String in_name = row.getCell(1).toString(); + if (in_name.equals("")) { + // 跳过空内容 + continue; + } + Map data = new HashMap(); + // 第0列:城市 + data.put("city", row.getCell(0).toString()); + // 第一列:输入地址 + data.put("in_name", in_name); + // 第二列:期望名称,用于验证 + Cell cell = row.getCell(2); + if (cell != null) { + data.put("out_name", cell.toString()); + } + ret.add(data); + } + } catch (IOException e) { + e.printStackTrace(); + } finally { + if (fileInputStream != null) { + try { + fileInputStream.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return ret; + } + + /** + * 从Excel表中加载测试数据 + * + * @return + */ + private List> loadJingDongTestDataFromExcel(String excelFileName) { + + List> ret = new ArrayList>(); + FileInputStream fileInputStream = null; + try { + fileInputStream = new FileInputStream(excelFileName); + HSSFWorkbook workbook = new HSSFWorkbook(fileInputStream); + HSSFSheet sheet = workbook.getSheetAt(0); + // 行号 + boolean isFirstRow = true; + for (Row row : sheet) { + if (isFirstRow) {// 第一行,过掉 + isFirstRow = false; + continue; + } + String province = row.getCell(0).toString(); + String city = row.getCell(1).toString(); + String in_address = row.getCell(2).toString(); + if (StringUtils.isBlank(in_address) || StringUtils.isBlank(city) || StringUtils.isBlank(province)) { // 跳过空内容 + System.out.println("-->" + row.getRowNum()); + continue; + } + + Map formate = analyseAddress(in_address); + Map data = new HashMap(); + data.put("in_address", in_address); + data.put("city", city); + String formattedAddress = new String(in_address); + List huanxian = Arrays.asList("中环外环之间", "内环以内", "内环中环之间", "中环以内", "外环以外", "(内环高速以里)", "外环外其它地区", + "五环以外", "六环以内", "内环到三环里", "内环到二环里", "二环里", "三环到四环之间", "二环到三环", "四环到五环之间", "二环到三环", "五环至六环之间", + "五环到六环之间", "五环到六环之间", "三环以内", "四环到五环内", "六环以外(其他地区)", "六环以外(张家湾镇、台湖镇、漷县镇)", "六环以外(宋庄镇)", + "一环到二环", "六环以外", "四环至五环之间", "六环外(马驹桥镇)"); + for (String a : huanxian) { + formattedAddress = formattedAddress.replace(a, ""); + } + data.put("formatted_in_address", formattedAddress); + data.put("province", province); + if (formate.get("city") != null) { + data.put("formatedCity", formate.get("city")); + } else { + if (city.endsWith("市") || city.endsWith("县")) { + city = city.substring(0, city.length() - 1); + } else { + if (province.endsWith("市")) { + city = province.substring(0, province.length() - 1); + } else { + city = province; + } + } + data.put("formatedCity", city); + } + ret.add(data); + } + } catch (IOException e) { + e.printStackTrace(); + } finally { + if (fileInputStream != null) { + try { + fileInputStream.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return ret; + } + + private JSONObject addTerm(String name, String value) { + JSONObject term = new JSONObject(); + JSONObject match = new JSONObject(); + match.put(name, value); + term.put("term", match); + return term; + } + + private JSONObject addMatchPhrase(String name, String value) { + JSONObject term = new JSONObject(); + JSONObject match = new JSONObject(); + match.put(name, value); + term.put("match_phrase", match); + return term; + } + + /*** + * 获取自然村 + * @param city + * @param region + * @param name + * @return + */ + private List findVillage(String city, String region, String name) { + JSONObject reqBody = new JSONObject(); + reqBody.put("from", 0); + reqBody.put("size", 5); + JSONObject query = new JSONObject(); + JSONObject bool = new JSONObject(); + JSONArray must = new JSONArray(); + must.add(addTerm("city", city)); + must.add(addTerm("region", region)); + must.add(addTerm("name", name)); + bool.put("must", must); + query.put("bool", bool); + reqBody.put("query", query); + Base64 token = new Base64(); + String authenticationEncoding = token.encodeAsString(("" + ES_USER + ":" + ES_PASSWORD + "").getBytes()); + HttpRequest request = new HttpRequest(); + Map headers = new HashMap(); + headers.put("Content-Type", "application/json"); + headers.put("Authorization", "Basic " + authenticationEncoding + ""); + try { + String response = request.postWithBody("http://192.168.0.45:9200/village/_search", reqBody, headers, "UTF-8"); + JSONObject json = JSONObject.fromObject(response); + if (!json.containsKey("hits") || !json.getJSONObject("hits").containsKey("hits")) { + return Collections.emptyList(); + } + JSONArray hits = json.getJSONObject("hits").getJSONArray("hits"); + List results = new ArrayList(); + for (int i = 0; i < hits.size(); i++) { + JSONObject jsonObject = hits.getJSONObject(i); + results.add(jsonObject); + } + return results; + + } catch (HttpRequestException e) { + e.printStackTrace(); + } + return Collections.emptyList(); + } + + /** + * 加载测试数据 + * + * @return + */ + private List> loadTestData() { + BufferedReader reader = null; + List> ret = new ArrayList>(); + try { + reader = new BufferedReader( + new InputStreamReader(new FileInputStream("D:\\data\\addr\\test20140923.txt"), "utf-8")); + boolean isFirst = true; + while (true) { + String line = reader.readLine(); + if (line == null) { + break; + } + if (isFirst) { + isFirst = false; + int c = line.charAt(0); + if (c == 65279) { + // 去掉UTF-8中头标示 + line = line.substring(1); + } + } + ret.add(parseTestData(line)); + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + if (reader != null) { + try { + reader.close(); + } catch (IOException e) { + + } + } + } + return ret; + } + + /** + * 解析测试数据,其中输入字符串为以TAB分隔的字符串,例如: in_name:经济技术开发区贵园北里丁区 out_name:贵园北里 + * + * @param s + * @return + */ + private Map parseTestData(String s) { + Map ret = new HashMap(); + String[] columns = s.split("\t"); + for (String column : columns) { + int index = column.indexOf(":"); + String key; + String value; + if (index > 0) { + key = column.substring(0, index); + value = column.substring(index + 1); + ret.put(key, value); + } + } + return ret; + } + + @Authority(role = Role.USER) + public Object parseAddressAction(AddressModel model) throws Exception { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (model.getCity() == null || model.getAddress() == null) { + return mav; + } + District district = addressService.parseAddress(model.getCity(), model.getAddress()); + if (district != null) { + Map resMap = new HashMap(); + resMap.put("city", district.getCity()); + resMap.put("region", district.getRegion()); + resMap.put("districtName", district.getName()); + resMap.put("address", district.getAddress()); + mav.setModel(resMap); + } + return mav; + } + + @Authority(role = Role.USER) + public Object geocoderAction(AddressModel model) throws Exception { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + + if (model.getCity() == null || model.getAddress() == null) { + return mav; + } + + double[] lngLat = addressService.getLngLat(model.getCity(), model.getAddress(), AK); + Map resMap = new HashMap(); + resMap.put("lng", lngLat[0]); + resMap.put("lat", lngLat[1]); + mav.setModel(resMap); + return mav; + } + + @Authority(role = Role.USER) + public Object geocoderBaiduToGoogleAction(AddressModel model) throws Exception { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + + if (model.getCity() == null || model.getAddress() == null) { + return mav; + } + + double[] lngLat = addressService.getLngLat(model.getCity(), model.getAddress(), AK); + Map resMap = new HashMap(); + resMap.put("lng", lngLat[0]); + resMap.put("lat", lngLat[1]); + mav.setModel(resMap); + return mav; + } + + @Deprecated + @Authority(role = Role.USER) + public Object addressEvaluationAction(AddressModel model) throws Exception { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + + if (model.getCity() == null || model.getAddress() == null || model.getArea() == null) { + return mav; + } + + Map resMap = new HashMap(); + resMap.put("totalPrice", + addressService.evaluationByAddress(model.getCity(), model.getAddress(), model.getArea(), AK)); + mav.setModel(resMap); + return mav; + } + + @Deprecated + @Authority(role = Role.USER) + public Object addressEvaluation2Action(AddressModel model) throws Exception { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + + if (model.getCity() == null || model.getAddress() == null || model.getArea() == null) { + return mav; + } + + Date weekend = DateUtil.getThisSunday(new Date()); + if (model.getWeekend() != null) { + weekend = DateUtil.getThisSunday(model.getWeekend()); + } + + Map resMap = new HashMap(); + resMap.put("totalPrice", 0); + + District district = addressService.parseAddress(model.getCity(), model.getAddress()); + if (district == null) { + double[] lngLatBaidu = addressService.getLngLat(model.getCity(), model.getAddress(), AK); + if (lngLatBaidu == null) { + mav.setModel(resMap); + return mav; + } + double[] lngLatGoogle = addressService.geoconvBaiduToGoogle(lngLatBaidu[0], lngLatBaidu[1]); + double lng = lngLatGoogle[0]; + double lat = lngLatGoogle[1]; + List params = new ArrayList(); + SdQuery sdQuery = new SdQuery(); + if (lat < -90 && lat > 90 && lng < -180 && lng > 180) { + mav.setModel(resMap); + return mav; + } + params.add(new QueryParam("city", model.getCity())); + params.add(new QueryParam("visible", 0)); + sdQuery.setPoint(lat + "," + lng); + sdQuery.setField("lat_lng"); + sdQuery.setDistance("" + (500 / 1000d)); + params.add(new QueryParam(QueryParam.SD_PARAM_NAME, sdQuery)); + List districts = districtService.findAllByParams(params, 0, 3); + + int totalPrice = 0; + int tc = 0; + for (District dis : districts) { + Evaluation evaluation = new Evaluation(); + evaluation.setCity(dis.getCity()); + evaluation.setRegion(dis.getRegion()); + evaluation.setDistrictName(dis.getName()); + evaluation.setArea(model.getArea()); + evaluation.setSource("api_diZhiGuJia"); + evaluation = evaluationService.saveEvaluation(evaluation, weekend); + if (evaluation.getTotalPrice() != null && evaluation.getTotalPrice() > 0) { + totalPrice += evaluation.getTotalPrice(); + tc++; + } + } + if (tc > 0) { + resMap.put("totalPrice", totalPrice / tc); + } + // } + } else { + Evaluation evaluation = new Evaluation(); + evaluation.setCity(district.getCity()); + evaluation.setRegion(district.getRegion()); + evaluation.setDistrictName(district.getName()); + evaluation.setArea(model.getArea()); + evaluation.setSource("api_diZhiGuJia"); + evaluation = evaluationService.saveEvaluation(evaluation, weekend); + resMap.put("totalPrice", evaluation.getTotalPrice()); + + District dist = districtService.findDistrict( + new DistrictKey(district.getCity(), district.getRegion(), district.getName()), "district"); + if (null != dist) { + if (null != dist.getCarSiteCount() && dist.getCarSiteCount() > 0) { + resMap.put("carSiteCount", dist.getCarSiteCount()); + } + } + + CommData commData = commDataService.findCommDataByCity(district.getCity(), district.getRegion(), + district.getName(), "district"); + if (null != commData && commData.getLastCount() > 0) { + resMap.put("householdCount", commData.getLastCount()); + } + } + mav.setModel(resMap); + return mav; + } + + @Authority(role = Role.USER) + public Object addressStandardParserAction(AddressModel model) throws Exception { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + Map resMap = addressService.parseSelectAddressInfo(model.getCity(), model.getAddress()); + mav.setModel(resMap); + return mav; + } + + @Authority(role = Role.USER) + public Object addressStandardAction(AddressModel model) throws Exception { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + + model.setAddress(AddressParserUtils.filteSpecialChar(model.getAddress())); + Map resMap = addressService.parseSelectAddressInfo(model.getCity(), model.getAddress()); + resMap.put("oldAddress", model.getAddress()); + + if (resMap.get("city") == null || model.getAddress() == null) { + return mav; + } + + District district = null; + // 根据地址查找小区 + if (resMap.get("address") != null) { + district = addressService.parseAddress(resMap.get("city").toString(), resMap.get("address").toString()); + } + // 根据地址中提取出的小区名称查小区 + String oldName = resMap.get("oldName") != null ? resMap.get("oldName").toString() : null;// 地址中疑似小区 + if (district == null && null != oldName) { + district = addressService.parseAddress(resMap.get("city").toString(), oldName); + // 百度查小区 + if (district == null && null != oldName) { + Map ret = baiduApiService.mapSearchSimple(resMap.get("city").toString(), oldName, AK); + List rets = (List) ret.get("content"); + if (null != rets) { + boolean flag = false; + for (Map vo : rets) { + List> vs = (List>) vo.get("cla"); + if (vs == null) { + continue; + } + for (List list : vs) { + String s = list.get(1); + if (s.indexOf("小区") != -1 || s.indexOf("楼盘") != -1) { + flag = true; + resMap.put("name", oldName); + String baiduAddress = (String) vo.get("addr"); + if (StringUtils.isNotBlank(baiduAddress)) { + + if (StringUtils.isBlank((String) resMap.get("address"))) { + resMap.put("address", baiduAddress); + } + + } + + break; + } + } + } + + if (!flag && resMap.get("address") == null) { + resMap.put("address", oldName); + } + } + } + } + + if (district != null) { + District dist = districtService.findDistrict( + new DistrictKey(district.getCity(), district.getRegion(), district.getName()), "district"); + if (dist != null) { + district = dist; + } + resMap.put("status", "0"); + } else { + resMap.put("status", "1"); + } + + // 当businessMatch=1,并且进行小区匹配没有成功的情况下,进行商铺写字楼匹配 通过keyword查找 + if (null != model.getBusinessMatch() && model.getBusinessMatch() == 1 && resMap.get("status").equals("1") + && StringUtils.isNotBlank((String) resMap.get("city"))) { + if (StringUtils.isNotBlank(oldName)) { + district = districtService.findFirstByKeyword((String) resMap.get("city"), oldName); + } + + if (null == district && StringUtils.isNotBlank((String) resMap.get("address"))) { + district = districtService.findFirstByKeyword((String) resMap.get("city"), + (String) resMap.get("address")); + } + } + + if (district != null) { + + resMap.put("name", district.getName()); + resMap.put("region", district.getRegion()); + resMap.put("block", district.getBlock()); + resMap.put("cat", district.getCategory()); + resMap.put("alias", district.getAlias()); + + String tempAddress = (String) resMap.get("address"); + if (StringUtils.isBlank(tempAddress)) { + resMap.put("address", district.getAddress()); + } else { + if (tempAddress.indexOf("弄") == -1 && tempAddress.indexOf("号") == -1 || tempAddress.indexOf("街") == -1 + || tempAddress.indexOf("路") == -1) { + resMap.put("address", district.getAddress()); + } + } + } + + String lastAddress = (String) resMap.get("address"); + if (StringUtils.isNotBlank(lastAddress)) { + if (lastAddress.length() < 2) { + resMap.put("address", null); + } else { + resMap.put("address", AddressParserUtils.filteSpecialChar(resMap.get("address").toString())); + } + + } + resMap.remove("louDong"); + mav.setModel(resMap); + return mav; + } + + public Object address2DistrictAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + + String orgCity = model.getCity(); + String orgAddress = AddressParserUtils.filteSpecialChar(model.getAddress()); + if (StringUtils.isBlank(orgCity) || StringUtils.isBlank(orgAddress)) { + return mav; + } + + Map resMap = addressService.parseSelectAddressInfo(orgCity, orgAddress); + resMap.put("oldAddress", orgAddress); + resMap.remove("louDong"); + + if (null == resMap.get("city")) { + return mav; + } + + String city = (String) resMap.get("city"); + District district = null; + // 小区库匹配 + String address = (String) resMap.get("address"); + if (StringUtils.isNotBlank(address)) { + // 地址、小区名、别名匹配 + List params = new ArrayList(4); + params.add(new QueryParam("city", city)); + params.add(new QueryParam("category", "district")); + params.add(new QueryParam("visible", 0)); + + TermQuery q1 = new TermQuery(new Term("name", address)); + TermQuery q2 = new TermQuery(new Term("alias", address)); + TermQuery q3 = new TermQuery(new Term("address", address)); + BooleanQuery bq = new BooleanQuery(); + bq.add(q1, Occur.SHOULD); + bq.add(q2, Occur.SHOULD); + bq.add(q3, Occur.SHOULD); + params.add(new QueryParam(QueryParam.SR_PARAM_NAME, new SrQuery(bq))); + + List ds = districtService.findAllByParams(params, 0, 1); + if (CollectionUtils.isNotEmpty(ds)) { + district = ds.get(0); + } + } + + // 根据地址中提取出的小区名称查小区 + String oldName = StringUtils.trim((String) resMap.get("oldName")); + if (null == district && StringUtils.isNotBlank(oldName)) { + // 小区名、别名匹配 + List params = new ArrayList(4); + params.add(new QueryParam("city", city)); + params.add(new QueryParam("category", "district")); + params.add(new QueryParam("visible", 0)); + + TermQuery q1 = new TermQuery(new Term("name", oldName)); + TermQuery q2 = new TermQuery(new Term("alias", oldName)); + BooleanQuery bq = new BooleanQuery(); + bq.add(q1, Occur.SHOULD); + bq.add(q2, Occur.SHOULD); + params.add(new QueryParam(QueryParam.SR_PARAM_NAME, new SrQuery(bq))); + + List ds = districtService.findAllByParams(params, 0, 1); + if (CollectionUtils.isNotEmpty(ds)) { + district = ds.get(0); + } + } + + // 地址库匹配 + if (null == district) { + // todo + } + + if (null == district) { + resMap.put("status", 1); + } else { + resMap.put("status", 0); + resMap.put("name", district.getName()); + resMap.put("region", district.getRegion()); + resMap.put("block", district.getBlock()); + resMap.put("cat", district.getCategory()); + resMap.put("alias", district.getAlias()); + + String tempAddress = (String) resMap.get("address"); + if (StringUtils.isBlank(tempAddress)) { + resMap.put("address", district.getAddress()); + } else { + if (tempAddress.indexOf("弄") == -1 && tempAddress.indexOf("号") == -1 || tempAddress.indexOf("街") == -1 + || tempAddress.indexOf("路") == -1) { + resMap.put("address", district.getAddress()); + } + } + } + + String lastAddress = (String) resMap.get("address"); + if (StringUtils.isNotBlank(lastAddress)) { + if (lastAddress.length() < 2) { + resMap.put("address", null); + } else { + resMap.put("address", AddressParserUtils.filteSpecialChar(resMap.get("address").toString())); + } + } + + mav.setModel(resMap); + return mav; + } + + private String findStandardRegion(String city, String region) { + + List regionBloks = regionBlockService.getRegionBlockListByCity(city, null); + String s_region = ""; + if (regionBloks.size() > 0) { + for (RegionBlock regionBlock : regionBloks) { + List patterns = regionBlock.getPattern(); + if (null != patterns && patterns.contains(region)) { + s_region = regionBlock.getName(); + break; + } else { + if (regionBlock.getName().indexOf(region) != -1) { + s_region = region; + break; + } + } + } + } else { + s_region = region; + } + return s_region; + } + + /** + * 地址联想提示 (高德官方) /address/su 参数:address city + * 返回:[{"id":"XXXXXXXXX","city":"上海",region:"长宁","name":"xxx","address":"协和路"}] + * + * @return + */ + public Object suAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + try { + List list = addressService.suAmap(model.getCity().trim(), model.getAddress().trim());// su()是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(list); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } + + /** + * 地址真实性检查 (高德官方) /address/check 参数:chooseId address city + * 返回:{type:"存在|不存在|存疑",data:{"id":"XXXXXXXXX","city":"上海",region:"长宁","name":"xxx","address":"协和路"}} + * 存疑的时候才有data返回,返回高德搜索的第一条数据 (超过的时候,找到最大号码返回) + * + * @return + */ + public Object checkAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } + try { + AddressCheckBo bo = addressService.checkAmap(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatAddressCheckBo(bo, city, model)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } + + /** + * 为返回值格式化掉cityCode和AddressId,用于评级和反欺诈 + * + * @param bo + * @return + */ + private AddressCheckBo formatAddressCheckBo2(AddressCheckBo bo, String city, AddressModel model) { + AddressCheck check = bo.getData(); + if (null != check) { + check.setCityCode(null); + if (StringUtils.isEmpty(check.getCity()) || "[]".equals(check.getCity())) { + check.setCity(city); + } + // if (StringUtils.isEmpty(check.getAddress()) || + // "[]".equals(check.getAddress())) { + // check.setAddress(check.getName()); + // } + // 检查相关参数 + if (FJW_LEVEL.equals(model.getDataLevel())) { + bo.setData(check); + } else { + check.setDistrictName(null); + check.setKeyWords(null); + check.setKeyWordsUse(null); + check.setRegion(null); + check.setProvionce(null); + check.setNameUse(null); + check.setAddressUse(null); + check.setAddress2(null); + check.setName2(null); + check.setType(null); + check.setFormatAddress(null); + check.setFormatAddress2(null); + check.setLocation2(null); + check.setLevel(null); + check.setScoreIncity(null); + check.setScoreInnation(null); + check.setPriceScore(null); + check.setAreaScore(null); + check.setEstateScore(null); + bo.setData(check); + } + } + if ("不存在".equals(bo.getType())) { + bo.setType("地址未找到:抱歉,在" + city + "没有找到与'" + model.getAddress() + "'相关的地点"); + } + return bo; + } + + /** + * 查询高德城市及城市编码 + * + * @return + */ + public Object cityAllAction() { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + List list = addressService.findAllCityAmap(); + BasicModel model = new BasicModel(HttpStatusCodeEnum.OK); + model.setResult(list); + mav.setModel(model); + return mav; + } + + /** + * 地址联想提示 (代理) + * + * @return + */ + public Object suAmapAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + try { + List list = addressService.su(model.getCity().trim(), model.getAddress().trim()); + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(list); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } + + /** + * 地址真实性检查 (代理) + * + * @return + */ + public Object checkAmapAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } + try { + AddressCheckBo bo = addressService.check(model.getChooseId(), city, model.getAddress().trim()); + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatAddressCheckBo(bo, city, model)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } + + /** + * 地址评级 + * + * @param model (city+address)+addressId + * @return { "code": 200, "msg": "ok", "result": { "data": { "address": "匹配地址", + * "city": "城市", "keyWords": "用户输入", "keyWordsUse": "用户输入格式化", "lat": + * 经纬度, "lng": 经纬度, "name": "匹配POIName", "score": 评分 }, "type": "可能存在" } + * } + */ + public Object gradeAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } + + try { + AddressCheckBo bo = addressService.gradeAmap(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatAddressCheckBo2(bo, city, model)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } + + /** + * 地址反欺诈 (地址验真+周边查询) + * + * @param model (city+address)+addressId + * @return { "code": 200, "msg": "ok", "result": { "data": { "address": "匹配地址", + * "city": "城市", "keyWords": "用户输入", "keyWordsUse": "用户输入格式化", "lat": + * 纬度, "lng": 经度, "name": "匹配POIName", "poiList":[ { "name" : + * "文洋大厦停车场(协和路)", "type" : "类型", "address" : "协和路1033号", "lat": 纬度, + * "lng": 经度, "distance":距离 },... ] }, "type": "存在" } } + */ + public Object antiFraudAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } + + try { + AddressCheckBo bo = addressService.antiFraudAmap(model.getChooseId(), city, model.getAddress().trim(), + model.getType(), model.getRadius(), model.getNumber(), model.getPageNo());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatAddressCheckBo2(bo, city, model)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } + + /** + * 地址反欺诈 (地址验真+周边查询) + * + * @param model (city+address)+addressId + * @return { "code": 200, "msg": "ok", "result": { "data": { "address": + * "德州路220弄小区", "addressId": "d525e60aab2e84909d2fd998b0af5e8e", "city": + * "上海市", "keyWords": "德州路220弄", "keyWordsUse": "德州路220弄", "lat": + * 31.167814, "lng": 121.495784, "name": "上海后来居上家庭公寓(德州路分店)", "poiMap": + * { "加油站": [ { "address": "杨思路648号", "distance": "642.0m", "lat": + * 31.162078, "lng": 121.496522, "name": "中国石化加油站(杨思路)", "type": "加油站" + * }, { "address": "杨思路2号", "distance": "1.6km", "lat": 31.15627, "lng": + * 121.485031, "name": "中国石油杨思加油站(杨思路)", "type": "加油站" }, ... ] } ... }, + * "type": "存在" } } + */ + public Object antiFraudBAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } + + try { + AddressCheckBo bo = addressService.antiFraudAmapB(model.getChooseId(), city, model.getAddress().trim(), + model.getType(), model.getRadius(), model.getNumber());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatAddressCheckBo2(bo, city, model)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } + + public Object standardAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + String result = addressMatchProxyService.standard(convertModelToMap(model)); + if (result != null) { + JSONObject json = JSONObject.fromObject(result); + int code = json.getInt("code"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if (json.containsKey("result")) { + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 地址标准化接口V2 + * + * @param model + * @return + */ + public Object standard2Action(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); + params.put("address", model.getAddress()); + params.put("showCode", model.getShowCode()); + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structure", params, "UTF-8"); + } catch (Exception e) { + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structure", params, "UTF-8"); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if (json.containsKey("result")) { + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 招商证券POC测试接口封装 + */ + public Object cmbTestAction(AddesssMatchModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); + params.put("address", model.getAddress()); + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/cmbTest", params, "UTF-8"); + } catch (Exception e) { + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/cmbTest", params, "UTF-8"); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if (json.containsKey("result")) { + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 五级地址标准化接口 + * + * @param model + * @return + */ + public Object fiveDivisionStructureAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); + params.put("address", model.getAddress()); + // 地址验证无效也输出标准化结果 + params.put("flag", "true"); + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure", params, "UTF-8"); + } catch (Exception e) { + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure", params, "UTF-8"); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if (json.containsKey("result")) { + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 五级行政区划V2地址标准化接口 + * + * @param model + * @return + */ + public Object fiveDivisionStructure2Action(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); + params.put("address", model.getAddress()); + // 地址验证无效也输出标准化结果 + params.put("flag", "true"); + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure/v2", params, "UTF-8"); + } catch (Exception e) { + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure/v2", params, "UTF-8"); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if (json.containsKey("result")) { + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + + /** + * 详细地址标准化接口 + * + * @param model + * @return + */ + public Object divisionStructureAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); + params.put("address", model.getAddress()); + // 地址验证无效也输出标准化结果 + params.put("flag", "true"); + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/divisionStructure", params, "UTF-8"); + } catch (Exception e) { + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/divisionStructure", params, "UTF-8"); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if (json.containsKey("result")) { + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 地址标准化专用测试接口 + * + * @param model + * @return + */ + public Object structureAndCompleteAction(AddesssMatchModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); + params.put("address", model.getAddress()); + // 地址验证无效也输出标准化结果 + params.put("flag", "true"); + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structureAndComplete", params, "UTF-8"); + } catch (Exception e) { + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structureAndComplete", params, "UTF-8"); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if (json.containsKey("result")) { + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 地址信息分类接口 + * + * @param model + * @return + */ + public Object communitySummaryAction(CommunitySummaryRequestDto model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + try { + Map headers = new HashMap(); + headers.put("Content-Type", "application/json"); + + JSONObject reqBody = new JSONObject(); + reqBody.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); + reqBody.put("address", model.getAddress()); + reqBody.put("area", model.getArea()); + reqBody.put("maxFloor", model.getMaxFloor()); + reqBody.put("housePurpose", model.getHousePurpose()); + reqBody.put("memo", model.getMemo()); + + String result = request.postWithBody("http://192.168.0.100:32080/FangJiaAddressService/communitySummary", reqBody, headers, "UTF-8"); + if (result != null) { + try { + json = JSONObject.fromObject(result); + } catch (Exception e) { + json = null; + } + } + } catch (Exception e) { + e.printStackTrace(); + } + + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if (json.containsKey("result")) { + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 楼盘评级 + * + * @param model + * @return + */ + public Object buildingRatingAction(CommunitySummaryRequestDto model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + try { + Map headers = new HashMap(); + headers.put("Content-Type", "application/json"); + + JSONObject reqBody = new JSONObject(); + reqBody.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); + reqBody.put("address", model.getAddress()); + reqBody.put("area", model.getArea()); + reqBody.put("maxFloor", model.getMaxFloor()); + reqBody.put("housePurpose", model.getHousePurpose()); + reqBody.put("memo", model.getMemo()); + String result = request.postWithBody("http://192.168.0.100:32080/FangJiaAddressService/buildingRating", reqBody, headers, "UTF-8"); + if (result != null) { + try { + json = JSONObject.fromObject(result); + } catch (Exception e) { + json = null; + } + } + } catch (Exception e) { + e.printStackTrace(); + } + + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if (json.containsKey("result")) { + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + /** + * 财力评级 + * + * @param model + * @return + */ + public Object financialRatingAction(CommunitySummaryRequestDto model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress()) || "null".equals(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + try { + Map headers = new HashMap(); + headers.put("Content-Type", "application/json"); + + JSONObject reqBody = new JSONObject(); + reqBody.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : CONFIG.getDefaultCity()); + reqBody.put("address", model.getAddress()); + reqBody.put("area", model.getArea()); + reqBody.put("maxFloor", model.getMaxFloor()); + reqBody.put("housePurpose", model.getHousePurpose()); + reqBody.put("memo", model.getMemo()); + String result = request.postWithBody("http://192.168.0.100:32080/FangJiaAddressService/financialRating", reqBody, headers, "UTF-8"); + if (result != null) { + try { + json = JSONObject.fromObject(result); + } catch (Exception e) { + json = null; + } + } + } catch (Exception e) { + e.printStackTrace(); + } + + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if (json.containsKey("result")) { + basicModel.setResult(json.get("result")); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + public Object similarityAction(AddesssMatchModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getAddress_1()) || StringUtils.isBlank(model.getAddress_2())) { + mav.setModel(BasicModel.buildBadRequestModel("两个地址均不能为空")); + return mav; + } + model.setAddress(model.getAddress_1()); + String result1 = addressMatchProxyService.standard(convertModelToMap(model)); + model.setAddress(model.getAddress_2()); + String result2 = addressMatchProxyService.standard(convertModelToMap(model)); + if (result1 != null && result2 != null) { + Map resultMap = addressService.addressSimilarity(result1, result2); + mav.setModel(BasicModel.buildOKModel().setResult(resultMap)); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); + } + return mav; + } + + public Object parseCityAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getProvince())) { + mav.setModel(BasicModel.buildBadRequestModel("province不能为空")); + return mav; + } + if (StringUtils.isBlank(model.getDistrict())) { + mav.setModel(BasicModel.buildBadRequestModel("district不能为空")); + return mav; + } + CityParseBo bo = addressService.cityParse(model.getProvince(), model.getDistrict()); + if (bo.getCity() != null) { + UniversalDto dto = UniversalDto.newDto(); + dto.append("city", bo.getCity()); + mav.setModel(BasicModel.buildOKModel().setResult(dto)); + } else { + mav.setModel(BasicModel.buildModel(40001, bo.getMsg())); + } + return mav; + } + + public Object realStandardAction(AddressModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (!OpenConfig.getConfig().addressMatchEnabled()) { + mav.setModel(BasicModel.buildBadRequestModel("不支持该服务")); + return mav; + } + if (StringUtils.isBlank(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("地址不能为空")); + return mav; + } /*if (StringUtils.isBlank(model.getCity())) { mav.setModel(BasicModel.buildBadRequestModel("城市不能为空")); return mav; }*/ - MatchParams matchParams = new MatchParams(); - matchParams.setCity(model.getCity()); - matchParams.setAddress(model.getAddress()); - matchParams.setAddressParserGoal(AddressParserGoal.Match); - matchParams.setPreciseLevel(PreciseLevel.STRICT); - matchParams.setProvince(model.getProvince()); + MatchParams matchParams = new MatchParams(); + matchParams.setCity(model.getCity()); + matchParams.setAddress(model.getAddress()); + matchParams.setAddressParserGoal(AddressParserGoal.Match); + matchParams.setPreciseLevel(PreciseLevel.STRICT); + matchParams.setProvince(model.getProvince()); // matchParams.setUseMap(true); - matchParams.setUseAliyunApi(false); + matchParams.setUseAliyunApi(false); // matchParams.setUseCrf(true); - matchParams.setContainsLocation(model.isContainsLocation()); - Building building = addressParserService.standard(matchParams); - Address address = building.getSearchAddress(); - UniversalDto dto = UniversalDto.newDto(); - dto.append("province", address.getProvince()); - dto.append("city", address.getCity()); - if (address.getDistrict() != null) { - dto.append("district", address.getDistrict()); - } else { - dto.append("district", building.getDistrict()); - } - dto.append("developmentZone", address.getDevelopmentZone()); - dto.append("township", address.getTownship()); - dto.append("street", address.getStreet()); - dto.append("streetNumber", address.getStreetNumber()); - if(StringUtils.isBlank(building.getSuggestName())){ - if(StringUtils.isNotBlank(address.getParsedPropertyName())){ - dto.append("name", address.getParsedPropertyName()); - }else if(StringUtils.isNotBlank(address.getOrgKeywords())){ - dto.append("name", address.getOrgKeywords()); - } - }else{ - dto.append("name", building.getSuggestName()); - } - if(StringUtils.isBlank(address.getStreet()) && StringUtils.isNotBlank(building.getAddress())){ - String addr = building.getAddress(); - String street = AddressParserUtil.extractStreet(addr); - if(street != null){ - dto.append("street", street); - if(addr.length() != street.length()){ - dto.append("streetNumber", AddressParserUtil.match(AddressParserUtil.STREET_NUMBER_CONNECTOR_PATTERN, addr)); - } - }else if(StringUtils.isNotBlank(building.getStreet())){ - dto.append("street", building.getStreet()); - if(StringUtils.isNotBlank(building.getStreetno())){ - dto.append("streetNumber", building.getStreetno()); - } - } - } - dto.append("buildingNumber", address.getBuildingNumber()); - dto.append("floor", address.getFloor()); - dto.append("unitNumber", address.getUnitNumber()); - dto.append("roomNumber", address.getRoomNumber()); - dto.append("formattedAddress", address.getFormattedAddress()); - if(matchParams.isContainsLocation()){ - dto.append("lat", building.getLat()); - dto.append("lng", building.getLng()); - } - mav.setModel(BasicModel.buildOKModel().setResult(dto)); - return mav; - } + matchParams.setContainsLocation(model.isContainsLocation()); + Building building = addressParserService.standard(matchParams); + Address address = building.getSearchAddress(); + UniversalDto dto = UniversalDto.newDto(); + dto.append("province", address.getProvince()); + dto.append("city", address.getCity()); + if (address.getDistrict() != null) { + dto.append("district", address.getDistrict()); + } else { + dto.append("district", building.getDistrict()); + } + dto.append("developmentZone", address.getDevelopmentZone()); + dto.append("township", address.getTownship()); + dto.append("street", address.getStreet()); + dto.append("streetNumber", address.getStreetNumber()); + if (StringUtils.isBlank(building.getSuggestName())) { + if (StringUtils.isNotBlank(address.getParsedPropertyName())) { + dto.append("name", address.getParsedPropertyName()); + } else if (StringUtils.isNotBlank(address.getOrgKeywords())) { + dto.append("name", address.getOrgKeywords()); + } + } else { + dto.append("name", building.getSuggestName()); + } + if (StringUtils.isBlank(address.getStreet()) && StringUtils.isNotBlank(building.getAddress())) { + String addr = building.getAddress(); + String street = AddressParserUtil.extractStreet(addr); + if (street != null) { + dto.append("street", street); + if (addr.length() != street.length()) { + dto.append("streetNumber", AddressParserUtil.match(AddressParserUtil.STREET_NUMBER_CONNECTOR_PATTERN, addr)); + } + } else if (StringUtils.isNotBlank(building.getStreet())) { + dto.append("street", building.getStreet()); + if (StringUtils.isNotBlank(building.getStreetno())) { + dto.append("streetNumber", building.getStreetno()); + } + } + } + dto.append("buildingNumber", address.getBuildingNumber()); + dto.append("floor", address.getFloor()); + dto.append("unitNumber", address.getUnitNumber()); + dto.append("roomNumber", address.getRoomNumber()); + dto.append("formattedAddress", address.getFormattedAddress()); + if (matchParams.isContainsLocation()) { + dto.append("lat", building.getLat()); + dto.append("lng", building.getLng()); + } + mav.setModel(BasicModel.buildOKModel().setResult(dto)); + return mav; + } - /** - * 进行地址的取舍 - * - * @param bo - * @return - */ - private AddressCheckBo formatAddressCheckBo(AddressCheckBo bo, String city, AddressModel model) { - AddressCheck check = bo.getData(); - if (null != check) { - check.setCityCode(null); - if (StringUtils.isEmpty(check.getCity()) || "[]".equals(check.getCity())) { - check.setCity(city); - } - // 检查相关参数 - if (FJW_LEVEL.equals(model.getDataLevel())) { - bo.setData(check); - } else { - // 添加地址和address的取舍 - chooseAddressAndName(check); - formatAddressAndName(check); + /** + * 进行地址的取舍 + * + * @param bo + * @return + */ + private AddressCheckBo formatAddressCheckBo(AddressCheckBo bo, String city, AddressModel model) { + AddressCheck check = bo.getData(); + if (null != check) { + check.setCityCode(null); + if (StringUtils.isEmpty(check.getCity()) || "[]".equals(check.getCity())) { + check.setCity(city); + } + // 检查相关参数 + if (FJW_LEVEL.equals(model.getDataLevel())) { + bo.setData(check); + } else { + // 添加地址和address的取舍 + chooseAddressAndName(check); + formatAddressAndName(check); - check.setDistrictName(null); - check.setKeyWords(null); - check.setKeyWordsUse(null); - check.setRegion(null); - check.setProvionce(null); - check.setNameUse(null); - check.setAddressUse(null); - check.setAddress2(null); - check.setName2(null); - check.setType(null); - check.setFormatAddress(null); - check.setFormatAddress2(null); - check.setLocation2(null); - check.setLevel(null); - bo.setData(check); - } - } - if ("不存在".equals(bo.getType())) { - bo.setType("地址未找到:抱歉,在" + city + "没有找到与'" + model.getAddress() + "'相关的地点"); - } - return bo; - } + check.setDistrictName(null); + check.setKeyWords(null); + check.setKeyWordsUse(null); + check.setRegion(null); + check.setProvionce(null); + check.setNameUse(null); + check.setAddressUse(null); + check.setAddress2(null); + check.setName2(null); + check.setType(null); + check.setFormatAddress(null); + check.setFormatAddress2(null); + check.setLocation2(null); + check.setLevel(null); + bo.setData(check); + } + } + if ("不存在".equals(bo.getType())) { + bo.setType("地址未找到:抱歉,在" + city + "没有找到与'" + model.getAddress() + "'相关的地点"); + } + return bo; + } - private void chooseAddressAndName(AddressCheck check) { - boolean isNameOk = false; - boolean isAddressOk = false; - String keyWords = check.getKeyWords(); - // 再我方拆词接口 - String name = check.getName(); - String address = check.getAddress(); - if (!isNameOk && isCorrectName(name)) { - check.setName(name); - isNameOk = true; - } - if (!isAddressOk && isCorrectAddress(address)) { - check.setAddress(address); - isAddressOk = true; - } - if (isNameOk && isAddressOk) { - return; - } - // 优先级先高德POI - String namePoi = check.getNameUse(); - String addressPoi = check.getAddressUse(); - if (!isNameOk && isCorrectNamePoi(namePoi, keyWords)) { - check.setName(namePoi); - isNameOk = true; - } - if (!isAddressOk && isCorrectAddressPoi(addressPoi, keyWords)) { - check.setAddress(addressPoi); - isAddressOk = true; - } - if (isNameOk && isAddressOk) { - return; - } - // 再高德地址编码 - String namePoi2 = check.getName2(); - String addressPoi2 = check.getAddress2(); - if (!isNameOk && isCorrectNamePoi(namePoi2, keyWords)) { - check.setName(namePoi2); - isNameOk = true; - } - if (!isAddressOk && isCorrectAddressPoi(addressPoi2, keyWords)) { - check.setAddress(addressPoi2); - isAddressOk = true; - } - if (isNameOk && isAddressOk) { - return; - } - // 最后高德标准化地址拆分 - String formateAddress = check.getFormatAddress(); - if (StringUtils.isNotEmpty(formateAddress)) { - Map resultMap = addressService.splitAddress(check.getCity(), formateAddress); - String nameNew = resultMap.get("name"); - String addressNew = resultMap.get("address"); - if (!isNameOk && isCorrectName(nameNew) && isCorrectNamePoi(nameNew, keyWords)) { - check.setName(nameNew); - isNameOk = true; - } - if (!isAddressOk && isCorrectAddress(addressNew) && isCorrectAddressPoi(addressNew, keyWords)) { - check.setAddress(addressNew); - isAddressOk = true; - } - } + private void chooseAddressAndName(AddressCheck check) { + boolean isNameOk = false; + boolean isAddressOk = false; + String keyWords = check.getKeyWords(); + // 再我方拆词接口 + String name = check.getName(); + String address = check.getAddress(); + if (!isNameOk && isCorrectName(name)) { + check.setName(name); + isNameOk = true; + } + if (!isAddressOk && isCorrectAddress(address)) { + check.setAddress(address); + isAddressOk = true; + } + if (isNameOk && isAddressOk) { + return; + } + // 优先级先高德POI + String namePoi = check.getNameUse(); + String addressPoi = check.getAddressUse(); + if (!isNameOk && isCorrectNamePoi(namePoi, keyWords)) { + check.setName(namePoi); + isNameOk = true; + } + if (!isAddressOk && isCorrectAddressPoi(addressPoi, keyWords)) { + check.setAddress(addressPoi); + isAddressOk = true; + } + if (isNameOk && isAddressOk) { + return; + } + // 再高德地址编码 + String namePoi2 = check.getName2(); + String addressPoi2 = check.getAddress2(); + if (!isNameOk && isCorrectNamePoi(namePoi2, keyWords)) { + check.setName(namePoi2); + isNameOk = true; + } + if (!isAddressOk && isCorrectAddressPoi(addressPoi2, keyWords)) { + check.setAddress(addressPoi2); + isAddressOk = true; + } + if (isNameOk && isAddressOk) { + return; + } + // 最后高德标准化地址拆分 + String formateAddress = check.getFormatAddress(); + if (StringUtils.isNotEmpty(formateAddress)) { + Map resultMap = addressService.splitAddress(check.getCity(), formateAddress); + String nameNew = resultMap.get("name"); + String addressNew = resultMap.get("address"); + if (!isNameOk && isCorrectName(nameNew) && isCorrectNamePoi(nameNew, keyWords)) { + check.setName(nameNew); + isNameOk = true; + } + if (!isAddressOk && isCorrectAddress(addressNew) && isCorrectAddressPoi(addressNew, keyWords)) { + check.setAddress(addressNew); + isAddressOk = true; + } + } - if (!isNameOk) { - check.setName(null); - } + if (!isNameOk) { + check.setName(null); + } - if (!isAddressOk) { - check.setAddress(null); - } - } + if (!isAddressOk) { + check.setAddress(null); + } + } - private void formatAddressAndName(AddressCheck check) { - String nameEnd = check.getName(); - String addressEnd = check.getAddress(); - // name处理 - if (StringUtils.isNotEmpty(nameEnd)) { - if (isStartWithNum(nameEnd) || isEndWithNum(nameEnd)) { - nameEnd = null; - } else { - // 去掉楼结尾的 - nameEnd = check.getName(); - // 先去头部楼层 - String floorNum = isContainsFloorNum(nameEnd); - if (StringUtils.isNotEmpty(floorNum) && nameEnd.startsWith(floorNum)) { - nameEnd = nameEnd.substring(floorNum.length(), nameEnd.length()); - } - // 再去尾部楼层 - String floorNum2 = isContainsFloorNum(nameEnd); - if (StringUtils.isNotEmpty(floorNum2) && nameEnd.endsWith(floorNum2)) { - nameEnd = nameEnd.substring(0, nameEnd.lastIndexOf(floorNum2)); - } - // 再判断是否带数字- - String numData = isContainsNumData(nameEnd); - if (StringUtils.isNotEmpty(numData) && nameEnd.endsWith(numData)) { - nameEnd = nameEnd.substring(0, nameEnd.lastIndexOf(numData)); - } - // 处理后是否超过三个字符 - if (nameEnd.length() < 3) { - nameEnd = null; - } else if (nameEnd.endsWith("旁")) { - nameEnd = nameEnd.substring(0, nameEnd.lastIndexOf("旁")); - } - } - check.setName(nameEnd); - } + private void formatAddressAndName(AddressCheck check) { + String nameEnd = check.getName(); + String addressEnd = check.getAddress(); + // name处理 + if (StringUtils.isNotEmpty(nameEnd)) { + if (isStartWithNum(nameEnd) || isEndWithNum(nameEnd)) { + nameEnd = null; + } else { + // 去掉楼结尾的 + nameEnd = check.getName(); + // 先去头部楼层 + String floorNum = isContainsFloorNum(nameEnd); + if (StringUtils.isNotEmpty(floorNum) && nameEnd.startsWith(floorNum)) { + nameEnd = nameEnd.substring(floorNum.length(), nameEnd.length()); + } + // 再去尾部楼层 + String floorNum2 = isContainsFloorNum(nameEnd); + if (StringUtils.isNotEmpty(floorNum2) && nameEnd.endsWith(floorNum2)) { + nameEnd = nameEnd.substring(0, nameEnd.lastIndexOf(floorNum2)); + } + // 再判断是否带数字- + String numData = isContainsNumData(nameEnd); + if (StringUtils.isNotEmpty(numData) && nameEnd.endsWith(numData)) { + nameEnd = nameEnd.substring(0, nameEnd.lastIndexOf(numData)); + } + // 处理后是否超过三个字符 + if (nameEnd.length() < 3) { + nameEnd = null; + } else if (nameEnd.endsWith("旁")) { + nameEnd = nameEnd.substring(0, nameEnd.lastIndexOf("旁")); + } + } + check.setName(nameEnd); + } - // 地址处理 - if (StringUtils.isNotEmpty(addressEnd)) { - // 检查是否路结尾,以及关键字中是否带路号 - if (addressEnd.endsWith("路")) { - String streetNum = isContainsAddressNum(check.getKeyWords()); - if (StringUtils.isNotEmpty(streetNum)) { - check.setAddress(addressEnd + streetNum); - } - } - } - } + // 地址处理 + if (StringUtils.isNotEmpty(addressEnd)) { + // 检查是否路结尾,以及关键字中是否带路号 + if (addressEnd.endsWith("路")) { + String streetNum = isContainsAddressNum(check.getKeyWords()); + if (StringUtils.isNotEmpty(streetNum)) { + check.setAddress(addressEnd + streetNum); + } + } + } + } - private boolean isStartWithNum(String keyWords) { - Pattern p = Pattern.compile("^[0-9]+"); - Matcher m = p.matcher(keyWords); - if (m.find()) { - return true; - } - return false; - } + private boolean isStartWithNum(String keyWords) { + Pattern p = Pattern.compile("^[0-9]+"); + Matcher m = p.matcher(keyWords); + if (m.find()) { + return true; + } + return false; + } - private boolean isEndWithNum(String keyWords) { - Pattern p = Pattern.compile("[0-9]+$"); - Matcher m = p.matcher(keyWords); - if (m.find()) { - return true; - } - return false; - } + private boolean isEndWithNum(String keyWords) { + Pattern p = Pattern.compile("[0-9]+$"); + Matcher m = p.matcher(keyWords); + if (m.find()) { + return true; + } + return false; + } - private String isContainsAddressNum(String keyWords) { - String num = null; - Pattern p = Pattern.compile("路[0-9]+-{1}[0-9]+号"); - Matcher m = p.matcher(keyWords); - if (m.find()) { - num = m.group(0); - num = num.substring(1, num.length()); - } - return num; - } + private String isContainsAddressNum(String keyWords) { + String num = null; + Pattern p = Pattern.compile("路[0-9]+-{1}[0-9]+号"); + Matcher m = p.matcher(keyWords); + if (m.find()) { + num = m.group(0); + num = num.substring(1, num.length()); + } + return num; + } - private static final String ERROR_NAME = "工业区&商住楼&开发区&金融街&汽配城&商贸中心&发展中心&公寓楼&商贸城&国际大厦&开发区&综合楼&商贸中心&综合大楼&创业园"; + private static final String ERROR_NAME = "工业区&商住楼&开发区&金融街&汽配城&商贸中心&发展中心&公寓楼&商贸城&国际大厦&开发区&综合楼&商贸中心&综合大楼&创业园"; - private boolean isCorrectName(String name) { - if (StringUtils.isEmpty(name)) {// 为空 - return false; - } else if (name.length() < 3) {// 字符少于三个 - return false; - } else if (StringUtils.isNumeric(name) || isDigit(name)) {// 字符为数字 - return false; - } else if (!isContainsChineseWord(name)) { // 不包含汉字 - return false; - } else if (name.startsWith("之")) {// 以之开头,带数字的 - String c = name.substring(1, 2);// 取之后一个字符 - // 判断是否为数字或字母 - if (StringUtils.isNumeric(c) || isDigit(c) || c.matches("[a-zA-Z]+")) { - return false; - } - } else if (name.endsWith("路")) { - return false; - } else if (ERROR_NAME.contains(name)) { - return false; - } - return true; - } + private boolean isCorrectName(String name) { + if (StringUtils.isEmpty(name)) {// 为空 + return false; + } else if (name.length() < 3) {// 字符少于三个 + return false; + } else if (StringUtils.isNumeric(name) || isDigit(name)) {// 字符为数字 + return false; + } else if (!isContainsChineseWord(name)) { // 不包含汉字 + return false; + } else if (name.startsWith("之")) {// 以之开头,带数字的 + String c = name.substring(1, 2);// 取之后一个字符 + // 判断是否为数字或字母 + if (StringUtils.isNumeric(c) || isDigit(c) || c.matches("[a-zA-Z]+")) { + return false; + } + } else if (name.endsWith("路")) { + return false; + } else if (ERROR_NAME.contains(name)) { + return false; + } + return true; + } - private String isContainsFloorNum(String keyWords) { - String num = null; - Pattern p = Pattern.compile( - "[0-9]+楼|[一|二|三|四|五|六|七|八|九|十]+楼|[a-zA-Z]+楼|[0-9]+幢|[一|二|三|四|五|六|七|八|九|十]+幢|[a-zA-Z]+幢|[0-9]+号|[一|二|三|四|五|六|七|八|九|十]+号|[a-zA-Z]+号"); - Matcher m = p.matcher(keyWords); - if (m.find()) { - num = m.group(0); - } - return num; - } + private String isContainsFloorNum(String keyWords) { + String num = null; + Pattern p = Pattern.compile( + "[0-9]+楼|[一|二|三|四|五|六|七|八|九|十]+楼|[a-zA-Z]+楼|[0-9]+幢|[一|二|三|四|五|六|七|八|九|十]+幢|[a-zA-Z]+幢|[0-9]+号|[一|二|三|四|五|六|七|八|九|十]+号|[a-zA-Z]+号"); + Matcher m = p.matcher(keyWords); + if (m.find()) { + num = m.group(0); + } + return num; + } - private String isContainsNumData(String keyWords) { - String num = null; - Pattern p = Pattern.compile("[0-9]+-|[一|二|三|四|五|六|七|八|九|十]+-|[a-zA-Z]+-"); - Matcher m = p.matcher(keyWords); - if (m.find()) { - num = m.group(0); - } - return num; - } + private String isContainsNumData(String keyWords) { + String num = null; + Pattern p = Pattern.compile("[0-9]+-|[一|二|三|四|五|六|七|八|九|十]+-|[a-zA-Z]+-"); + Matcher m = p.matcher(keyWords); + if (m.find()) { + num = m.group(0); + } + return num; + } - private boolean isCorrectNamePoi(String name, String keyWords) { - if (StringUtils.isEmpty(name)) {// 为空 - return false; - } else if (name.length() < 3) {// 字符少于三个 - return false; - } else if (!keyWords.contains(name)) { - return false; - } else if (StringUtils.isNumeric(name) || isDigit(name)) {// 字符为数字 - return false; - } else if (!isContainsChineseWord(name)) { // 不包含汉字 - return false; - } else if (name.startsWith("之")) {// 以之开头,带数字的 - String c = name.substring(1, 2);// 取楼前一个字符 - // 判断是否为数字或字母 - if (StringUtils.isNumeric(c) || isDigit(c) || c.matches("[a-zA-Z]+")) { - return false; - } - } else if (name.endsWith("路")) { - return false; - } else if (ERROR_NAME.contains(name)) { - return false; - } - return true; - } + private boolean isCorrectNamePoi(String name, String keyWords) { + if (StringUtils.isEmpty(name)) {// 为空 + return false; + } else if (name.length() < 3) {// 字符少于三个 + return false; + } else if (!keyWords.contains(name)) { + return false; + } else if (StringUtils.isNumeric(name) || isDigit(name)) {// 字符为数字 + return false; + } else if (!isContainsChineseWord(name)) { // 不包含汉字 + return false; + } else if (name.startsWith("之")) {// 以之开头,带数字的 + String c = name.substring(1, 2);// 取楼前一个字符 + // 判断是否为数字或字母 + if (StringUtils.isNumeric(c) || isDigit(c) || c.matches("[a-zA-Z]+")) { + return false; + } + } else if (name.endsWith("路")) { + return false; + } else if (ERROR_NAME.contains(name)) { + return false; + } + return true; + } - private boolean isCorrectAddress(String address) { // 市区镇县省结尾 - if (StringUtils.isEmpty(address)) {// 为空 - return false; - } else if (address.length() < 3) {// 字符少于三个 - return false; - } else if (StringUtils.isNumeric(address) || isDigit(address)) {// 字符为数字 - return false; - } else if (!isContainsChineseWord(address)) { // 不包含汉字 - return false; - } else if (address.endsWith("省") || address.endsWith("市") || address.endsWith("区") || address.endsWith("县") - || address.endsWith("乡") || address.endsWith("镇") || address.endsWith("村") || address.endsWith("街道")) { // 带数字/字母的楼结尾 - return false; - } - return true; - } + private boolean isCorrectAddress(String address) { // 市区镇县省结尾 + if (StringUtils.isEmpty(address)) {// 为空 + return false; + } else if (address.length() < 3) {// 字符少于三个 + return false; + } else if (StringUtils.isNumeric(address) || isDigit(address)) {// 字符为数字 + return false; + } else if (!isContainsChineseWord(address)) { // 不包含汉字 + return false; + } else if (address.endsWith("省") || address.endsWith("市") || address.endsWith("区") || address.endsWith("县") + || address.endsWith("乡") || address.endsWith("镇") || address.endsWith("村") || address.endsWith("街道")) { // 带数字/字母的楼结尾 + return false; + } + return true; + } - private boolean isCorrectAddressPoi(String address, String keyWords) { // 市区镇县省结尾 - if (StringUtils.isEmpty(address)) {// 为空 - return false; - } else if (address.length() < 3) {// 字符少于三个 - return false; - } else if (!keyWords.contains(address)) { - return false; - } else if (StringUtils.isNumeric(address) || isDigit(address)) {// 字符为数字 - return false; - } else if (!isContainsChineseWord(address)) { // 不包含汉字 - return false; - } else if (address.endsWith("省") || address.endsWith("市") || address.endsWith("区") || address.endsWith("县") - || address.endsWith("乡") || address.endsWith("镇") || address.endsWith("村") || address.endsWith("街道")) { // 带数字/字母的楼结尾 - return false; - } - return true; - } + private boolean isCorrectAddressPoi(String address, String keyWords) { // 市区镇县省结尾 + if (StringUtils.isEmpty(address)) {// 为空 + return false; + } else if (address.length() < 3) {// 字符少于三个 + return false; + } else if (!keyWords.contains(address)) { + return false; + } else if (StringUtils.isNumeric(address) || isDigit(address)) {// 字符为数字 + return false; + } else if (!isContainsChineseWord(address)) { // 不包含汉字 + return false; + } else if (address.endsWith("省") || address.endsWith("市") || address.endsWith("区") || address.endsWith("县") + || address.endsWith("乡") || address.endsWith("镇") || address.endsWith("村") || address.endsWith("街道")) { // 带数字/字母的楼结尾 + return false; + } + return true; + } - private static boolean isDigit(String content) { - boolean flag = false; - Pattern p = Pattern.compile("^[一|二|三|四|五|六|七|八|九|十]+$"); - Matcher m = p.matcher(content); - if (m.matches()) { - flag = true; - } - return flag; - } + private static boolean isDigit(String content) { + boolean flag = false; + Pattern p = Pattern.compile("^[一|二|三|四|五|六|七|八|九|十]+$"); + Matcher m = p.matcher(content); + if (m.matches()) { + flag = true; + } + return flag; + } - private boolean isContainsChineseWord(String content) { - boolean flag = false; - Pattern p = Pattern.compile("^.*[\\u4E00-\\u9FA5]+.*$"); - Matcher m = p.matcher(content); - if (m.matches()) { - flag = true; - } - return flag; - } + private boolean isContainsChineseWord(String content) { + boolean flag = false; + Pattern p = Pattern.compile("^.*[\\u4E00-\\u9FA5]+.*$"); + Matcher m = p.matcher(content); + if (m.matches()) { + flag = true; + } + return flag; + } - /** - * 地址真实性检查 (高德官方)(非银联) - * - * @return - */ - public Object checkAddressAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } - try { - AddressCheckBo bo = addressService.checkAmapAddress(model.getChooseId(), city, model.getAddress().trim());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatAddressCheckBo3(bo, city, model)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + /** + * 地址真实性检查 (高德官方)(非银联) + * + * @return + */ + public Object checkAddressAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } + try { + AddressCheckBo bo = addressService.checkAmapAddress(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatAddressCheckBo3(bo, city, model)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - /** - * 为返回值格式化掉cityCode和AddressId,用于地址验真(非银联版) - * - * @param bo - * @return - */ - private AddressCheckBo formatAddressCheckBo3(AddressCheckBo bo, String city, AddressModel model) { - AddressCheck check = bo.getData(); - if (null != check) { - check.setCityCode(null); - if (StringUtils.isEmpty(check.getCity()) || "[]".equals(check.getCity())) { - check.setCity(city); - } - // 检查相关参数 - if (FJW_LEVEL.equals(model.getDataLevel())) { - bo.setData(check); - } else { - bo.setData(null); - } - } - if ("不存在".equals(bo.getType())) { - bo.setType("地址未找到:抱歉,在" + city + "没有找到与'" + model.getAddress() + "'相关的地点"); - } - return bo; - } + /** + * 为返回值格式化掉cityCode和AddressId,用于地址验真(非银联版) + * + * @param bo + * @return + */ + private AddressCheckBo formatAddressCheckBo3(AddressCheckBo bo, String city, AddressModel model) { + AddressCheck check = bo.getData(); + if (null != check) { + check.setCityCode(null); + if (StringUtils.isEmpty(check.getCity()) || "[]".equals(check.getCity())) { + check.setCity(city); + } + // 检查相关参数 + if (FJW_LEVEL.equals(model.getDataLevel())) { + bo.setData(check); + } else { + bo.setData(null); + } + } + if ("不存在".equals(bo.getType())) { + bo.setType("地址未找到:抱歉,在" + city + "没有找到与'" + model.getAddress() + "'相关的地点"); + } + return bo; + } - /** - * 为返回值格式化掉cityCode和AddressId,用于评级和反欺诈(非银联版) - * - * @param bo - * @return - */ - private AddressCheckBo formatAddressCheckBo4(AddressCheckBo bo, String city, AddressModel model, String type) { - AddressCheck check = bo.getData(); - if (null != check) { - check.setCityCode(null); - if (StringUtils.isEmpty(check.getCity()) || "[]".equals(check.getCity())) { - check.setCity(city); - } - // 检查相关参数 - if (FJW_LEVEL.equals(model.getDataLevel())) { - bo.setData(check); - } else { - check.setDistrictName(null); - check.setKeyWords(null); - check.setKeyWordsUse(null); - check.setRegion(null); - check.setProvionce(null); - check.setNameUse(null); - check.setAddressUse(null); - check.setAddress2(null); - check.setName2(null); - check.setType(null); - check.setFormatAddress(null); - check.setFormatAddress2(null); - check.setLocation2(null); - check.setAddress(null); - check.setAddressId(null); - check.setName(null); - check.setLevel(null); - if (GRADE_AREA.equals(type)) { - check.setScoreIncity(null); - check.setScoreInnation(null); - } else if (GRADE_CITY.equals(type)) { - double score = check.getScoreIncity(); - check.setScore(score); - check.setScoreIncity(null); - check.setScoreInnation(null); - } else if (GRADE_NATION.equals(type)) { - double score = check.getScoreInnation(); - check.setScore(score); - check.setScoreIncity(null); - check.setScoreInnation(null); - }else if(GRADE_CONSUME.equals(type)) { - check.setScoreIncity(null); - check.setScoreInnation(null); - check.setAreaScore(null); - check.setEstateScore(null); - check.setPriceScore(null); - } - bo.setData(check); - } - } - if ("不存在".equals(bo.getType())) { - bo.setType("地址未找到:抱歉,在" + city + "没有找到与'" + model.getAddress() + "'相关的地点"); - } - return bo; - } + /** + * 为返回值格式化掉cityCode和AddressId,用于评级和反欺诈(非银联版) + * + * @param bo + * @return + */ + private AddressCheckBo formatAddressCheckBo4(AddressCheckBo bo, String city, AddressModel model, String type) { + AddressCheck check = bo.getData(); + if (null != check) { + check.setCityCode(null); + if (StringUtils.isEmpty(check.getCity()) || "[]".equals(check.getCity())) { + check.setCity(city); + } + // 检查相关参数 + if (FJW_LEVEL.equals(model.getDataLevel())) { + bo.setData(check); + } else { + check.setDistrictName(null); + check.setKeyWords(null); + check.setKeyWordsUse(null); + check.setRegion(null); + check.setProvionce(null); + check.setNameUse(null); + check.setAddressUse(null); + check.setAddress2(null); + check.setName2(null); + check.setType(null); + check.setFormatAddress(null); + check.setFormatAddress2(null); + check.setLocation2(null); + check.setAddress(null); + check.setAddressId(null); + check.setName(null); + check.setLevel(null); + if (GRADE_AREA.equals(type)) { + check.setScoreIncity(null); + check.setScoreInnation(null); + } else if (GRADE_CITY.equals(type)) { + double score = check.getScoreIncity(); + check.setScore(score); + check.setScoreIncity(null); + check.setScoreInnation(null); + } else if (GRADE_NATION.equals(type)) { + double score = check.getScoreInnation(); + check.setScore(score); + check.setScoreIncity(null); + check.setScoreInnation(null); + } else if (GRADE_CONSUME.equals(type)) { + check.setScoreIncity(null); + check.setScoreInnation(null); + check.setAreaScore(null); + check.setEstateScore(null); + check.setPriceScore(null); + } + bo.setData(check); + } + } + if ("不存在".equals(bo.getType())) { + bo.setType("地址未找到:抱歉,在" + city + "没有找到与'" + model.getAddress() + "'相关的地点"); + } + return bo; + } - /** - * 地址评级(非银联) - */ - public Object gradeAddressAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + /** + * 地址评级(非银联) + */ + public Object gradeAddressAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } - try { - AddressCheckBo bo = addressService.gradeAmapAddress(model.getChooseId(), city, model.getAddress().trim());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatAddressCheckBo4(bo, city, model, GRADE_AREA)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + try { + AddressCheckBo bo = addressService.gradeAmapAddress(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatAddressCheckBo4(bo, city, model, GRADE_AREA)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - /** - * 地址评级(非银联)(城市评分) - */ - public Object gradeCityAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + /** + * 地址评级(非银联)(城市评分) + */ + public Object gradeCityAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } - try { - AddressCheckBo bo = addressService.gradeAmapAddress(model.getChooseId(), city, model.getAddress().trim());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatAddressCheckBo4(bo, city, model, GRADE_CITY)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + try { + AddressCheckBo bo = addressService.gradeAmapAddress(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatAddressCheckBo4(bo, city, model, GRADE_CITY)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - /** - * 地址评级(非银联)(国家评分) - */ - public Object gradeNationAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + /** + * 地址评级(非银联)(国家评分) + */ + public Object gradeNationAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } - try { - AddressCheckBo bo = addressService.gradeAmapAddress(model.getChooseId(), city, model.getAddress().trim());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatAddressCheckBo4(bo, city, model, GRADE_NATION)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + try { + AddressCheckBo bo = addressService.gradeAmapAddress(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatAddressCheckBo4(bo, city, model, GRADE_NATION)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - /** - * 地址反欺诈 (地址验真+周边查询)(非银联) - */ - public Object antiFraudAddressAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + /** + * 地址反欺诈 (地址验真+周边查询)(非银联) + */ + public Object antiFraudAddressAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } - try { - AddressCheckBo bo = addressService.antiFraudAmapAddress(model.getChooseId(), city, - model.getAddress().trim(), model.getType(), model.getRadius(), model.getNumber(), - model.getPageNo());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatAddressCheckBo4(bo, city, model, null)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + try { + AddressCheckBo bo = addressService.antiFraudAmapAddress(model.getChooseId(), city, + model.getAddress().trim(), model.getType(), model.getRadius(), model.getNumber(), + model.getPageNo());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatAddressCheckBo4(bo, city, model, null)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - /** - * 地址反欺诈 (地址验真+周边查询)(非银联) - */ - public Object antiFraudAddressBAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + /** + * 地址反欺诈 (地址验真+周边查询)(非银联) + */ + public Object antiFraudAddressBAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } - try { - AddressCheckBo bo = addressService.antiFraudAmapAddressB(model.getChooseId(), city, - model.getAddress().trim(), model.getType(), model.getRadius(), model.getNumber());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatAddressCheckBo4(bo, city, model, null)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + try { + AddressCheckBo bo = addressService.antiFraudAmapAddressB(model.getChooseId(), city, + model.getAddress().trim(), model.getType(), model.getRadius(), model.getNumber());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatAddressCheckBo4(bo, city, model, null)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - /** - * 地址真实性检查 (v10版) - * - * @return - */ - public Object checkTruthAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } - try { - AddressCheckTruth tr = addressService.checkTruth(model.getChooseId(), city, model.getAddress().trim());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatCheckTruth(tr, city, model)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + /** + * 地址真实性检查 (v10版) + * + * @return + */ + public Object checkTruthAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } + try { + AddressCheckTruth tr = addressService.checkTruth(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatCheckTruth(tr, city, model)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - private AddressCheckTruth formatCheckTruth(AddressCheckTruth tr, String city, AddressModel model) { - if (null != tr) { - if (StringUtils.isEmpty(tr.getCity()) || "[]".equals(tr.getCity())) { - tr.setCity(city); - } - // 检查相关参数 - if (!FJW_LEVEL.equals(model.getDataLevel())) { - tr.setKeyWords(null); - tr.setKeyWordsUse(null); - tr.setDistrictName(null); - } - } - return tr; - } + private AddressCheckTruth formatCheckTruth(AddressCheckTruth tr, String city, AddressModel model) { + if (null != tr) { + if (StringUtils.isEmpty(tr.getCity()) || "[]".equals(tr.getCity())) { + tr.setCity(city); + } + // 检查相关参数 + if (!FJW_LEVEL.equals(model.getDataLevel())) { + tr.setKeyWords(null); + tr.setKeyWordsUse(null); + tr.setDistrictName(null); + } + } + return tr; + } - /** - * 地址评级(v10) - */ - public Object gradeTruthAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + /** + * 地址评级(v10) + */ + public Object gradeTruthAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } - try { - AddressCheckTruth bo = addressService.gradeTruth(model.getChooseId(), city, model.getAddress().trim());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatGradeTruth(bo, city, model, GRADE_AREA)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + try { + AddressCheckTruth bo = addressService.gradeTruth(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatGradeTruth(bo, city, model, GRADE_AREA)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - /** - * 地址评级(v10)(城市评分) - */ - public Object gradeTruthCityAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + /** + * 地址评级(v10)(城市评分) + */ + public Object gradeTruthCityAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } - try { - AddressCheckTruth bo = addressService.gradeTruth(model.getChooseId(), city, model.getAddress().trim());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatGradeTruth(bo, city, model, GRADE_CITY)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + try { + AddressCheckTruth bo = addressService.gradeTruth(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatGradeTruth(bo, city, model, GRADE_CITY)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - /** - * 地址评级(v10)(国家评分) - */ - public Object gradeTruthNationAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + /** + * 地址评级(v10)(国家评分) + */ + public Object gradeTruthNationAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } - try { - AddressCheckTruth bo = addressService.gradeTruth(model.getChooseId(), city, model.getAddress().trim());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatGradeTruth(bo, city, model, GRADE_NATION)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + try { + AddressCheckTruth bo = addressService.gradeTruth(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatGradeTruth(bo, city, model, GRADE_NATION)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - /** - * 为返回值格式化掉cityCode和AddressId,用于评级和反欺诈(非银联版) - * - * @param tr - * @param city - * @param model - * @param type - * @return - */ - private AddressCheckTruth formatGradeTruth(AddressCheckTruth tr, String city, AddressModel model, String type) { - if (null != tr) { - if (StringUtils.isEmpty(tr.getCity()) || "[]".equals(tr.getCity())) { - tr.setCity(city); - } - // 检查相关参数 - if (!FJW_LEVEL.equals(model.getDataLevel())) { - tr.setKeyWords(null); - tr.setKeyWordsUse(null); - tr.setDistrictName(null); - if (GRADE_AREA.equals(type)) { - tr.setScoreIncity(null); - tr.setScoreInnation(null); - } else if (GRADE_CITY.equals(type)) { - double score = tr.getScoreIncity(); - tr.setScore(score); - tr.setScoreIncity(null); - tr.setScoreInnation(null); - } else if (GRADE_NATION.equals(type)) { - double score = tr.getScoreInnation(); - tr.setScore(score); - tr.setScoreIncity(null); - tr.setScoreInnation(null); - }else if(GRADE_CONSUME.equals(type)) { - tr.setScoreIncity(null); - tr.setScoreInnation(null); - tr.setAreaScore(null); - tr.setEstateScore(null); - tr.setPriceScore(null); - } - } - } - return tr; - } + /** + * 为返回值格式化掉cityCode和AddressId,用于评级和反欺诈(非银联版) + * + * @param tr + * @param city + * @param model + * @param type + * @return + */ + private AddressCheckTruth formatGradeTruth(AddressCheckTruth tr, String city, AddressModel model, String type) { + if (null != tr) { + if (StringUtils.isEmpty(tr.getCity()) || "[]".equals(tr.getCity())) { + tr.setCity(city); + } + // 检查相关参数 + if (!FJW_LEVEL.equals(model.getDataLevel())) { + tr.setKeyWords(null); + tr.setKeyWordsUse(null); + tr.setDistrictName(null); + if (GRADE_AREA.equals(type)) { + tr.setScoreIncity(null); + tr.setScoreInnation(null); + } else if (GRADE_CITY.equals(type)) { + double score = tr.getScoreIncity(); + tr.setScore(score); + tr.setScoreIncity(null); + tr.setScoreInnation(null); + } else if (GRADE_NATION.equals(type)) { + double score = tr.getScoreInnation(); + tr.setScore(score); + tr.setScoreIncity(null); + tr.setScoreInnation(null); + } else if (GRADE_CONSUME.equals(type)) { + tr.setScoreIncity(null); + tr.setScoreInnation(null); + tr.setAreaScore(null); + tr.setEstateScore(null); + tr.setPriceScore(null); + } + } + } + return tr; + } - /** - * 地址反欺诈 (地址验真+周边查询)(v10) - */ - public Object antiFraudTruthAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + /** + * 地址反欺诈 (地址验真+周边查询)(v10) + */ + public Object antiFraudTruthAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } - try { - AddressCheckTruth tr = addressService.antiFraudTruth(model.getChooseId(), city, model.getAddress().trim(), - model.getType(), model.getRadius(), model.getNumber(), model.getPageNo());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatCheckTruth(tr, city, model)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + try { + AddressCheckTruth tr = addressService.antiFraudTruth(model.getChooseId(), city, model.getAddress().trim(), + model.getType(), model.getRadius(), model.getNumber(), model.getPageNo());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatCheckTruth(tr, city, model)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - /** - * 地址反欺诈 (地址验真+周边查询)(v10) - */ - public Object antiFraudTruthBAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + /** + * 地址反欺诈 (地址验真+周边查询)(v10) + */ + public Object antiFraudTruthBAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } - try { - AddressCheckTruth tr = addressService.antiFraudTruthB(model.getChooseId(), city, model.getAddress().trim(), - model.getType(), model.getRadius(), model.getNumber());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatCheckTruth(tr, city, model)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } - - /** - * 地址线下消费评级 - * @param model - * @return - */ - @Deprecated - public Object gradeConsumeOfflineAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + try { + AddressCheckTruth tr = addressService.antiFraudTruthB(model.getChooseId(), city, model.getAddress().trim(), + model.getType(), model.getRadius(), model.getNumber());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatCheckTruth(tr, city, model)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - try { - AddressCheckBo bo = addressService.gradeConsumeOffline(model.getChooseId(), city, model.getAddress().trim());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatAddressCheckBo4(bo, city, model, GRADE_CONSUME)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } - - /** - * 地址消费评级(v10) - */ - @Deprecated - public Object gradeConsumeTruthAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + /** + * 地址线下消费评级 + * + * @param model + * @return + */ + @Deprecated + public Object gradeConsumeOfflineAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } - try { - AddressCheckTruth bo = addressService.gradeConsumeTruth(model.getChooseId(), city, model.getAddress().trim());// check是走代理 - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(formatGradeTruth(bo, city, model, GRADE_CONSUME)); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + try { + AddressCheckBo bo = addressService.gradeConsumeOffline(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatAddressCheckBo4(bo, city, model, GRADE_CONSUME)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - /** - * 地址周边消费评级接口 - *

通过用户输入的地址,得到该地址的经纬度,找到该地址附近的三个非商住小区的小区消费评级评分,取一个平均分。

- * @author yinjihuyan - * @param model - * @return - */ - public Object aroundConsumeGradeAction(AddressModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); - mav.setViewType("rest"); - if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); - return mav; - } - // 查询城市是否高德支持 - String city = addressService.findCityAmap(model.getCity().trim()); - if (StringUtils.isEmpty(city)) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); - return mav; - } + /** + * 地址消费评级(v10) + */ + @Deprecated + public Object gradeConsumeTruthAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } - try { - AddressCheckTruth truth = addressService.aroundConsumeGrade(city, model.getAddress()); - if ("F".equals(truth.getLevel())) { - mav.setModel(BasicModel.buildBadRequestModel(truth.getCheckMsg())); - return mav; - } - AroundConsumeGradeBo bo = new AroundConsumeGradeBo(); - bo.setCity(truth.getCity()); - bo.setDistrict(truth.getDistrict()); - bo.setScore(truth.getScore()); - bo.setRegionScore(truth.getRegionScore()); - bo.setLng(truth.getLng()); - bo.setLat(truth.getLat()); - if (FJW_LEVEL.equals(model.getDataLevel())) { - bo.setDistrictNames(truth.getDistrictName()); - } - BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); - model1.setResult(bo); - mav.setModel(model1); - } catch (Exception e) { - LOGGER.error(e.getMessage(), e); - mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); - } - return mav; - } + try { + AddressCheckTruth bo = addressService.gradeConsumeTruth(model.getChooseId(), city, model.getAddress().trim());// check是走代理 + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(formatGradeTruth(bo, city, model, GRADE_CONSUME)); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } - @Authority(role = Role.USER) - public Object riskAction(AddesssMatchModel model) { - RestfulModelAndView mav = new RestfulModelAndView(); + /** + * 地址周边消费评级接口 + *

通过用户输入的地址,得到该地址的经纬度,找到该地址附近的三个非商住小区的小区消费评级评分,取一个平均分。

+ * + * @param model + * @return + * @author yinjihuyan + */ + public Object aroundConsumeGradeAction(AddressModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isEmpty(model.getCity()) || StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市和地址不能为空!")); + return mav; + } + // 查询城市是否高德支持 + String city = addressService.findCityAmap(model.getCity().trim()); + if (StringUtils.isEmpty(city)) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市输入不标准!")); + return mav; + } + + try { + AddressCheckTruth truth = addressService.aroundConsumeGrade(city, model.getAddress()); + if ("F".equals(truth.getLevel())) { + mav.setModel(BasicModel.buildBadRequestModel(truth.getCheckMsg())); + return mav; + } + AroundConsumeGradeBo bo = new AroundConsumeGradeBo(); + bo.setCity(truth.getCity()); + bo.setDistrict(truth.getDistrict()); + bo.setScore(truth.getScore()); + bo.setRegionScore(truth.getRegionScore()); + bo.setLng(truth.getLng()); + bo.setLat(truth.getLat()); + if (FJW_LEVEL.equals(model.getDataLevel())) { + bo.setDistrictNames(truth.getDistrictName()); + } + BasicModel model1 = new BasicModel(HttpStatusCodeEnum.OK); + model1.setResult(bo); + mav.setModel(model1); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + mav.setModel(BasicModel.buildBadRequestModel("网络异常,建议再次请求!")); + } + return mav; + } + + @Authority(role = Role.USER) + public Object riskAction(AddesssMatchModel model) { + RestfulModelAndView mav = new RestfulModelAndView(); // if (StringUtils.isEmpty(model.getCity())) { // mav.setModel(BasicModel.buildBadRequestModel("参数错误,城市不能为空!")); // return mav; // } - if (StringUtils.isEmpty(model.getAddress())) { - mav.setModel(BasicModel.buildBadRequestModel("参数错误,地址不能为空!")); - return mav; - } - BasicModel resultModel = new BasicModel(HttpStatusCodeEnum.OK); - Map resultMap = new HashMap(); - try { - Map params = new HashMap(); - if (StringUtils.isNotBlank(model.getCity())) { - params.put("city", model.getCity()); - } - params.put("address", model.getAddress()); - params.put("useMap", "false"); - String result = addressMatchProxyService.parser(params); - if (result != null) { - JSONObject json = JSONObject.fromObject(result); - if (json.getInt("code") == 200) { - JSONObject resultJson = json.getJSONObject("result"); - JSONObject searchAddress = resultJson.getJSONObject("searchAddress"); - if (resultJson.getDouble("credit") > 0) { - District district = districtService.findByNameAndAlias(resultJson.getString("city"), resultJson.getString("district"), resultJson.getString("name"), "district"); - if (district != null) { - resultMap.put("riskLevel", "A"); - resultModel.setResult(resultMap); - mav.setModel(resultModel); - return mav; - } - } - StringBuffer searchKey = new StringBuffer(); - if (searchAddress.containsKey("street")) { - searchKey.append(searchAddress.getString("street")); - } - if (searchAddress.containsKey("streetNumber")) { - searchKey.append(searchAddress.getString("streetNumber")); - } - if (StringUtils.isNotBlank(searchKey.toString()) && searchAddress.has("city") && StringUtils.isNotBlank(searchAddress.getString("city"))) { + if (StringUtils.isEmpty(model.getAddress())) { + mav.setModel(BasicModel.buildBadRequestModel("参数错误,地址不能为空!")); + return mav; + } + BasicModel resultModel = new BasicModel(HttpStatusCodeEnum.OK); + Map resultMap = new HashMap(); + try { + Map params = new HashMap(); + if (StringUtils.isNotBlank(model.getCity())) { + params.put("city", model.getCity()); + } + params.put("address", model.getAddress()); + params.put("useMap", "false"); + String result = addressMatchProxyService.parser(params); + if (result != null) { + JSONObject json = JSONObject.fromObject(result); + if (json.getInt("code") == 200) { + JSONObject resultJson = json.getJSONObject("result"); + JSONObject searchAddress = resultJson.getJSONObject("searchAddress"); + if (resultJson.getDouble("credit") > 0) { + District district = districtService.findByNameAndAlias(resultJson.getString("city"), resultJson.getString("district"), resultJson.getString("name"), "district"); + if (district != null) { + resultMap.put("riskLevel", "A"); + resultModel.setResult(resultMap); + mav.setModel(resultModel); + return mav; + } + } + StringBuffer searchKey = new StringBuffer(); + if (searchAddress.containsKey("street")) { + searchKey.append(searchAddress.getString("street")); + } + if (searchAddress.containsKey("streetNumber")) { + searchKey.append(searchAddress.getString("streetNumber")); + } + if (StringUtils.isNotBlank(searchKey.toString()) && searchAddress.has("city") && StringUtils.isNotBlank(searchAddress.getString("city"))) { // JSONObject jsonObject = addressMatchProxyService.searchByAmap(searchAddress.getString("city"), model.getAddress()); // JSONArray poisData = jsonObject.getJSONArray("pois"); // for (int i = 0; i < poisData.size(); i++) { @@ -3336,120 +3341,120 @@ public class AddressController { // continue; // } // } - String city = searchAddress.getString("city"); - List poiList = this.findPois(city, searchKey.toString()); - if (CollectionUtils.isNotEmpty(poiList)) { - resultMap.put("riskLevel", "A"); - } else { - resultMap.put("riskLevel", "B"); - } - resultModel.setResult(resultMap); - mav.setModel(resultModel); - return mav; - } - } - } - } catch (Exception ex) { - LOGGER.error("风险识别出错:" + ex.getMessage(), ex); - } + String city = searchAddress.getString("city"); + List poiList = this.findPois(city, searchKey.toString()); + if (CollectionUtils.isNotEmpty(poiList)) { + resultMap.put("riskLevel", "A"); + } else { + resultMap.put("riskLevel", "B"); + } + resultModel.setResult(resultMap); + mav.setModel(resultModel); + return mav; + } + } + } + } catch (Exception ex) { + LOGGER.error("风险识别出错:" + ex.getMessage(), ex); + } - resultMap.put("riskLevel","C"); - resultModel.setResult(resultMap); - mav.setModel(resultModel); - return mav; - } + resultMap.put("riskLevel", "C"); + resultModel.setResult(resultMap); + mav.setModel(resultModel); + return mav; + } - private List findPois(String city, String address) { - JSONObject reqBody = new JSONObject(); - reqBody.put("from", 0); - reqBody.put("size", 1); - JSONObject query = new JSONObject(); - JSONObject bool = new JSONObject(); - JSONArray must = new JSONArray(); - must.add(addTerm("city", city)); - must.add(addMatchPhrase("address", address)); - bool.put("must", must); - query.put("bool", bool); - reqBody.put("query", query); - Base64 token = new Base64(); - String authenticationEncoding = token.encodeAsString((""+ES_USER+":"+ES_PASSWORD+"").getBytes()); - HttpRequest request = new HttpRequest(); - Map headers = new HashMap(); - headers.put("Content-Type", "application/json"); - headers.put("Authorization", "Basic "+authenticationEncoding+""); - try { - String response = request.postWithBody("http://192.168.0.45:9200/association/_search", reqBody, headers, "UTF-8"); - JSONObject json = JSONObject.fromObject(response); - if(!json.containsKey("hits") || !json.getJSONObject("hits").containsKey("hits")){ - return Collections.emptyList(); - } - JSONArray hits = json.getJSONObject("hits").getJSONArray("hits"); - List results = new ArrayList(); - for(int i=0 ;i < hits.size(); i++){ - JSONObject jsonObject = hits.getJSONObject(i); - results.add(jsonObject); - } - return results; + private List findPois(String city, String address) { + JSONObject reqBody = new JSONObject(); + reqBody.put("from", 0); + reqBody.put("size", 1); + JSONObject query = new JSONObject(); + JSONObject bool = new JSONObject(); + JSONArray must = new JSONArray(); + must.add(addTerm("city", city)); + must.add(addMatchPhrase("address", address)); + bool.put("must", must); + query.put("bool", bool); + reqBody.put("query", query); + Base64 token = new Base64(); + String authenticationEncoding = token.encodeAsString(("" + ES_USER + ":" + ES_PASSWORD + "").getBytes()); + HttpRequest request = new HttpRequest(); + Map headers = new HashMap(); + headers.put("Content-Type", "application/json"); + headers.put("Authorization", "Basic " + authenticationEncoding + ""); + try { + String response = request.postWithBody("http://192.168.0.45:9200/association/_search", reqBody, headers, "UTF-8"); + JSONObject json = JSONObject.fromObject(response); + if (!json.containsKey("hits") || !json.getJSONObject("hits").containsKey("hits")) { + return Collections.emptyList(); + } + JSONArray hits = json.getJSONObject("hits").getJSONArray("hits"); + List results = new ArrayList(); + for (int i = 0; i < hits.size(); i++) { + JSONObject jsonObject = hits.getJSONObject(i); + results.add(jsonObject); + } + return results; - } catch (HttpRequestException e) { - e.printStackTrace(); - } - return Collections.emptyList(); - } + } catch (HttpRequestException e) { + e.printStackTrace(); + } + return Collections.emptyList(); + } - public void setAddressService(AddressService addressService) { - this.addressService = addressService; - } + public void setAddressService(AddressService addressService) { + this.addressService = addressService; + } - public void setEvaluationService(EvaluationService evaluationService) { - this.evaluationService = evaluationService; - } + public void setEvaluationService(EvaluationService evaluationService) { + this.evaluationService = evaluationService; + } - public void setDistrictService(DistrictService districtService) { - this.districtService = districtService; - } + public void setDistrictService(DistrictService districtService) { + this.districtService = districtService; + } - public void setCommDataService(CommDataService commDataService) { - this.commDataService = commDataService; - } + public void setCommDataService(CommDataService commDataService) { + this.commDataService = commDataService; + } - public void setRegionBlockService(RegionBlockService regionBlockService) { - this.regionBlockService = regionBlockService; - } + public void setRegionBlockService(RegionBlockService regionBlockService) { + this.regionBlockService = regionBlockService; + } - public void setBaiduApiService(BaiduApiService baiduApiService) { - this.baiduApiService = baiduApiService; - } + public void setBaiduApiService(BaiduApiService baiduApiService) { + this.baiduApiService = baiduApiService; + } - public void setAddressParser(AddressParser addressParser) { - this.addressParser = addressParser; - } + public void setAddressParser(AddressParser addressParser) { + this.addressParser = addressParser; + } - public void setServerAreaService(ServerAreaService serverAreaService) { - this.serverAreaService = serverAreaService; - } + public void setServerAreaService(ServerAreaService serverAreaService) { + this.serverAreaService = serverAreaService; + } - public AddressParserService getAddressParserService() { - return addressParserService; - } + public AddressParserService getAddressParserService() { + return addressParserService; + } - public void setAddressParserService(AddressParserService addressParserService) { - this.addressParserService = addressParserService; - } + public void setAddressParserService(AddressParserService addressParserService) { + this.addressParserService = addressParserService; + } - public void setWaitCrawlKeywordsService(WaitCrawlKeywordsService waitCrawlKeywordsService) { - this.waitCrawlKeywordsService = waitCrawlKeywordsService; - } + public void setWaitCrawlKeywordsService(WaitCrawlKeywordsService waitCrawlKeywordsService) { + this.waitCrawlKeywordsService = waitCrawlKeywordsService; + } - public void setFjtEvaluationService(FjtEvaluationService fjtEvaluationService) { - this.fjtEvaluationService = fjtEvaluationService; - } + public void setFjtEvaluationService(FjtEvaluationService fjtEvaluationService) { + this.fjtEvaluationService = fjtEvaluationService; + } - public void setHouseLoudongService(HouseLoudongService houseLoudongService) { - this.houseLoudongService = houseLoudongService; - } + public void setHouseLoudongService(HouseLoudongService houseLoudongService) { + this.houseLoudongService = houseLoudongService; + } - public void setAddressMatchProxyService(AddressMatchProxyService addressMatchProxyService) { - this.addressMatchProxyService = addressMatchProxyService; - } + public void setAddressMatchProxyService(AddressMatchProxyService addressMatchProxyService) { + this.addressMatchProxyService = addressMatchProxyService; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java index 710ced096..4d264b835 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/ComprehensiveQueryController.java @@ -1,18 +1,16 @@ package com.fangjia.open.controllers; import com.fangjia.core.util.*; +import com.fangjia.dal.mongo.model.AdministrativeDivision; import com.fangjia.dal.common.DistrictKey; import com.fangjia.dal.mongo.fangjia.model.ServerArea; import com.fangjia.dal.mongo.model.ApiUserCfg; import com.fangjia.dal.mongo.model.DistrictFacilitys; import com.fangjia.dal.mongo.model.Evaluation; -import com.fangjia.dal.mongo.model.FangjiaOfficialAreaMap; import com.fangjia.dal.mongo.model.bkoff.Loudong; import com.fangjia.dal.mongo.open.model.ApiUserAuthority; import com.fangjia.dal.mongo.open.model.EvaluateRatio; import com.fangjia.dal.seaweed.model.District; -import com.fangjia.open.HttpCode; -import com.fangjia.open.OpenHttpCodeEnum; import com.fangjia.open.dto.HouseValueInformationDto; import com.fangjia.open.dto.UniversalDto; import com.fangjia.open.dto.addressGovernance.MatchedBuildingDto; @@ -35,7 +33,6 @@ import com.fangjia.service.mongo.bkoff.HouseLoudongService; import com.fangjia.service.mongo.bkoff.LoudongService; import com.fangjia.service.mongo.fangjia.*; import com.fangjia.service.open.*; -import com.fangjia.service.tool.OpenLogService; import com.fangjia.service.web.AddressService; import net.sf.json.JSONObject; import org.apache.commons.lang.ArrayUtils; @@ -84,6 +81,7 @@ public class ComprehensiveQueryController { static final int BAI_DU_GEO = 1;// 百度系坐标 static final int GAO_DE_GEO = 2;// 高德系坐标 + private AdministrativeDivisionService administrativeDivisionService; private EvaluateRatioService evaluateRatioService; @@ -213,11 +211,22 @@ public class ComprehensiveQueryController { HouseValueInformationDto houseValueInformation = new HouseValueInformationDto(); RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getAddress()) || StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(String.valueOf(model.getSize()))) { - mav.setModel(BasicModel.buildBadRequestModel("城市(city),地址(address),面积(size)为必填字段")); + if (StringUtils.isBlank(model.getAddress()) || StringUtils.isBlank(String.valueOf(model.getSize()))) { + mav.setModel(BasicModel.buildBadRequestModel("地址(address),面积(size)为必填字段")); return mav; } + String cityStr = model.getCity(); + if (StringUtils.isNotBlank(cityStr) && cityStr.matches("\\d+")) { + AdministrativeDivision administrativeDivision = administrativeDivisionService.findcityByCode(cityStr); + String city = administrativeDivision.getCityShort(); + if (StringUtils.isBlank(city)) { + mav.setModel(BasicModel.buildBadRequestModel("城市代码错误")); + return mav; + } + model.setCity(city); + } + HttpRequest httpRequest = new HttpRequest(); JSONObject json = null; Map communityAvgPriceParams = new HashMap(); @@ -228,10 +237,11 @@ public class ComprehensiveQueryController { JSONObject matchResponse = null; try { matchResponse = httpRequest.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/v2/match", communityAvgPriceParams, "UTF-8"); +// matchResponse = httpRequest.getJsonContent("http://192.168.0.19:31080/FangJiaAddressService/v2/match", communityAvgPriceParams, "UTF-8"); } catch (HttpRequestException e) { } - if(matchResponse == null || !matchResponse.containsKey("result") || !matchResponse.getJSONObject("result").containsKey("id")) { + if (matchResponse == null || !matchResponse.containsKey("result") || !matchResponse.getJSONObject("result").containsKey("id")) { mav.setModel(BasicModel.buildBadRequestModel("该地址不支持估价!")); return mav; } @@ -266,6 +276,8 @@ public class ComprehensiveQueryController { district = bieShuDistrict; } } + //添加城市 + propertyEvaluationModel.setCity(district.getCity()); propertyEvaluationModel.setDistrict(district.getRegion()); propertyEvaluationModel.setName(district.getName()); try { @@ -286,7 +298,7 @@ public class ComprehensiveQueryController { // RestfulModelAndView houseCaseMav = new RestfulModelAndView(); List querys = null; try { - querys = convertSampileQueryToBean(district,sampleQuery); + querys = convertSampileQueryToBean(district, sampleQuery); } catch (Exception e) { mav.setModel(BasicModel.buildBadRequestModel(e.getMessage())); return mav; @@ -298,7 +310,7 @@ public class ComprehensiveQueryController { long start = System.currentTimeMillis(); List collaterals = czbankSampleService.findSample2(querys, sampleQuery.getMax()); long end = System.currentTimeMillis(); - System.out.println("用时:"+(end-start)); + System.out.println("用时:" + (end - start)); Collateral collateral = collaterals.get(0); List samples = collateral.getSample(); UniversalDto houseCaseDto = UniversalDto.newDto(); @@ -425,7 +437,7 @@ public class ComprehensiveQueryController { return propertyModel; } - private List convertSampileQueryToBean(District district,SampleQuery... queries) throws Exception { + private List convertSampileQueryToBean(District district, SampleQuery... queries) throws Exception { List queryBeans = new ArrayList(queries.length); for (SampleQuery q : queries) { @@ -497,10 +509,10 @@ public class ComprehensiveQueryController { throws NumberFormatException, IllegalAccessException { // RestfulModelAndView mav = new RestfulModelAndView(); // mav.setViewType("rest"); - if (StringUtils.isBlank(model.getCity()) || StringUtils.isBlank(model.getName()) + if (StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getDistrict()) || model.getSize() <= 0) { - mav.setModel(BasicModel.buildBadRequestModel("参数非法:城市,区域,小区名,面积(size)为必填项")); - return mav; + mav.setModel(BasicModel.buildBadRequestModel("参数非法:区域,小区名,面积(size)为必填项")); +// return mav; } if (model.getCity().endsWith("市")) { model.setCity(model.getCity().replaceAll("市$", "")); @@ -1229,8 +1241,6 @@ public class ComprehensiveQueryController { } - - public void setEvaluationService(EvaluationService evaluationService) { this.evaluationService = evaluationService; } @@ -1253,7 +1263,6 @@ public class ComprehensiveQueryController { } - public BatchEvaluateService getBatchEvaluateService() { return batchEvaluateService; } @@ -1312,5 +1321,8 @@ public class ComprehensiveQueryController { this.districtFacilitysService = districtFacilitysService; } + public void setAdministrativeDivisionService(AdministrativeDivisionService administrativeDivisionService) { + this.administrativeDivisionService = administrativeDivisionService; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index d838ffcca..81a281610 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -880,8 +880,13 @@ public class PropertyController { districtInfoDto.setAddressAlias(district.getAddrAlias()); if (district.getLat2() != null && district.getLat2() != 0 && district.getLng2() != null && district.getLng2() != 0) { - districtInfoDto.setLat(district.getLat2() / 10000000000D); - districtInfoDto.setLng(district.getLng2() / 10000000000D); + districtInfoDto.setLat2(district.getLat2() / 10000000000D); + districtInfoDto.setLng2(district.getLng2() / 10000000000D); + } + if (district.getLat() != null && district.getLat() != 0 && district.getLng() != null + && district.getLng() != 0) { + districtInfoDto.setLat(district.getLat() / 10000000000D); + districtInfoDto.setLng(district.getLng() / 10000000000D); } districtInfoDto.setPropertyType(district.getEstateType2()); if (HouseValidator.validateBuildingType(district.getBuildType())) { @@ -3508,7 +3513,8 @@ public class PropertyController { if (model.getHall() != null) { params.add(new QueryParam("hall", model.getHall())); } - params.add(new QueryParam("score", QueryParam.GREATER_THAN_OPERATOR, 200000000000l)); + // 18年之后抓住的数据没有score字段 +// params.add(new QueryParam("score", QueryParam.GREATER_THAN_OPERATOR, 200000000000l)); List dealPrices = dealPriceService.findDealPrices(params, max); List distinctDealPrices = new ArrayList(); for (DealPrice dealPrice : dealPrices) { diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java index e97bc10ae..73e27d8a6 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java @@ -542,7 +542,7 @@ public class UserController { String code = usersInfoService.randomCode(); System.out.println(code); try { - smsService.send(model.getMobile(), "【房价网】你的验证码是" + code + ",请立即验证。"); + smsService.send(model.getMobile(), "【百盛评估】你的验证码是" + code + ",请立即验证。"); resultModel.setResult(Message.RESULT_SUCCESS); CookieUtils.setCookie(mobile + "_" + type, code, "/", 60 * 60 * 24 *7, resp); CacheUtils.putValue(CachePolicyEnum.TINY, FjtUsers.class, mobile, new Date().getTime()); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java index c89bc6f53..716c2156f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java @@ -1285,15 +1285,17 @@ public class WeiXinEvaluationController { Point point = null; if(district.getLng2()!=null){ point = new Point(district.getLng2()/10000000000.0, district.getLat2()/10000000000.0); + + //boolean flag = InsidePolygon.aboutZone(point, points); + //boolean flag = InsidePolygon.isPtInPoly(point.getLon(), point.getLat(), points); + boolean flag = InsidePolygon2.checkIsInPolygon(point, points); + if(flag){ + pbObj = pb; + System.out.println(district.getRegion()+" "+district.getName()+" "+pb.getName()); + break; + } } - //boolean flag = InsidePolygon.aboutZone(point, points); - //boolean flag = InsidePolygon.isPtInPoly(point.getLon(), point.getLat(), points); - boolean flag = InsidePolygon2.checkIsInPolygon(point, points); - if(flag){ - pbObj = pb; - System.out.println(district.getRegion()+" "+district.getName()+" "+pb.getName()); - break; - } + } Integer yearAge = getBuildYear(district.getFinishBuildingDate()); if(pbObj!=null){ diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictInfoDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictInfoDto.java index 6fbca5e08..8d24c760f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictInfoDto.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/DistrictInfoDto.java @@ -26,8 +26,14 @@ public class DistrictInfoDto { private List alias; private List addressAlias; private String videoUrl; + //高德坐标 + //维度 private Double lat; + //经度 private Double lng; + // 百度坐标 + private Double lat2; + private Double lng2; private String developer; private String buildType; private String estateCompany; @@ -102,7 +108,22 @@ public class DistrictInfoDto { private String township; private String landProperty; - + public Double getLat2() { + return lat2; + } + + public void setLat2(Double lat2) { + this.lat2 = lat2; + } + + public Double getLng2() { + return lng2; + } + + public void setLng2(Double lng2) { + this.lng2 = lng2; + } + public String getDistrict() { return district; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java index ea10ab2f4..1a8907341 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddesssMatchModel.java @@ -9,6 +9,7 @@ import org.hibernate.validator.constraints.NotBlank; public class AddesssMatchModel extends FangjiaApiModel { private String city; + private String refCity; @NotBlank private String address; private String suggestDistrict; @@ -24,6 +25,14 @@ public class AddesssMatchModel extends FangjiaApiModel { private String showCode; + public String getRefCity() { + return refCity; + } + + public void setRefCity(String refCity) { + this.refCity = refCity; + } + public String getAddress_1() { return address_1; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddressModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddressModel.java index 4572cb47e..fe0a1741d 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddressModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/AddressModel.java @@ -42,6 +42,10 @@ public class AddressModel extends FangjiaApiModel { //是否使用地图poi数据 private boolean useMap; + //涉农到区之后,是否显式后面的字段值 + private String showFullValue; + //是否显示涉农测试用字段值 + private String showTestValue; public boolean isContainsLocation() { return containsLocation; } @@ -258,4 +262,20 @@ public class AddressModel extends FangjiaApiModel { public void setUseMap(boolean useMap) { this.useMap = useMap; } + + public String getShowFullValue() { + return showFullValue; + } + + public void setShowFullValue(String showFullValue) { + this.showFullValue = showFullValue; + } + + public String getShowTestValue() { + return showTestValue; + } + + public void setShowTestValue(String showTestValue) { + this.showTestValue = showTestValue; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/test.java b/projects/fangjia-open/src/main/java/com/fangjia/open/test.java new file mode 100644 index 000000000..3adf910da --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/test.java @@ -0,0 +1,10 @@ +package com.fangjia.open; + +public class test { + public static void main(String[] args) { + String a = "123545"; + String b ="i980"; + System.out.println(a.matches("\\d+")); + System.out.println(b.matches("\\d+")); + } +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/test.java b/projects/fangjia-open/src/main/java/com/fangjia/test.java new file mode 100644 index 000000000..055094273 --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/test.java @@ -0,0 +1,18 @@ +package com.fangjia; + +import org.apache.commons.codec.digest.DigestUtils; +import org.apache.commons.codec.binary.Hex; +import java.util.Scanner; + +public class test { + public static void main(String[] args) { + while (true){ + Scanner scanner = new Scanner(System.in); + String password = scanner.nextLine(); + String p =DigestUtils.md5Hex(password); + System.out.println(p); + + } + + } +} diff --git a/projects/fangjia-open/src/main/webapp/district/districtDetail.ftl b/projects/fangjia-open/src/main/webapp/district/districtDetail.ftl index df44569db..761d749d7 100644 --- a/projects/fangjia-open/src/main/webapp/district/districtDetail.ftl +++ b/projects/fangjia-open/src/main/webapp/district/districtDetail.ftl @@ -109,9 +109,11 @@ -

+ diff --git a/projects/fangjia-open/src/main/webapp/static/images/baisheng_logo.jpg b/projects/fangjia-open/src/main/webapp/static/images/baisheng_logo.jpg new file mode 100644 index 000000000..5836db407 Binary files /dev/null and b/projects/fangjia-open/src/main/webapp/static/images/baisheng_logo.jpg differ diff --git a/projects/fangjia-open/src/main/webapp/static/images/baisheng_logo2.jpg b/projects/fangjia-open/src/main/webapp/static/images/baisheng_logo2.jpg new file mode 100644 index 000000000..af13b474b Binary files /dev/null and b/projects/fangjia-open/src/main/webapp/static/images/baisheng_logo2.jpg differ diff --git a/projects/fangjia-open/src/main/webapp/static/images/bs_bananer.jpg b/projects/fangjia-open/src/main/webapp/static/images/bs_bananer.jpg new file mode 100644 index 000000000..79ac3c5fd Binary files /dev/null and b/projects/fangjia-open/src/main/webapp/static/images/bs_bananer.jpg differ diff --git a/projects/fangjia-open/src/main/webapp/user/bhydLoginPage.ftl b/projects/fangjia-open/src/main/webapp/user/bhydLoginPage.ftl index 11b6bd390..18bf22242 100644 --- a/projects/fangjia-open/src/main/webapp/user/bhydLoginPage.ftl +++ b/projects/fangjia-open/src/main/webapp/user/bhydLoginPage.ftl @@ -21,12 +21,12 @@ - +