diff --git a/projects/fangjia-bkoff/pom.xml b/projects/fangjia-bkoff/pom.xml index 41b8a352d..69e2d3b60 100644 --- a/projects/fangjia-bkoff/pom.xml +++ b/projects/fangjia-bkoff/pom.xml @@ -178,6 +178,11 @@ 1.0.0 jdk18 + + com.alibaba + easyexcel + 4.0.1 + 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 691eb9427..54be64383 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java @@ -1,11 +1,13 @@ package com.fangjia.bkoff.controllers; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.util.DateUtils; +import com.alibaba.excel.write.metadata.WriteSheet; import com.fangjia.bkoff.model.ApiUserModel; import com.fangjia.bkoff.model.JsonModel; -import com.fangjia.core.util.BeanUtils; -import com.fangjia.core.util.DataUtil; -import com.fangjia.core.util.DateUtil; -import com.fangjia.core.util.StringUtil; +import com.fangjia.core.util.*; +import com.fangjia.dal.QueryParam; import com.fangjia.dal.mongo.fangjia.model.ServerArea; import com.fangjia.dal.mongo.model.ApiInvokeStatistical; import com.fangjia.dal.mongo.model.ApiUserCfg; @@ -27,23 +29,33 @@ import com.fangjia.service.sql.UserService; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DateUtils; import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.bson.types.ObjectId; import org.json.JSONArray; +import org.sothis.core.util.CollectionUtils; import org.sothis.web.mvc.ActionContext; import org.sothis.web.mvc.annotation.Param; +import scala.Int; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.math.BigDecimal; import java.net.URLEncoder; +import java.text.DecimalFormat; import java.text.SimpleDateFormat; import java.util.*; + /** * apiÓû§¿ªͨµȹÜÀícontroller * @@ -62,7 +74,6 @@ public class ApiUserController { private ApiVisitCountService apiVisitCountService; private ApiCountCityService apiCountCityService; - /** * ËùÓÐapiÓû§µÄÐÅϢչʾ * @@ -303,14 +314,15 @@ public class ApiUserController { user.put("password", DigestUtils.md5Hex(model.getPassword())); // // // ¸ü¸ÄÓû§ÃÜÂë - this.userService.updateById(user,userId); + this.userService.updateById(user, userId); // ˢлº´æ this.apiUserService.clearApiUserAuthorityCache(userId); model.setViewType("redirect"); - model.setViewParam("location", "/apiUser/edit?userId="+userId); + model.setViewParam("location", "/apiUser/edit?userId=" + userId); return model; } + public Object editPwdAction(ApiUserModel model) { Long userId = model.getUserId(); User user = this.userService.findById(userId); @@ -718,6 +730,8 @@ public class ApiUserController { apiUserAuthorityService.update(authority); } } + // ˢлº´æ + this.apiUserService.clearApiUserAuthorityCache(userId); return model; } @@ -973,7 +987,21 @@ public class ApiUserController { } else { cities = new ArrayList(); } - List analys = openUriAnalyService.findOpenUriAnalyLogs(model.getUserId(), null, startDate, endDate); + // ֻ²éѯÕýʽÕ˺Å + List queryParams = Arrays.asList(new QueryParam("isTest", 0)); + List apiUsers = this.apiUserService.findApiUsersByParamsSortDate(queryParams); + // »ñȡÕýʽÕ˺ŵÄids + List ids = new ArrayList(); + for (ApiUser apiUser : apiUsers) { + ids.add((int) apiUser.getId()); + } + List analyAll = openUriAnalyService.findOpenUriAnalyLogs(model.getUserId(), null, startDate, endDate); + List analys = new ArrayList(); + for (OpenUriAnaly analy : analyAll) { + if (ids.contains(analy.getApiUserId())) { + analys.add(analy); + } + } List bos = null; List eachCityBos = null; if (model.getWay() == null) { @@ -1014,9 +1042,7 @@ public class ApiUserController { } } } - List userIds = new ArrayList(); for (StatAnalyBo boTemp : bos) { - userIds.add(Long.valueOf(boTemp.getUserId())); List apiVisitCounts = apiVisitCountService.findAllApiVisitCount(Long.valueOf(boTemp.getUserId()), null, startDate, endDate); int total = 0; for (ApiVisitCount apiVisitCount : apiVisitCounts) { @@ -1025,7 +1051,6 @@ public class ApiUserController { boTemp.setBillingCount(total); } - List apiUsers = apiUserService.findApiUserByIds(userIds); Map idUserMap = new HashMap(); for (ApiUser apiUser : apiUsers) { idUserMap.put(apiUser.getId(), apiUser); @@ -1049,8 +1074,234 @@ public class ApiUserController { return model; } + public Object exportAction(ApiUserModel model, HttpServletResponse response) throws IllegalAccessException { + Date startDate = null; + Date endDate = null; + if (StringUtils.isBlank(model.getBegDate()) && StringUtils.isBlank(model.getEndDate())) { + startDate = DateUtil.add(DateUtil.formatToYYYYMMDD(new Date()), -7); + endDate = DateUtil.parseStringToDate(DateUtil.formatToYYYYMMDD(new Date())); + } else { + if (StringUtils.isNotBlank(model.getBegDate())) { + startDate = DateUtil.parseStringToDate(model.getBegDate()); + } + if (StringUtils.isNotBlank(model.getEndDate())) { + endDate = DateUtil.parseStringToDate(model.getEndDate()); + } - public Object userVisitStatAction(ApiUserModel model) { + } + if (startDate != null) { + model.setBegDate(DateUtil.formatToYYYYMMDD(startDate)); + } + + if (endDate != null) { + model.setEndDate(DateUtil.formatToYYYYMMDD(endDate)); + } + Date nowDate = DateUtil.parseStringToDate(DateUtil.formatToYYYYMMDD(new Date())); + Date lastWeek = DateUtil.add(DateUtil.formatToYYYYMMDD(new Date()), -7); + Date lastMonth = DateUtil.add(DateUtil.formatToYYYYMMDD(new Date()), -30); + + long diffInMillies = Math.abs(endDate.getTime() - startDate.getTime()); + + // ½«ºÁÃëת»»ΪÌìÊý + long days = diffInMillies / (1000 * 60 * 60 * 24); // ʹÓÃlongÀ´¼ÆËãÌìÊý + + // ֻ²éѯÕýʽÕ˺š¢δ¹ýÆڡ¢δ½ûÓà + List queryParams = Arrays.asList(new QueryParam("isTest", 0), + new QueryParam("status", 0), + new QueryParam("deadTime", QueryParam.GREATER_THAN_EQUAL_OPERATOR, new Date())); + List apiUsers = this.apiUserService.findApiUsersByParamsSortDate(queryParams); + + //ËùÓÐAPI + List allApi = openResourceService.findAll(); + // ËùÓÐAPIµÄURIÓëname¶ÔӦMap + Map apiMap = converMapData(allApi); + List bosAll = new ArrayList(); + if (CollectionUtils.isNotEmpty(apiUsers)) { + // ¸ù¾ݷÃÎʱéÀúÓû§ + for (ApiUser apiUser : apiUsers) { + long id = apiUser.getId(); + // »ñȡÿ¸öÓû§µķÃÎÊ + ApiUserAuthority authority = apiUserAuthorityService.findByUserId(id); + // Óû§ÓеÄapi + List userApi = authority.getOpenResourseUris(); + Map countMap = authority.getTotalCountMap(); + // »ñȡÓû§Ãû + User user = userService.findById(id); + long date = DateUtil.parseStringToDate("2016-11-23").getTime(); + if (startDate.getTime() >= date && endDate.getTime() > date) { + List apiInvokeStatisticalList = apiInvokeStatisticalService.findApiInvokeStatisticalList(id, startDate, endDate); + List weekApiInvokeStatisticalList; + if (lastWeek == startDate && nowDate == endDate) { + weekApiInvokeStatisticalList = apiInvokeStatisticalList; + } else { + weekApiInvokeStatisticalList = apiInvokeStatisticalService.findApiInvokeStatisticalList(id, lastWeek, nowDate); + } + List monthApiInvokeStatisticalList; + if (lastMonth == startDate && nowDate == endDate) { + monthApiInvokeStatisticalList = apiInvokeStatisticalList; + } else { + monthApiInvokeStatisticalList = apiInvokeStatisticalService.findApiInvokeStatisticalList(id, lastMonth, nowDate); + } + Map> resultMap = getCountByUri(apiInvokeStatisticalList); + Map> weekResultMap = getCountByUri(weekApiInvokeStatisticalList); + Map> monthResultMap = getCountByUri(monthApiInvokeStatisticalList); + + // ±éÀúÓû§ËùÓеÄapi + for (String url : userApi) { + // ͳ¼ÆÓùýµÄapi + String urlName = apiMap.get(url); + StatAnalyBo bo = new StatAnalyBo(); + if (resultMap.containsKey(url)) { + // ×Զ¨Òåʱ¼äµÄÊý¾Ý + bo.setSuccessEffectiveTime(resultMap.get(url).get("successEffectiveCount")); + bo.setSuccessInvalidTime(resultMap.get(url).get("successInvalidCount")); + bo.setDefeatTime(resultMap.get(url).get("defeatCount")); + bo.setCount(resultMap.get(url).get("totalCount")); + double dailyUse = bo.getCount() * 1.0 / days; + bo.setDailyUse(dailyUse); + } + if (weekResultMap.containsKey(url)) { + // ½üһÖÜÊý¾Ý + bo.setWeekSuccessEffectiveTime(weekResultMap.get(url).get("successEffectiveCount")); + bo.setWeekSuccessInvalidTime(weekResultMap.get(url).get("successInvalidCount")); + bo.setWeekDefeatTime(weekResultMap.get(url).get("defeatCount")); + bo.setWeekCount(weekResultMap.get(url).get("totalCount")); + double dailyUse = bo.getWeekCount() * 1.0 / 7; + bo.setWeekDailyUse(dailyUse); + } + if (monthResultMap.containsKey(url)) { + // ³ɹ¦ÓÐЧ´ÎÊý + bo.setMonthSuccessEffectiveTime(monthResultMap.get(url).get("successEffectiveCount")); + // ³ɹ¦ÎÞЧ´ÎÊý + bo.setMonthSuccessInvalidTime(monthResultMap.get(url).get("successInvalidCount")); + // ʧ°ܴÎÊý + bo.setMonthDefeatTime(monthResultMap.get(url).get("defeatCount")); + bo.setMonthCount(monthResultMap.get(url).get("totalCount")); + double dailyUse = bo.getMonthCount() * 1.0 / 30; + bo.setMonthDailyUse(dailyUse); + } + + bo.setUrl(url); + bo.setUrlName(urlName); + bo.setDeadline(apiUser.getDeadTime()); + bo.setUserId((int) id); + bo.setUserName(user.getDisplayName()); + //ʣÓàµ÷ÓÃÁ¿ + long curVistedCount = apiVisitCountService.findApiVisitCountByDay(id, url, DateUtil.truncateDay(new Date())); + long historyCount = apiVisitCountService.findApiVisitAllCount(id, url, DateUtil.truncateDay(new Date())); + if (countMap != null && countMap.containsKey(url)) { + Integer totalCount = countMap.get(url); + long usedCount = curVistedCount + historyCount; + bo.setSurplusCallCount(Integer.valueOf((int) (totalCount - usedCount))); + } + bosAll.add(bo); + } + } + } + this.buildReport(bosAll, response, startDate, endDate); + } + model.setViewType("stream"); + return model; + } + + private void buildReport(List bos, HttpServletResponse response, Date startDate, Date endDate) { + try { + List> dataList = new ArrayList>(); + + for (StatAnalyBo bo : bos) { + List row = new ArrayList(); + row.add(bo.getUserId() != null ? bo.getUserId().toString() : ""); + row.add(bo.getUserName() != null ? bo.getUserName().toString() : ""); + row.add(bo.getDeadline() != null ? DateUtils.format(bo.getDeadline(), "yyyy/MM/dd") : ""); + row.add(bo.getUrl() != null ? bo.getUrl().toString() : ""); + row.add(bo.getUrlName() != null ? bo.getUrlName().toString() : ""); + row.add(bo.getSurplusCallCount() != null ? bo.getSurplusCallCount().toString() : ""); + // ÉÏÖÜ + row.add(bo.getWeekCount() != null ? bo.getWeekCount().toString() : ""); + if (bo.getWeekDailyUse() != null) { + // ¸ñʽ»¯Ϊ±£ÁôһλСÊýµÄ×ַû´® + String formattedDailyUse = String.format("%.1f", bo.getWeekDailyUse()); + row.add(formattedDailyUse); + } else { + row.add(""); + } + row.add(bo.getWeekSuccessEffectiveTime() != null ? bo.getWeekSuccessEffectiveTime().toString() : ""); + row.add(bo.getWeekSuccessInvalidTime() != null ? bo.getWeekSuccessInvalidTime().toString() : ""); + row.add(bo.getWeekDefeatTime() != null ? bo.getWeekDefeatTime().toString() : ""); + // ÉϸöÔ + row.add(bo.getMonthCount() != null ? bo.getMonthCount().toString() : ""); + if (bo.getMonthDailyUse() != null) { + // ¸ñʽ»¯Ϊ±£ÁôһλСÊýµÄ×ַû´® + String formattedDailyUse = String.format("%.1f", bo.getMonthDailyUse()); + row.add(formattedDailyUse); + } else { + row.add(""); + } + row.add(bo.getMonthSuccessEffectiveTime() != null ? bo.getMonthSuccessEffectiveTime().toString() : ""); + row.add(bo.getMonthSuccessInvalidTime() != null ? bo.getMonthSuccessInvalidTime().toString() : ""); + row.add(bo.getMonthDefeatTime() != null ? bo.getMonthDefeatTime().toString() : ""); + // ×Զ¨Òåʱ¼ä + row.add(bo.getCount() != null ? bo.getCount().toString() : ""); + if (bo.getDailyUse() != null) { + // ¸ñʽ»¯Ϊ±£ÁôһλСÊýµÄ×ַû´® + String formattedDailyUse = String.format("%.1f", bo.getDailyUse()); + row.add(formattedDailyUse); + } else { + row.add(""); + } + row.add(bo.getSuccessEffectiveTime() != null ? bo.getSuccessEffectiveTime().toString() : ""); + row.add(bo.getSuccessInvalidTime() != null ? bo.getSuccessInvalidTime().toString() : ""); + row.add(bo.getDefeatTime() != null ? bo.getDefeatTime().toString() : ""); + dataList.add(row); + } + + String dateStr ="("+ DateUtils.format(startDate, "yyyy/MM/dd") + "¡ª" + DateUtils.format(endDate, "yyyy/MM/dd") +")"; + String fileName = "Óû§Õ˺ÅʹÓÃͳ¼Æ" + dateStr + ".xlsx"; +// ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).build(); + String displayName = URLEncoder.encode(fileName, "UTF-8"); + response.setHeader("Content-Disposition", "attachment; filename=\"" + displayName + "\""); + response.setContentType("application/x-download;charset=utf-8"); + Workbook workbook = new XSSFWorkbook(); + Sheet sheet = workbook.createSheet("Óû§Õ˺ÅʹÓÃͳ¼Æ"); + List head = Arrays.asList( + "Óû§ID", "Õ˺Å", "ºÏͬµ½ÆÚʱ¼ä", "½ӿÚ", "½ӿÚÃû³Æ", "ʣÓàʹÓôÎÊý", + "·ÃÎʴÎÊý(½üһÖÜ)", "Èվù·ÃÎÊÁ¿(½üһÖÜ)","³ɹ¦²¢ÓÐЧ(½üһÖÜ)", "³ɹ¦²¢ÎÞЧ(½üһÖÜ)","ʧ°ܴÎÊý(½üһÖÜ)", + "·ÃÎʴÎÊý(½üһÔÂ)", "Èվù·ÃÎÊÁ¿(½üһÔÂ)","³ɹ¦²¢ÓÐЧ(½üһÔÂ)", "³ɹ¦²¢ÎÞЧ(½üһÔÂ)","ʧ°ܴÎÊý(½üһÔÂ)", + "·ÃÎʴÎÊý"+dateStr, "Èվù·ÃÎÊÁ¿"+dateStr,"³ɹ¦²¢ÓÐЧ"+dateStr, "³ɹ¦²¢ÎÞЧ"+dateStr,"ʧ°ܴÎÊý"+dateStr + ); + // ´´½¨±íͷ + Row headRow = sheet.createRow(0); + for (int i = 0; i < head.size(); i++) { + Cell cell = headRow.createCell(i); + cell.setCellValue(head.get(i)); + } + // дÈëÊý¾ݣ¬´ӵڶþÐÐ + for (int i = 0; i < dataList.size(); i++) { + Row row = sheet.createRow(i + 1); + List data = dataList.get(i); + for (int j = 0; j < data.size(); j++) { + Cell cell = row.createCell(j); + cell.setCellValue(data.get(j)); + } + } + ServletOutputStream outputStream = response.getOutputStream(); + workbook.write(outputStream); + } catch (IOException e) { + } + + } + + List> formatHead(String[] headArr) { + List> head = new ArrayList>(); + for (String name : headArr) { + List temp = new ArrayList(); + temp.add(name); + head.add(temp); + } + return head; + } + + public Object userVisitStatAction(ApiUserModel model) throws IllegalAccessException { Date startDate = null; Date endDate = null; if (StringUtils.isNotBlank(model.getBegDate())) { @@ -1073,8 +1324,12 @@ public class ApiUserController { // bos = createAnalyBosByUser(analys); // model.setChartSeries(toChartString(bos)); // }else if(model.getWay() == 2){ + Long userId = model.getUserId(); + ApiUserAuthority authority = apiUserAuthorityService.findByUserId(userId); + Map countMap = authority.getTotalCountMap(); + ApiUser apiUser = apiUserService.findApiUserById(userId); if (model.getWay() == 2) { - User user = userService.findById(model.getUserId()); + User user = userService.findById(userId); if (user != null) { model.setUserName(user.getDisplayName()); } @@ -1118,6 +1373,16 @@ public class ApiUserController { boTemp.setSuccessEffectiveTime(resultMap.get(url).get("successEffectiveCount")); boTemp.setSuccessInvalidTime(resultMap.get(url).get("successInvalidCount")); boTemp.setDefeatTime(resultMap.get(url).get("defeatCount")); + if (apiUser != null) { + boTemp.setDeadline(apiUser.getDeadTime()); + } + long curVistedCount = apiVisitCountService.findApiVisitCountByDay(userId, url, DateUtil.truncateDay(new Date())); + long historyCount = apiVisitCountService.findApiVisitAllCount(userId, url, DateUtil.truncateDay(new Date())); + if (countMap != null && countMap.containsKey(url)) { + Integer totalCount = countMap.get(url); + long usedCount = curVistedCount + historyCount; + boTemp.setSurplusCallCount(Integer.valueOf((int) (totalCount - usedCount))); + } } } } @@ -1623,6 +1888,7 @@ public class ApiUserController { Integer successEffectiveCount = detailMap.get("successEffectiveCount"); Integer successInvalidCount = detailMap.get("successInvalidCount"); Integer defeatCount = detailMap.get("defeatCount"); + Integer totalCount = detailMap.get("totalCount"); if (successEffectiveCount != null) { successEffectiveCount = successEffectiveCount + apiInvokeStatistical.getSuccessEffectiveTime(); } else { @@ -1639,10 +1905,16 @@ public class ApiUserController { } else { defeatCount = apiInvokeStatistical.getDefeatTime(); } + if (totalCount != null) { + totalCount = totalCount + apiInvokeStatistical.getTotalTime(); + } else { + totalCount = apiInvokeStatistical.getTotalTime(); + } detailMap.put("successEffectiveCount", successEffectiveCount); detailMap.put("successInvalidCount", successInvalidCount); detailMap.put("defeatCount", defeatCount); + detailMap.put("totalCount", totalCount); } return resultMap; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java index 3a14b2f41..8306117fe 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java @@ -33,7 +33,9 @@ public class DevelopmentZoneController { if (pager.getCurrentPage() > 100) { pager.setCurrentPage(1); } - List developmentZones = developmentZoneService.findDevelopmentZone(model.getProvince(), model.getName(), pager); + long countDev = developmentZoneService.countDev(model.getProvince(), model.getName(), model.getLevel()); + pager.setTotalRows((int) countDev); + List developmentZones = developmentZoneService.findDevelopmentZone(model.getProvince(), model.getName(), model.getLevel(), pager); model.setDevelopmentZoneList(developmentZones); model.setPager(pager); return model; @@ -72,41 +74,48 @@ public class DevelopmentZoneController { JsonModel ret = new JsonModel(); Map data = new HashMap(); ret.setJsonModel(data); - // name province bdLocation level ²»ÄÜΪ¿Õ - if (StringUtils.isBlank(model.getProvince()) || StringUtils.isBlank(model.getName()) || model.getBdShape() == null || model.getBdShape().toString().equals("[]") || StringUtils.isBlank(model.getLevel())) { - data.put("msg", "±£´æʧ°Ü(¿ª·¢ÇøÃû³ƣ¬ËùÔÚʡ·ݣ¬¼¶±ð£¬ΧÀ¸²»ÄÜΪ¿Õ)"); - return ret; - } - if (model.getId() == null) { + // name province bdLocation level ²»ÄÜΪ¿Õ + if (StringUtils.isBlank(model.getProvince()) || StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getLevel())) { + data.put("msg", "±£´æʧ°Ü(¿ª·¢ÇøÃû³ƣ¬ËùÔÚʡ·ݣ¬¼¶±ð²»ÄÜΪ¿Õ)"); + return ret; + } DevelopmentZone entity = new DevelopmentZone(); // name province bdLocation level ²»ÄÜΪ¿Õ/ entity.setName(model.getName()); entity.setProvince(model.getProvince()); - String locationStr = model.getBdShape().toString().replaceAll("\\[", "").replaceAll("\\]", "").replaceAll(" ", ""); - List> bdLocationList = new ArrayList>(); - String[] splitStr = locationStr.split(";"); - for (int i = 0; i < splitStr.length; i++) { - String[] splitStr2 = splitStr[i].split(","); - List location = new ArrayList(); - location.add(Double.parseDouble(splitStr2[0])); - location.add(Double.parseDouble(splitStr2[1])); - bdLocationList.add(location); + // мӿª·¢Çø£¬ΧÀ¸²»ÊDZØÐëÓеÄ + if (model.getBdShape() != null && !model.getBdShape().toString().equals("[]")) { + String locationStr = model.getBdShape().toString().replaceAll("\\[", "").replaceAll("\\]", "").replaceAll(" ", ""); + List> bdLocationList = new ArrayList>(); + String[] splitStr = locationStr.split(";"); + for (int i = 0; i < splitStr.length; i++) { + String[] splitStr2 = splitStr[i].split(","); + List location = new ArrayList(); + location.add(Double.parseDouble(splitStr2[0])); + location.add(Double.parseDouble(splitStr2[1])); + bdLocationList.add(location); + } + //¼ÓÉϵÚһ¸ö£¬ÐγÉÊ×β±պÏ + bdLocationList.add(bdLocationList.get(0)); + model.setBdShape(bdLocationList); + // °ٶȾ­γ¶È + Map bdShape = new HashMap(); + bdShape.put("type", "polygon"); + bdShape.put("coordinates", model.getBdShape()); + entity.setBdShape(bdShape); + // ¸ߵ¾­γ¶È + Map shape = new HashMap(); + shape.put("type", "polygon"); + Object coordinates = convertGeoList(model.getBdShape()); + shape.put("coordinates", coordinates); + entity.setShape(shape); } - model.setBdShape(bdLocationList); - // °ٶȾ­γ¶È - Map bdShape = new HashMap(); - bdShape.put("type", "polygon"); - bdShape.put("coordinates", model.getBdShape()); - entity.setBdShape(bdShape); - // ¸ߵ¾­γ¶È - Map shape = new HashMap(); - shape.put("type", "polygon"); - Object coordinates = convertGeoList(model.getBdShape()); - shape.put("coordinates", coordinates); - entity.setShape(shape); entity.setLevel(model.getLevel()); + String aliasString = model.getAlias().replaceAll("£¬", ","); + List alias = Arrays.asList(aliasString.split("\\s*,\\s*")); + entity.setAlias(alias); entity.setAddress(StringUtils.isBlank(model.getAddress()) ? "" : model.getAddress()); entity.setArea(StringUtils.isBlank(model.getArea()) ? "" : model.getArea()); entity.setBlock(StringUtils.isBlank(model.getBlock()) ? "" : model.getBlock()); @@ -116,59 +125,115 @@ public class DevelopmentZoneController { entity.setNameEn(StringUtils.isBlank(model.getNameEn()) ? "" : model.getNameEn()); entity.setType(StringUtils.isBlank(model.getType()) ? "" : model.getType()); entity.setUrl(StringUtils.isBlank(model.getUrl()) ? "" : model.getUrl()); + entity.setCityName1(StringUtils.isBlank(model.getCityName1()) ? "" : model.getCityName1()); + entity.setDistrict(StringUtils.isBlank(model.getDistrict()) ? "" : model.getDistrict()); //¼Ç¼²Ù×÷ÈËԱ entity.setOperator(user.getRealName()); developmentZoneService.saveDevelopmentZone(entity); data.put("msg", "±£´æ³ɹ¦"); } else { - DevelopmentZone entity = developmentZoneService.findDevelopmentZone(model.getId()); -// Map udata = new HashMap(); - - // name province bdLocation level ²»ÄÜΪ¿Õ - entity.setName(model.getName()); - entity.setProvince(model.getProvince()); - String locationStr = model.getBdShape().toString().replaceAll("\\[", "").replaceAll("\\]", "").replaceAll(" ", ""); - List> bdLocationList = new ArrayList>(); - String[] splitStr = locationStr.split(";"); - for (int i = 0; i < splitStr.length; i++) { - String[] splitStr2 = splitStr[i].split(","); - List location = new ArrayList(); - location.add(Double.parseDouble(splitStr2[0])); - location.add(Double.parseDouble(splitStr2[1])); - bdLocationList.add(location); +// DevelopmentZone entity = developmentZoneService.findDevelopmentZone(model.getId()); + Map udata = new HashMap(); + if (StringUtils.isNotBlank(model.getProvince())) { + udata.put("province", model.getProvince()); } - model.setBdShape(bdLocationList); - // °ٶȾ­γ¶È - Map bdShape = new HashMap(); - bdShape.put("type", "polygon"); - bdShape.put("coordinates", model.getBdShape()); - entity.setBdShape(bdShape); - // ¸ߵ¾­γ¶È - Map shape = new HashMap(); - shape.put("type", "polygon"); - Object coordinates = convertGeoList(model.getBdShape()); - shape.put("coordinates", coordinates); - entity.setShape(shape); - - entity.setLevel(model.getLevel()); - entity.setAddress(StringUtils.isBlank(model.getAddress()) ? "" : model.getAddress()); - entity.setArea(StringUtils.isBlank(model.getArea()) ? "" : model.getArea()); - entity.setBlock(StringUtils.isBlank(model.getBlock()) ? "" : model.getBlock()); - entity.setBuildDate(StringUtils.isBlank(model.getBuildDate()) ? "" : model.getBuildDate()); - entity.setCreateTime(new Date()); - entity.setIndustry(StringUtils.isBlank(model.getIndustry()) ? "" : model.getIndustry()); - entity.setNameEn(StringUtils.isBlank(model.getNameEn()) ? "" : model.getNameEn()); - entity.setType(StringUtils.isBlank(model.getType()) ? "" : model.getType()); - entity.setUrl(StringUtils.isBlank(model.getUrl()) ? "" : model.getUrl()); + if (StringUtils.isNotBlank(model.getName())) { + udata.put("name", model.getName()); + } + if (StringUtils.isNotBlank(model.getLevel())) { + udata.put("level", model.getLevel()); + } + if (model.getBdShape() != null && !model.getBdShape().toString().equals("[]")) { + String locationStr = model.getBdShape().toString().replaceAll("\\[", "").replaceAll("\\]", "").replaceAll(" ", ""); + List> bdLocationList = new ArrayList>(); + String[] splitStr = locationStr.split(";"); + for (int i = 0; i < splitStr.length; i++) { + String[] splitStr2 = splitStr[i].split(","); + List location = new ArrayList(); + location.add(Double.parseDouble(splitStr2[0])); + location.add(Double.parseDouble(splitStr2[1])); + bdLocationList.add(location); + } + //¼ÓÉϵÚһ¸ö£¬ÐγÉÊ×β±պÏ + bdLocationList.add(bdLocationList.get(0)); + model.setBdShape(bdLocationList); + // °ٶȾ­γ¶È + Map bdShape = new HashMap(); + bdShape.put("type", "polygon"); + bdShape.put("coordinates", model.getBdShape()); + udata.put("bdShape", bdShape); + // ¸ߵ¾­γ¶È + Map shape = new HashMap(); + shape.put("type", "polygon"); + Object coordinates = convertGeoList(model.getBdShape()); + shape.put("coordinates", coordinates); + udata.put("shape", shape); + } + if (StringUtils.isNotBlank(model.getAlias())) { + String aliasString = model.getAlias().replaceAll(",", "£¬"); + List alias = Arrays.asList(aliasString.split("\\s*£¬\\s*")); + udata.put("alias", alias); + } + if (StringUtils.isNotBlank(model.getAddress())) { + udata.put("address", model.getAddress()); + } + if (StringUtils.isNotBlank(model.getArea())) { + udata.put("area", model.getArea()); + } + if (StringUtils.isNotBlank(model.getBlock())) { + udata.put("block", model.getBlock()); + } + if (StringUtils.isNotBlank(model.getBuildDate())) { + udata.put("buildDate", model.getBuildDate()); + } + if (StringUtils.isNotBlank(model.getIndustry())) { + udata.put("industry", model.getIndustry()); + } + if (StringUtils.isNotBlank(model.getNameEn())) { + udata.put("nameEn", model.getNameEn()); + } + if (StringUtils.isNotBlank(model.getType())) { + udata.put("type", model.getType()); + } + if (StringUtils.isNotBlank(model.getUrl())) { + udata.put("url", model.getUrl()); + } + if (StringUtils.isNotBlank(model.getCityName1())) { + udata.put("cityName1", model.getCityName1()); + } + if (StringUtils.isNotBlank(model.getDistrict())){ + udata.put("district", model.getDistrict()); + } + udata.put("createTime", new Date()); //¼Ç¼²Ù×÷ÈËԱ - entity.setOperator(user.getRealName()); - developmentZoneService.updateDevelopmentZone(entity); - data.put("msg", "±£´æ³ɹ¦"); + udata.put("operator", user.getRealName()); + developmentZoneService.updateDevelopmentZone(udata, model.getId()); + data.put("msg", "Ð޸ijɹ¦"); } return ret; } + public JsonModel provincesAction() { + JsonModel model = new JsonModel(); + List provinces = developmentZoneService.findProvinces(); + model.setJsonModel(provinces); + return model; + } + + public JsonModel citiesAction(DevelopmentZoneModel model) { + JsonModel jsonModel = new JsonModel(); + List cities = developmentZoneService.findCities(model.getProvince()); + jsonModel.setJsonModel(cities); + return jsonModel; + } + + public JsonModel districtsAction(DevelopmentZoneModel model) { + JsonModel jsonModel = new JsonModel(); + List districts = developmentZoneService.findDistricts(model.getCityName1()); + jsonModel.setJsonModel(districts); + return jsonModel; + } public void setDevelopmentZoneService(DevelopmentZoneService developmentZoneService) { this.developmentZoneService = developmentZoneService; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java index db5bf7e45..080f08f51 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java @@ -331,7 +331,7 @@ public class DistrictController { for (QueryParam pa : params) { fenQiParams.add(pa); } - fenQiParams.add(new QueryParam("masterDistrictNname", "master")); + fenQiParams.add(new QueryParam("masterDistrictName", "master")); fenQiParams.add(new QueryParam("visible", 0)); int fenQiCount = (int) districtService.findDistrictCount(0, fenQiParams); // int surplusDistrictCount = @@ -373,7 +373,7 @@ public class DistrictController { } else if (model.getValid() != null && model.getValid() == 3) { // ·ÖÆÚÊý¾ݴ¦Àí params.add(new QueryParam("visible", 0)); - params.add(new QueryParam("masterDistrictNname", "master")); + params.add(new QueryParam("masterDistrictName", "master")); districts = districtService.findDistrictList(pager, params, sortParams); List vos = new ArrayList(); for (District district : districts) { @@ -3513,8 +3513,8 @@ public class DistrictController { if (type.equals("master")) { masterDistrict = districtService.findById(id); } - if (dis != null && dis.getMasterDistrictNname() != null - && dis.getMasterDistrictNname().equals("master")) { + if (dis != null && dis.getMasterDistrictName() != null + && dis.getMasterDistrictName().equals("master")) { json.setSuccess(false); json.setMsg(dis.getName() + "ÒѾ­ÊÇÖ÷СÇøÁË"); return json; @@ -3532,13 +3532,13 @@ public class DistrictController { String type = stas[1]; if (type.equals("master")) { Map data = new HashMap(); - data.put("masterDistrictNname", "master"); + data.put("masterDistrictName", "master"); districtService.updateById(data, id); // ÉèÖÃΪÈ˹¤²Ù×÷·ÖÆڱêʶ districtService.setPersonOperate(id); } else { Map data = new HashMap(); - data.put("masterDistrictNname", masterDistrict.getName()); + data.put("masterDistrictName", masterDistrict.getName()); districtService.updateById(data, id); } } @@ -3566,8 +3566,8 @@ public class DistrictController { json.setMsg("СÇø²»´æÔڣ¬Çë¼ì²éÊǷñÊäÈëÕýȷ"); return json; } - if (slaveDistrict.getMasterDistrictNname() != null - && slaveDistrict.getMasterDistrictNname().equals("master")) { + if (slaveDistrict.getMasterDistrictName() != null + && slaveDistrict.getMasterDistrictName().equals("master")) { json.setSuccess(false); json.setMsg(slaveDistrict.getName() + "ÒѾ­ÊÇÖ÷СÇøÁË"); return json; @@ -3576,7 +3576,7 @@ public class DistrictController { if (slaveDistrict.getCity().equals(masterDistrict.getCity()) && slaveDistrict.getRegion().equals(masterDistrict.getRegion())) { Map data = new HashMap(); - data.put("masterDistrictNname", masterDistrict.getName()); + data.put("masterDistrictName", masterDistrict.getName()); districtService.updateById(data, slaveId); // ÉèÖÃΪÈ˹¤²Ù×÷·ÖÆڱêʶ districtService.setPersonOperate(masterDistrict.getId()); @@ -3601,9 +3601,9 @@ public class DistrictController { if (model.getId() != null && !model.getId().equals("")) { District slaveDistrict = districtService.findById(model.getId()); District masterDistrict = districtService.findDistrict(new DistrictKey(slaveDistrict.getCity(), - slaveDistrict.getRegion(), slaveDistrict.getMasterDistrictNname()), "district"); + slaveDistrict.getRegion(), slaveDistrict.getMasterDistrictName()), "district"); Map data = new HashMap(); - data.put("masterDistrictNname", null); + data.put("masterDistrictName", null); districtService.updateById(data, model.getId()); // ÉèÖÃΪÈ˹¤²Ù×÷·ÖÆڱêʶ if (masterDistrict != null) { @@ -3627,7 +3627,7 @@ public class DistrictController { List slaves = districtService.findSlaves(masterDistrict.getCity(), masterDistrict.getRegion(), masterDistrict.getName()); Map data = new HashMap(); - data.put("masterDistrictNname", null); + data.put("masterDistrictName", null); for (District district : slaves) { districtService.updateById(data, district.getId()); } @@ -3654,7 +3654,7 @@ public class DistrictController { params.add(new QueryParam("visible", 0)); params.add(new QueryParam("city", slaveDistrict.getCity())); params.add(new QueryParam("region", slaveDistrict.getRegion())); - params.add(new QueryParam("name", slaveDistrict.getMasterDistrictNname())); + params.add(new QueryParam("name", slaveDistrict.getMasterDistrictName())); List list = districtService.findAllByParams(params); if (list == null || list.size() == 0) { json.setSuccess(false); @@ -3669,18 +3669,18 @@ public class DistrictController { for (District district : slaves) { if (district.getId().equals(slaveId)) { Map data = new HashMap(); - data.put("masterDistrictNname", "master"); + data.put("masterDistrictName", "master"); districtService.updateById(data, district.getId()); // ÉèÖÃΪÈ˹¤²Ù×÷·ÖÆڱêʶ districtService.setPersonOperate(district.getId()); } else { Map data = new HashMap(); - data.put("masterDistrictNname", slaveDistrict.getName()); + data.put("masterDistrictName", slaveDistrict.getName()); districtService.updateById(data, district.getId()); } } Map data = new HashMap(); - data.put("masterDistrictNname", slaveDistrict.getName()); + data.put("masterDistrictName", slaveDistrict.getName()); districtService.updateById(data, masterDistrict.getId()); } return json; diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/InquiryController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/InquiryController.java index 6e8ae8ffc..c96fd1c20 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/InquiryController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/InquiryController.java @@ -74,6 +74,8 @@ public class InquiryController { role = fjtRoleService.findRolesByName("ũÐÐ"); }else if(2 == bkoffUsers.getSupportInquiryTask().intValue()){ role = fjtRoleService.findRolesByName("ÉîÛÚũÐÐ"); + }else if(3 == bkoffUsers.getSupportInquiryTask().intValue()){ + role = fjtRoleService.findRolesByName("´óÕýÆÀ¹À"); } List zqUserIds = userCityService.findUserIdByCity("ÕØÇì"); @@ -87,6 +89,8 @@ public class InquiryController { } }else if(vo2.getRole()==16){ userIds.add(vo2.getId()); + }else if(vo2.getRole()==18){ + userIds.add(vo2.getId()); } } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoginController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoginController.java index 39d884683..a51c6999c 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoginController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/LoginController.java @@ -84,7 +84,7 @@ public class LoginController { return model.redirect("/users/selfEdit"); } else { String forward = StringUtils.defaultIfEmpty(model.getForward(), "/"); - if(forward.endsWith("/login/login")){ + if(forward.contains("/login/login") || forward.contains("/login/index")){ return model.redirect("/"); }else{ return model.redirect(forward); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/TownshipController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/TownshipController.java new file mode 100644 index 000000000..af225d92a --- /dev/null +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/TownshipController.java @@ -0,0 +1,84 @@ +package com.fangjia.bkoff.controllers; + +import com.fangjia.bkoff.model.DevelopmentZoneModel; +import com.fangjia.bkoff.model.JsonModel; +import com.fangjia.bkoff.model.TownshipModel; +import com.fangjia.core.util.ThreadLocalData; +import com.fangjia.core.util.ThreadLocalKey; +import com.fangjia.dal.mongo.model.Township; +import com.fangjia.dal.mongo.model.bkoff.BkoffUsers; +import com.fangjia.service.mongo.bkoff.BkoffUsersService; +import com.fangjia.service.mongo.fangjia.TownshipService; +import org.apache.commons.lang.StringUtils; +import org.sothis.core.util.Pager; + +import java.util.*; + +/** + * Created by dxy on 2015/6/8. + */ +public class TownshipController { + private TownshipService townshipService; + private BkoffUsersService bkoffUsersService; + + public Object listAction(TownshipModel model) { + Pager pager = model.getPager(30); + if (pager.getCurrentPage() > 100) { + pager.setCurrentPage(1); + } + long countDev = townshipService.countTownship(model.getProvince(), model.getCity1(), model.getDistrict(),model.getStreet()); + pager.setTotalRows((int) countDev); + List townships = townshipService.findTownship(model.getProvince(), model.getCity1(), model.getDistrict(),model.getStreet(), pager); + model.setTownshipList(townships); + model.setPager(pager); + return model; + } + + public Object editAction(TownshipModel model) { + if (model.getId() == null) { + return model; + } + + model.setTownship(townshipService.findTownship(model.getId())); + return model; + } + + public Object updateAction(TownshipModel model) { + String userId = (String) ThreadLocalData.getInstance().get(ThreadLocalKey.UserId); + BkoffUsers user = bkoffUsersService.findBkoffUsersById(userId); + JsonModel ret = new JsonModel(); + Map data = new HashMap(); + if (model.getId() != null) { + Map udata = new HashMap(); + if (StringUtils.isNotBlank(model.getAlias())) { + String aliasString = model.getAlias().replaceAll(",", "£¬"); + List alias = Arrays.asList(aliasString.split("\\s*£¬\\s*")); + udata.put("alias", alias); + } + udata.put("updateTime", new Date()); + //¼Ç¼²Ù×÷ÈËԱ + udata.put("operator", user.getRealName()); + townshipService.updateTownship(udata, model.getId()); + data.put("msg", "Ð޸ijɹ¦"); + } + ret.setJsonModel(data); + return ret; + } + + + public void setBkoffUsersService(BkoffUsersService bkoffUsersService) { + this.bkoffUsersService = bkoffUsersService; + } + + public TownshipService getTownshipService() { + return townshipService; + } + + public void setTownshipService(TownshipService townshipService) { + this.townshipService = townshipService; + } + + public BkoffUsersService getBkoffUsersService() { + return bkoffUsersService; + } +} diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/VillageIdentifyController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/VillageIdentifyController.java new file mode 100644 index 000000000..771eaa2e4 --- /dev/null +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/VillageIdentifyController.java @@ -0,0 +1,139 @@ +package com.fangjia.bkoff.controllers; + +import com.fangjia.bkoff.model.AverageStatisticsModel; +import com.fangjia.bkoff.model.JsonModel; +import com.fangjia.bkoff.model.VillageIdentifyModel; +import com.fangjia.bkoff.util.ExcelUtils; +import com.fangjia.dal.QueryParam; +import com.fangjia.dal.mongo.model.VillageIdentify; +import com.fangjia.service.mongo.fangjia.VillageIdentifyService; +import org.apache.commons.lang.StringUtils; +import org.sothis.core.util.Pager; +import org.sothis.web.mvc.ActionContext; +import org.sothis.web.mvc.interceptors.MultipartHttpServletRequest; +import org.springframework.core.io.ClassPathResource; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.charset.StandardCharsets; +import java.util.*; +import java.net.URLEncoder; + +public class VillageIdentifyController { + private VillageIdentifyService villageIdentifyService; + + public Object importResultAction(VillageIdentifyModel model) { + Pager pager = model.getPager(25); + pager.setTotalRows(villageIdentifyService.count(model.getVillageType(), model.getCity1(), model.getAddress())); + model.setVillageIdentifyList(villageIdentifyService.findAll(model.getVillageType(), model.getCity1(), model.getAddress(), pager)); + return model; + } + + public void expectAction(HttpServletRequest request, HttpServletResponse response) throws IOException { + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + + // ±àÂëÎļþÃû£¬±ÜÃâÂÒÂë + String fileName = "Éæũ½á¹ûµ¼Èëºǫ́ģ°å.xlsx"; + String encodedFileName = encodeFileName(fileName, request); + + // ÉèÖà Content-Disposition ÏìӦͷ + response.setHeader("Content-Disposition", "attachment; filename=\"" + encodedFileName + "\""); + + // ʹÓà ClassPathResource À´»ñȡ×ÊԴÎļþ + ClassPathResource resource = new ClassPathResource(fileName); + InputStream in = resource.getInputStream(); + OutputStream out = response.getOutputStream(); + + byte[] buffer = new byte[1024]; + int bytesRead; + + while ((bytesRead = in.read(buffer)) != -1) { + out.write(buffer, 0, bytesRead); + } + + out.flush(); + + } + + private String encodeFileName(String fileName, HttpServletRequest request) throws IOException { + String userAgent = request.getHeader("User-Agent"); + String encodedFileName; + + if (userAgent.contains("MSIE") || userAgent.contains("Trident")) { + // Õë¶ÔIEä¯ÀÀÆ÷ + encodedFileName = URLEncoder.encode(fileName, "UTF-8").replace("+", "%20"); + } else { + // Õë¶ÔÆäËûä¯ÀÀÆ÷ + encodedFileName = new String(fileName.getBytes("UTF-8"), "ISO-8859-1"); + } + + return encodedFileName; + } + + public Object uploadAction(HttpServletRequest request) throws IOException { + Object fileInputStream = ActionContext.getContext().getParameters().get("fileInputStream")[0]; + JsonModel ret = new JsonModel(); + Map data = new HashMap(); + Map dataMap = ExcelUtils.read((InputStream) fileInputStream, 0, 0); + List> addressList = dataMap.get("data"); + List> headers = dataMap.get("header"); + + if (!("ÉæũÀàÐÍ".equals(headers.get(0)) && "µØַ".equals(headers.get(2)))) { + data.put("msg", "ģ°å´íÎó"); + } else if (addressList.size() > 100000) { + data.put("msg", "¸ÃÅú´ÎÊý¾ÝÁ¿³¬¹ý100000Ìõ"); + } else { + //ģ°åÕýȷ£¬Êý¾ݲ»³¬¹ý100000£¬¿ªʼ´¦ÀíÊý¾Ý + for (List row : addressList) { + + Map updata = new HashMap(); + // ´´½¨һ¸ö°üº¬ËùÓÐkeyµÄlist + List keys = Arrays.asList( + "villageType", "cityParam", "address", "province", "provinceCode", + "city1", "cityCode", "district", "districtCode", "town", "townCode", + "committee", "committeeCode", "typeCode", "typeName", "verifyFlag", "addrVerify", + "countyLevelCity", "administrativeTowns", "devDistrict", + "devDistrictName", "devLevel", "countyGov", "addrArea" + ); + + // ±éÀúkeys list²¢´ÓrowÖлñȡÏàӦµÄֵ·ÅÈëupdataÖÐ + for (int i = 0; i < keys.size(); i++) { + if (i < row.size() && StringUtils.isNotBlank(row.get(i))) { + updata.put(keys.get(i), row.get(i)); + } + } + + // ´¦ÀíÌض¨Çé¿ö£º cityParam + String cityParam = ""; + if (StringUtils.isNotBlank(row.get(1))) { + cityParam = row.get(1); + updata.put("cityParam", cityParam); + } + + // Ìí¼ÓcreateTime + updata.put("createTime", new Date()); + List queryParams = new ArrayList(); + queryParams.add(new QueryParam("address", updata.get("address"))); + if ("" != cityParam) { + queryParams.add(new QueryParam("cityParam", cityParam)); + } + queryParams.add(new QueryParam("villageType", updata.get("villageType"))); + // ±£´æ/¸üР+ villageIdentifyService.updateByparams(updata, queryParams); + } + data.put("msg", "±£´æ³ɹ¦"); + } + + + ret.setJsonModel(data); + return ret; + } + + public void setVillageIdentifyService(VillageIdentifyService villageIdentifyService) { + this.villageIdentifyService = villageIdentifyService; + } +} diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/interceptor/FileUploadInterceptor.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/interceptor/FileUploadInterceptor.java new file mode 100644 index 000000000..6d1da882e --- /dev/null +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/interceptor/FileUploadInterceptor.java @@ -0,0 +1,35 @@ +package com.fangjia.bkoff.interceptor; + +import org.apache.commons.fileupload.servlet.ServletFileUpload; +import org.sothis.core.beans.Bean; +import org.sothis.core.beans.Scope; +import org.sothis.web.mvc.ActionContext; +import org.sothis.web.mvc.ActionInvocation; +import org.sothis.web.mvc.ActionInvocationException; +import org.sothis.web.mvc.Interceptor; +import org.sothis.web.mvc.interceptors.HttpMultipartException; +import org.sothis.web.mvc.interceptors.MultipartHttpServletRequest; + +import javax.servlet.http.HttpServletRequest; + +/** + * ÎļþÉϴ«À¹½ØÆ÷ + * @author wenyan + */ +@Bean(scope = Scope.SINGLETON) +public class FileUploadInterceptor implements Interceptor { + + public Object intercept(ActionInvocation invocation) throws ActionInvocationException { + ActionContext context = invocation.getActionContext(); + HttpServletRequest request = context.getRequest(); + if (ServletFileUpload.isMultipartContent(request)) { + try { + context.setRequest(new MultipartHttpServletRequest(request)); + } catch (HttpMultipartException e) { + throw new ActionInvocationException("error process multipart reqeust: ", e); + } + } + return invocation.invoke(); + } + +} diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DevelopmentZoneModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DevelopmentZoneModel.java index a0e31ca10..54f85ab42 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DevelopmentZoneModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DevelopmentZoneModel.java @@ -17,20 +17,40 @@ public class DevelopmentZoneModel extends BaseModel { private String level; private String name; + private String alias; +// private List addr_alias; private String nameEn; private String province; private String type; private String url; + private String district; List> shape; List> bdShape; - private String block; private DevelopmentZone developmentZone; private List developmentZoneList; + private String cityName1; + + public String getAlias() { + return alias; + } + + public void setAlias(String alias) { + this.alias = alias; + } + + public String getDistrict() { + return district; + } + + public void setDistrict(String district) { + this.district = district; + } + public String getId() { return id; } @@ -166,4 +186,12 @@ public class DevelopmentZoneModel extends BaseModel { public void setDevelopmentZoneList(List developmentZoneList) { this.developmentZoneList = developmentZoneList; } + + public String getCityName1() { + return cityName1; + } + + public void setCityName1(String cityName1) { + this.cityName1 = cityName1; + } } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/TownshipModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/TownshipModel.java new file mode 100644 index 000000000..7de4c3b55 --- /dev/null +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/TownshipModel.java @@ -0,0 +1,286 @@ +package com.fangjia.bkoff.model; + +import com.alibaba.fastjson.annotation.JSONField; +import com.fangjia.dal.mongo.model.Township; + +import java.util.List; + +public class TownshipModel extends BaseModel { + private String province; + private String city1; + private String district; + private String street; + private String pid; + private String id; + + @JSONField(name = "tjj_province_code") + private String tjjProvinceCode; + + @JSONField(name = "tjj_city_code") + private String tjjCityCode; + + @JSONField(name = "tjj_district_code") + private String tjjDistrictCode; + + @JSONField(name = "tjj_street_code") + private String tjjStreetCode; + + @JSONField(name = "tjj_source_year") + private Integer tjjSourceYear; + + @JSONField(name = "mzb_province_code") + private String mzbProvinceCode; + + @JSONField(name = "mzb_city_code") + private String mzbCityCode; + + @JSONField(name = "mzb_district_code") + private String mzbDistrictCode; + + @JSONField(name = "mzb_district_name") + private String mzbDistrictName; + + @JSONField(name = "mzb_street_code") + private String mzbStreetCode; + + private String type; + + + private String alias; + + + @JSONField(name = "street_pinyin") + private String streetPinyin; + + //ÃñÕþ²¿ÇøÓòºÍͳ¼ƾÖÇøÓòÊǷñÏàͬ£¬1ΪÏàͬ£¬0Ϊ²»ͬ£¬ΪÁ˽â¾ö2ÌõµÄÎÊÌâ + @JSONField(name = "district_diff") + private Integer districtDiff; + + + //ÏçÕò½ֵÀÊǷñÊä³ö 0£º²»Êä³ö 1£ºÊä³ö + @JSONField(name = "street_output") + private Integer streetOutput; + + + @JSONField(name = "province_short") + private String provinceShort; + + @JSONField(name = "city_short") + private String cityShort; + + @JSONField(name = "district_short") + private String districtShort; + + private Township township; + private List townshipList; + + public String getProvince() { + return province; + } + + public void setProvince(String province) { + this.province = province; + } + + public String getDistrict() { + return district; + } + + public void setDistrict(String district) { + this.district = district; + } + + public String getStreet() { + return street; + } + + public void setStreet(String street) { + this.street = street; + } + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + + public String getTjjProvinceCode() { + return tjjProvinceCode; + } + + public void setTjjProvinceCode(String tjjProvinceCode) { + this.tjjProvinceCode = tjjProvinceCode; + } + + public String getTjjCityCode() { + return tjjCityCode; + } + + public void setTjjCityCode(String tjjCityCode) { + this.tjjCityCode = tjjCityCode; + } + + public String getTjjDistrictCode() { + return tjjDistrictCode; + } + + public void setTjjDistrictCode(String tjjDistrictCode) { + this.tjjDistrictCode = tjjDistrictCode; + } + + public String getTjjStreetCode() { + return tjjStreetCode; + } + + public void setTjjStreetCode(String tjjStreetCode) { + this.tjjStreetCode = tjjStreetCode; + } + + public Integer getTjjSourceYear() { + return tjjSourceYear; + } + + public void setTjjSourceYear(Integer tjjSourceYear) { + this.tjjSourceYear = tjjSourceYear; + } + + public String getMzbProvinceCode() { + return mzbProvinceCode; + } + + public void setMzbProvinceCode(String mzbProvinceCode) { + this.mzbProvinceCode = mzbProvinceCode; + } + + public String getMzbCityCode() { + return mzbCityCode; + } + + public void setMzbCityCode(String mzbCityCode) { + this.mzbCityCode = mzbCityCode; + } + + public String getMzbDistrictCode() { + return mzbDistrictCode; + } + + public void setMzbDistrictCode(String mzbDistrictCode) { + this.mzbDistrictCode = mzbDistrictCode; + } + + public String getMzbDistrictName() { + return mzbDistrictName; + } + + public void setMzbDistrictName(String mzbDistrictName) { + this.mzbDistrictName = mzbDistrictName; + } + + public String getMzbStreetCode() { + return mzbStreetCode; + } + + public void setMzbStreetCode(String mzbStreetCode) { + this.mzbStreetCode = mzbStreetCode; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + + public String getStreetPinyin() { + return streetPinyin; + } + + public void setStreetPinyin(String streetPinyin) { + this.streetPinyin = streetPinyin; + } + + public Integer getDistrictDiff() { + return districtDiff; + } + + public void setDistrictDiff(Integer districtDiff) { + this.districtDiff = districtDiff; + } + + public Integer getStreetOutput() { + return streetOutput; + } + + public void setStreetOutput(Integer streetOutput) { + this.streetOutput = streetOutput; + } + + public String getProvinceShort() { + return provinceShort; + } + + public void setProvinceShort(String provinceShort) { + this.provinceShort = provinceShort; + } + + public String getCityShort() { + return cityShort; + } + + public void setCityShort(String cityShort) { + this.cityShort = cityShort; + } + + public String getDistrictShort() { + return districtShort; + } + + public void setDistrictShort(String districtShort) { + this.districtShort = districtShort; + } + + public String getCity1() { + return city1; + } + + public void setCity1(String city1) { + this.city1 = city1; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlias() { + return alias; + } + + public void setAlias(String alias) { + this.alias = alias; + } + + public Township getTownship() { + return township; + } + + public void setTownship(Township township) { + this.township = township; + } + + public List getTownshipList() { + return townshipList; + } + + public void setTownshipList(List townshipList) { + this.townshipList = townshipList; + } +} + diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/VillageIdentifyModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/VillageIdentifyModel.java new file mode 100644 index 000000000..40c172b33 --- /dev/null +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/VillageIdentifyModel.java @@ -0,0 +1,365 @@ +package com.fangjia.bkoff.model; + +import com.alibaba.fastjson.annotation.JSONField; +import com.fangjia.dal.mongo.model.Township; +import com.fangjia.dal.mongo.model.VillageIdentify; +import com.fasterxml.jackson.annotation.JsonIgnore; +import org.springframework.web.multipart.MultipartFile; + +import javax.xml.crypto.Data; +import java.util.List; +import java.util.Date; + +public class VillageIdentifyModel extends BaseModel { + private String province; + private String city1; + private String district; + private String town; + private String committee; + private String type; + private String provinceCode; + private String cityCode; + private String districtCode; + private String townCode; + private String committeeCode; + private String typeCode; + private String typeName; + private String verifyFlag;//Éæũ±êʶ + private String addrVerify;//µØַÊǷñÓÐЧÐÅϢ + + private String countyLevelCity;//ÊǷñΪÏؼ¶ÊÐ + private String administrativeTowns;//ÊǷñÊÐϽ½¨ÖÆÕò + private String countyGov;//ÊǷñΪÏØÕþ¸® + private String devDistrict;//ÊǷñΪ¿ª·¢Çø + private String devDistrictName;//¿ª·¢Çø + private String devLevel;//¿ª·¢Çøµȼ¶ + + private Double lat; + private Double lng; + + private String addrArea; + + + //²âÊÔʱʹÓà + private String splitCommittee; + private String splitStreet; + private String poiName; + private String splitStreetNum; + private String dev; + private String communitySource;//¾ÓίÀ´Դ + private String matchPoiName;//ƥÅäpoiµÄÃû³Æ + private String regionInfo;//ΧÀ¸ÇøÓòÐÅϢ + + private String tjjDistrictName; + + private Date createTime; + private String villageType; + private MultipartFile file; + private List villageIdentifyList; + private String address; + + public String getProvince() { + return province; + } + + public void setProvince(String province) { + this.province = province; + } + + public String getCity1() { + return city1; + } + + public void setCity1(String city1) { + this.city1 = city1; + } + + public String getDistrict() { + return district; + } + + public void setDistrict(String district) { + this.district = district; + } + + public String getTown() { + return town; + } + + public void setTown(String town) { + this.town = town; + } + + public String getCommittee() { + return committee; + } + + public void setCommittee(String committee) { + this.committee = committee; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getProvinceCode() { + return provinceCode; + } + + public void setProvinceCode(String provinceCode) { + this.provinceCode = provinceCode; + } + + public String getCityCode() { + return cityCode; + } + + public void setCityCode(String cityCode) { + this.cityCode = cityCode; + } + + public String getDistrictCode() { + return districtCode; + } + + public void setDistrictCode(String districtCode) { + this.districtCode = districtCode; + } + + public String getTownCode() { + return townCode; + } + + public void setTownCode(String townCode) { + this.townCode = townCode; + } + + public String getCommitteeCode() { + return committeeCode; + } + + public void setCommitteeCode(String committeeCode) { + this.committeeCode = committeeCode; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + public String getVerifyFlag() { + return verifyFlag; + } + + public void setVerifyFlag(String verifyFlag) { + this.verifyFlag = verifyFlag; + } + + public String getAddrVerify() { + return addrVerify; + } + + public void setAddrVerify(String addrVerify) { + this.addrVerify = addrVerify; + } + + public String getCountyLevelCity() { + return countyLevelCity; + } + + public void setCountyLevelCity(String countyLevelCity) { + this.countyLevelCity = countyLevelCity; + } + + public String getAdministrativeTowns() { + return administrativeTowns; + } + + public void setAdministrativeTowns(String administrativeTowns) { + this.administrativeTowns = administrativeTowns; + } + + public String getCountyGov() { + return countyGov; + } + + public void setCountyGov(String countyGov) { + this.countyGov = countyGov; + } + + public String getDevDistrict() { + return devDistrict; + } + + public void setDevDistrict(String devDistrict) { + this.devDistrict = devDistrict; + } + + public String getDevDistrictName() { + return devDistrictName; + } + + public void setDevDistrictName(String devDistrictName) { + this.devDistrictName = devDistrictName; + } + + public String getDevLevel() { + return devLevel; + } + + public void setDevLevel(String devLevel) { + this.devLevel = devLevel; + } + + public Double getLat() { + return lat; + } + + public void setLat(Double lat) { + this.lat = lat; + } + + public Double getLng() { + return lng; + } + + public void setLng(Double lng) { + this.lng = lng; + } + + public String getAddrArea() { + return addrArea; + } + + public void setAddrArea(String addrArea) { + this.addrArea = addrArea; + } + + public String getSplitCommittee() { + return splitCommittee; + } + + public void setSplitCommittee(String splitCommittee) { + this.splitCommittee = splitCommittee; + } + + public String getSplitStreet() { + return splitStreet; + } + + public void setSplitStreet(String splitStreet) { + this.splitStreet = splitStreet; + } + + public String getPoiName() { + return poiName; + } + + public void setPoiName(String poiName) { + this.poiName = poiName; + } + + public String getSplitStreetNum() { + return splitStreetNum; + } + + public void setSplitStreetNum(String splitStreetNum) { + this.splitStreetNum = splitStreetNum; + } + + public String getDev() { + return dev; + } + + public void setDev(String dev) { + this.dev = dev; + } + + public String getCommunitySource() { + return communitySource; + } + + public void setCommunitySource(String communitySource) { + this.communitySource = communitySource; + } + + public String getMatchPoiName() { + return matchPoiName; + } + + public void setMatchPoiName(String matchPoiName) { + this.matchPoiName = matchPoiName; + } + + public String getRegionInfo() { + return regionInfo; + } + + public void setRegionInfo(String regionInfo) { + this.regionInfo = regionInfo; + } + + public String getTjjDistrictName() { + return tjjDistrictName; + } + + public void setTjjDistrictName(String tjjDistrictName) { + this.tjjDistrictName = tjjDistrictName; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getVillageType() { + return villageType; + } + + public void setVillageType(String villageType) { + this.villageType = villageType; + } + + public MultipartFile getFile() { + return file; + } + + public void setFile(MultipartFile file) { + this.file = file; + } + + public List getVillageIdentifyList() { + return villageIdentifyList; + } + + public void setVillageIdentifyList(List villageIdentifyList) { + this.villageIdentifyList = villageIdentifyList; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } +} + diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/ExcelUtils.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/ExcelUtils.java new file mode 100644 index 000000000..bc9974c76 --- /dev/null +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/ExcelUtils.java @@ -0,0 +1,148 @@ +package com.fangjia.bkoff.util; + +import com.alibaba.excel.EasyExcelFactory; +import com.alibaba.excel.ExcelReader; +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.event.AnalysisEventListener; +import org.apache.commons.lang.StringUtils; +import org.apache.poi.ss.formula.eval.ErrorEval; +import org.apache.poi.ss.usermodel.*; + +import java.io.BufferedInputStream; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * excel¶Áд¹¤¾ßÀà + * + * @author shenjian + * @since 2021/07/12 + */ +public class ExcelUtils { + public static Map read(InputStream inputStream, int sheetIndex, int skipRow) { + // sheetIndex sheetϱê + // skipRow Ìø¹ýµıíͷÐÐÊý + Map map = new HashMap(); + List> ret = new ArrayList>(); + InputStream inp = null; + try { + inp = inputStream; + BufferedInputStream bufferedInputStream = new BufferedInputStream(inp, 1024 * 200); + Workbook workbook = WorkbookFactory.create(bufferedInputStream); + workbook.setForceFormulaRecalculation(true); + Sheet sheet = workbook.getSheetAt(sheetIndex); + //ÐкÅ + int rowIndex = 0; + for (Row row : sheet) { + rowIndex++; + if (rowIndex <= skipRow) { + continue; + } + short minColIx = 0; + short maxColIx = row.getLastCellNum(); + List rowData = new ArrayList(); + for (short colIx = minColIx; colIx < maxColIx; colIx++) { + Cell cell = row.getCell(colIx); + if (cell == null) { + rowData.add(colIx, null); + } else { + if (StringUtils.isNotBlank(cell.toString())) { + rowData.add(getCellValue(cell).toString()); + }else { + rowData.add(""); + } + } + } + ret.add(rowData); + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + if (inp != null) { + try { + inp.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + map.put("header", ret.subList(0, 1).get(0)); + map.put("data", ret.subList(1, ret.size())); + return map; + } + + public static Object getCellValue(Cell cell) { + switch (cell.getCellType()) { + case Cell.CELL_TYPE_BLANK: + return null; + case Cell.CELL_TYPE_BOOLEAN: + return cell.getBooleanCellValue(); + case Cell.CELL_TYPE_ERROR: + + return ErrorEval.getText(cell.getErrorCellValue()); + case Cell.CELL_TYPE_FORMULA: + try { + return cell.getNumericCellValue(); + } catch (Exception e) { + try { + return cell.getStringCellValue(); + } catch (Exception ex) { + return cell.getRichStringCellValue().getString(); + } + } + case Cell.CELL_TYPE_NUMERIC: + if (org.apache.poi.ss.usermodel.DateUtil.isCellDateFormatted(cell)) { + return cell.getDateCellValue(); + } + return cell.getNumericCellValue(); + case Cell.CELL_TYPE_STRING: + return cell.getStringCellValue(); + default: + return null; + } + } + + public static class SimpleExcelListener extends AnalysisEventListener { + private List> dataList = new ArrayList>(); + private List headers = new ArrayList(); + + @Override + public void invoke(Object o, AnalysisContext analysisContext) { + Map map = (Map) o; + dataList.add(new ArrayList(map.values())); + } + + @Override + public void invokeHeadMap(Map headMap, AnalysisContext context) { + for (Object val : headMap.values()) { + headers.add((String) val); + } + } + + @Override + public void doAfterAllAnalysed(AnalysisContext analysisContext) { + + } + + List> getDataList() { + return dataList; + } + + void setDataList(List> dataList) { + this.dataList = dataList; + } + + public List getHeaders() { + return headers; + } + + public void setHeaders(List headers) { + this.headers = headers; + } + } +} diff --git a/projects/fangjia-bkoff/src/main/resources/ftl/city.ftl b/projects/fangjia-bkoff/src/main/resources/ftl/city.ftl index b72f6b106..0a6ac6c87 100644 --- a/projects/fangjia-bkoff/src/main/resources/ftl/city.ftl +++ b/projects/fangjia-bkoff/src/main/resources/ftl/city.ftl @@ -9,7 +9,7 @@
diff --git a/projects/fangjia-bkoff/src/main/resources/sothis.properties b/projects/fangjia-bkoff/src/main/resources/sothis.properties index 46c1ca032..5e138d238 100644 --- a/projects/fangjia-bkoff/src/main/resources/sothis.properties +++ b/projects/fangjia-bkoff/src/main/resources/sothis.properties @@ -4,7 +4,7 @@ sothis.viewResolver.class=org.sothis.web.mvc.DefaultModelAndViewResolver sothis.actionMapper.class=org.sothis.web.mvc.DefaultActionMapper sothis.interceptors.params.class=org.sothis.web.mvc.interceptors.ParametersInterceptor -sothis.interceptors.upload.class=org.sothis.web.mvc.interceptors.FileUploadInterceptor +sothis.interceptors.upload.class=com.fangjia.bkoff.interceptor.FileUploadInterceptor sothis.interceptors.auth.class=com.fangjia.bkoff.interceptor.AuthInterceptor sothis.interceptors.stack.default=upload,params,auth diff --git a/projects/fangjia-bkoff/src/main/resources/涉农结果导入后台模板.xlsx b/projects/fangjia-bkoff/src/main/resources/涉农结果导入后台模板.xlsx new file mode 100644 index 000000000..f43174e2b Binary files /dev/null and b/projects/fangjia-bkoff/src/main/resources/涉农结果导入后台模板.xlsx differ diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl index 29ae67e83..2f3071de2 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl @@ -1,169 +1,207 @@ <#ftl attributes={"content_type":"text/html; charset=UTF-8"}> <#compress> - - - - - api用户新增 - - <#include "/common_js.ftl" /> - - - - <#include "/layout/header.ftl" /> -
-${msg!''} - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 栏位 - - 值 -
昵称
用户名
密码
账户类型 - -
账户用途 - -
是否监控 - 不监控 - 监控 -
Email
销售负责人
公司
估价调整比率(注意:设置该参数后估价接口的返回价格将乘以该系数)
siteName
到期时间
ip地址(每行一个IP地址)
-
-
- + + + <#include "/layout/header.ftl" /> +
+ ${msg!''} + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 栏位 + + 值 +
昵称
用户名
密码
账户类型 + +
账户用途 + +
是否监控 + 不监控 + 监控 +
Email
销售负责人
公司
估价调整比率(注意:设置该参数后估价接口的返回价格将乘以该系数) +
siteName
到期时间
ip地址(每行一个IP地址) +
+
+
+ - - + function getRandomElement(arr) { + return arr[parseInt(Math.random() * arr.length)]; + } + + function createPassword() { + var password = ""; + + // 确保至少包含一个特殊字符 + password += getRandomElement(special); + + // 随机选择其余7个字符 + for (var i = 0; i < 7; i++) { + password += getRandomElement(numAndengAndENGAndSpecial); + } + + // 将生成的密码打乱顺序 + password = password.split('').sort(() => 0.5 - Math.random()).join(''); + + return password; + } + + + + \ No newline at end of file diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/apiVisitStat.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/apiVisitStat.ftl index 893f21d79..4f5ec9781 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/apiVisitStat.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/apiVisitStat.ftl @@ -12,9 +12,9 @@ + + + + <#include "/layout/header.ftl"/> +
+
+
+
+ + + 下载模板 +
+
+
+ 涉农类型: + + 城市: + + + 地址: + + +
+
+ <#if villageIdentifyList??> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <#if (villageIdentifyList??&&villageIdentifyList?size>0)> + <#list villageIdentifyList as it> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
涉农类型城市(参数)地址省份省份编码城市城市编码区县区县编码乡镇街道乡镇街道编码居委居委编码城乡编码城乡分类涉农标识地址验证是否县级市是否市辖建制镇是否开发区开发区名称开发区级别是否县政府所属区域时间
${it.villageType!}${it.cityParam!}${it.address!}${it.province!}${it.provinceCode!}${it.city1!}${it.cityCode!}${it.district!}${it.districtCode!}${it.town!}${it.townCode!}${it.committee!}${it.committeeCode!}${it.typeCode!}${it.typeName!}${it.verifyFlag!}${it.addrVerify!}${it.countyLevelCity!}${it.administrativeTowns!}${it.devDistrict!}${it.devDistrictName!}${it.devLevel!}${it.countyGov!}${it.addrArea!}${it.createTime?string("yyyy-MM-dd")}
+ + <#if pager??> + <@d_pager action = "base" currentPage = pager.currentPage controller = "villageIdentify" totalPages = pager.totalPages/> + +
+
+ + + + + + \ No newline at end of file diff --git a/projects/fangjia-bkoff/src/main/webapp/yugudan/add.ftl b/projects/fangjia-bkoff/src/main/webapp/yugudan/add.ftl index 1a2c42cf1..10353a22b 100644 --- a/projects/fangjia-bkoff/src/main/webapp/yugudan/add.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/yugudan/add.ftl @@ -1085,7 +1085,7 @@ html { - + + + + + - -
-
CPDB-全国房价指数
-
-
- <#list cityStats! as stat> - ${stat.city}:${stat.avgPrice}元/㎡ - + +<#include "/header/v6/_header.ftl"/> + +
+
+
+
+

+

+

自建中国地址/房产大数据库CPDB(China Property Database),

+

包含地址库、楼盘库、商铺、写字楼等信息的数据字典,用于存储和管理楼盘信息。

+

通过地址标准化拆分加上GPS坐标,实现地址价值精准匹配。

+ + +
- -
-
-
- CPDB-中国房产大数据库 - - CPDB(China Property Data Base)是由房价网通过10年积累和国际领先的专利技术(OLKD),打造的精确到每一户房产微观数据的“中国不动产大数据库”。 -
CPDB的数据覆盖全国300个城市、30万楼盘,拥有5000万套房产的个性化微观数据,革命性的实现了“一户一信息”,是目前中国最大、最专业、最实时的不动产微观数据库。 -
- - CPDB中的房产大数据应用广泛,多年来向各大银行、政府机构及互联网金融等提供非常有价值的数据产品和服务,以其权威性和影响力成为房产大数据领域的标杆。 - - - 房地产大数据免费体验>> - -
- -
- 谁在使用CPDB - 银  行  - 电商平台 - 贷款公司 - 评估机构 - 房产营销机构 - 软件公司 - 金融类网站 - 会员中心 -
- -
- CPDB应用 - CPDB应用 -
- 房价匹配 - 进行地址匹配房价 - 精准匹配、一户一价 +
+

痛点与挑战

+
+
+
+ 数据信息
-
- 房地产营销策划 - 房地产市场分析及营销策划 - 房地产销售辅助 -
-
- 贷款风控 - 贷款风险控制体系 - 贷后综合管理 -
-
- 数据植入 - 将数据植入客户软件 - 与媒体的数据植入 -
-
- 广告精准营销 - 商业DM精准投递 - 金融产品精准营销 -
-
- 定制解决方案 - 根据客户需求,进行数据的二次挖掘和分析,从而开发和定制专业软件 +
+

市面上的房产数据来源多种多样,无标杆型数据服务公司。

- -
- CPDB构成图 -
- 云存储 - 云计算 - 应用于各种需求 - CPDB -
- 原始数据采集 - 互联网海量数据抓取 - 第三方数据渠道 - 合作机构专业数据 -
-
- 数据清洗 - 去除重复、无效的数据,并进行梳理 -
-
- 数据关联 - 根据需求对数据进行匹配和关联 -
-
- 数据挖掘 - 专利OLKD 技术,对数据进行定向搜索和挖掘,并深入分析、处理 -
+
+
+
+
难以分辨准确性
+
+
+

房产数据维度多、杂乱,无法得到精准多元数据,并进行整合。

- -
- CPDB “不动产大数据库”优势 -
-
- 覆盖面广 - 数据库目前已覆盖全国300个城市,30万个楼盘 - 5000万套房产微观数据,实现“一户一信息” - 拥有6500万条估价记录、200万张小区图片 -
-
- 数据精准 - 自主研发的定向搜索及数据挖掘(OLKD)专利技术 - 智能化云计算系统 - 丰富的数据源渠道 - 资深执业评估师合作团队 - 强大客服团队核准、校验机制 -
-
- 实时有效 - 史无前例的房产数据实时更新技术 - 每日数据更新量达超过20万条 - 高效的僵尸数据筛选系统 -
+
+
+ 能力薄弱 +
+
+

房产数据系统处理能力薄弱,数据响应速度达不到要求。

- -
- 团队介绍 -
- 高新技术团队   走在国际前沿 - - 1CPDB拥有强大的技术团队,其核心技术人员来自全球著名企业,拥有世界级高新技术。由CPDB技术精英自主研发的定向搜索及数据挖掘(OLKD)技术,已获得国家专利,可对全互联网海量数据进行搜集整理和深度分析,且应用广泛。 -
2CPDB拥有业内领先的内容团队,具备丰富的行业经验,人工介入数据的审核及校验,时刻监控数据的精准性。 -
3CPDB的商务运营团队实力超群,通过与各类国际知名企业的合作,不断丰富CPDB的数据源,同时也将CPDB推广、应用到更多的领域。 -
- - 更多房产大数据介绍请点击查看>> - -
-
-
- -
-
-
    -
  • 咨询电话:021-62391139
  • - -
  • -
  • 商务合作,请提交信息获得产品体验
  • -
  • *姓名:
  • -
  • *公司:
  • -
  • *电邮:
  • -
  • *手机:
  • -
  • 您的信息已提交成功!
  • -
  • 我们会尽快联系您!
  • -
  • 您也可直接拨打电话
  • -
  • 021-62391139
  • -
  • 提交
  • -
-
- -
-
-
-
CPDB数据种类
-
- 精准估价数据 -
    -
  • 覆盖全国300个城市、30万个小区
  • -
  • 累计6500万条估价记录
  • -
  • 一户一价的精准评估
  • -
-
-
- 住宅物业信息 -
    -
  • 楼盘均价
  • -
  • 楼盘租金
  • -
  • 楼盘详情
  • -
  • 楼栋信息
  • -
  • 成交记录
  • -
  • 成交数据统计
  • -
  • 房价走势
  • -
  • 地图展示
  • -
  • 典型房源
  • -
  • 挂牌房源统计
  • -
  • 楼盘环境分析
  • -
  • 专业分析报告
  • -
  • 楼盘图片库(超过200万张)
  • -
-
-
- 商业地产信息 -
    -
  • 地图定位
  • -
  • 商铺\写字楼均价
  • -
  • 商铺\写字楼租金
  • -
  • 商铺\写字楼详情
  • -
  • 消费能力分析
  • -
  • 竞争对手情报
  • -
-
-
- 城市房产行情 -
    -
  • 城市房产均价
  • -
  • 城市房产均价走势
  • -
  • 城市房价涨跌幅
  • -
-
-
- 营销服务 -
    -
  • 目标客户匹配
  • -
  • 客户行为分析
  • -
  • 营销决策辅助
  • -
  • 市场推广参考
  • -
-
-
- 研究领域 -
    -
  • 房价历史数据查询
  • -
  • 地域房地产综合分析
  • -
-
-
-
-
-
-
-
-
-
-
-
- - +
+

数据维度展示

+
+
+
行政区划库
+
全国367个城市/地区的行政区划信息及行政代码库
+
+
1

省级行政区

+
2

地级行政区

+
3

区(县)级行政区

+
4

乡镇街道行政区

+
5

行政区划代码库

+
+
+
+
地址数据库
+
覆盖全国的地址大数据库,数据结构标准、颗粒度精细,地址匹配能力行业领先
+
+
1

全国地址库

+
2

地址别名库

+
3

地理坐标库

+
4

POI数据库

+
5

涉农地址标签

+
+
+
+
楼盘字典
+
依托国内线上房产估值平台房价网,十七年全国房产数据积累,专业专注
+
+
1

小区基础信息

+
2

小区坐标信息

+
3

小区围栏信息

+
4

小区特征标签

+
5

小区周边信息

+
+
+
+
商业地产库
+
全国商业地产大数据库,解决名址匹配等难题
+
+
1

写字楼基础信息

+
2

写字楼坐标位置

+
3

商铺基础信息

+
4

商铺坐标位置

+
5

商铺经营业态

+
+
+
+
市场动态数据
+
自2006年以来的时间序列市场动态数据积累,数据多元丰富,满足不同场景需求
+
+
1

城市/区域/楼盘房价走势

+
2

全国城市住宅价格指数

+
3

全国房产均价/一房一价

+
4

全国房产租金价格数据

+
5

全国房产出租/出售样本

+
6

全国二手房住宅成交数据

+
7

全国房产司法法拍数据

+
8

全国房产评估案例样本

+
+
- -<#assign NO_TOOL=true> -<#include "/header/v5/_footer.ftl" /> - - -<#include "/analytics.ftl" /> + +<#include "/header/v6/_footer.ftl"/> + + + \ No newline at end of file diff --git a/projects/fangjia-coresite/src/main/webapp/baidu_analysis.ftl b/projects/fangjia-coresite/src/main/webapp/baidu_analysis.ftl index 78defc5e3..4f947ef1a 100644 --- a/projects/fangjia-coresite/src/main/webapp/baidu_analysis.ftl +++ b/projects/fangjia-coresite/src/main/webapp/baidu_analysis.ftl @@ -17,3 +17,5 @@ s.parentNode.insertBefore(hm, s); })(); + + diff --git a/projects/fangjia-coresite/src/main/webapp/company/about.ftl b/projects/fangjia-coresite/src/main/webapp/company/about.ftl index e59fd49cf..6867ffbf8 100644 --- a/projects/fangjia-coresite/src/main/webapp/company/about.ftl +++ b/projects/fangjia-coresite/src/main/webapp/company/about.ftl @@ -1,437 +1,221 @@ - -公司简介 - 房价网 fangjia.com - - -<#include "../jsconstants.ftl" /> + + 房价网电话-地址数据价值应用,专业的金融机构服务商 + + + <#include "../jsconstants.ftl" /> - - - - - - - - - - - + + + + + -<#include "/header/v5/_header.ftl"/> +<#include "/header/v6/_header.ftl"/> - -