diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000000000..b8b0cf0b7 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,75 @@ +#!/usr/bin/env groovy +pipeline { + agent any + parameters { + choice(name: 'PROJECT_NAME', choices: ['fangjiabkoff', 'chafangtong', 'fangjia', 'fangjiapds', 'fangjiastatic', 'geluke'], description: '请选择å�‘布的项目') + } + tools { + jdk 'JDK8' + } + + stages { + stage("Git Checkout") { + steps { + git changelog: false, credentialsId: 'gitlabsecret', poll: false, url: 'http://gitlab.fangjia.com/dev0/main.git' + } + } + stage('Maven Build') { + steps { + script { + def projects = ['fangjiabkoff', 'chafangtong', 'fangjia', 'fangjiapds', 'fangjiastatic', 'geluke'] + for (def project : projects) { + if (params.PROJECT_NAME == project) { + dir("deliverables/${project}") { + withMaven(globalMavenSettingsConfig: '426b9a25-aa0d-47d3-a24c-8abdfc4421ff') { + sh 'mvn clean package -Dmaven.test.skip=true' + } + } + } + } + } + } + } + stage('Docker Build') { + steps { + script { + def projects = ['fangjiabkoff', 'chafangtong', 'fangjia', 'fangjiapds', 'fangjiastatic', 'geluke'] + def imagesName = ['fangjiabkoff': 'fangjia-bkoff', 'chafangtong': 'chafangtong', 'fangjia': 'fangjia-coresite', 'fangjiapds': 'fangjia-pds', 'fangjiastatic': 'fangjia-static', 'geluke':"geluke"] + for (def project : projects) { + if (params.PROJECT_NAME == project) { + dir("projects/${imagesName[project]}") { + withDockerRegistry(credentialsId: 'DockerNexus', url: 'http://192.168.0.19:9012') { + sh "docker build -t 192.168.0.19:9011/${imagesName[project]}:${env.BUILD_TAG.toLowerCase()} ." + withDockerRegistry(credentialsId: 'DockerNexus', url: 'http://192.168.0.19:9011') { + sh "docker push 192.168.0.19:9011/${imagesName[project]}:${env.BUILD_TAG.toLowerCase()}" + } + } + } + } + } + } + } + } + stage('K8S Deploy') { + steps { + script { + def projects = ['fangjiabkoff', 'chafangtong', 'fangjia', 'fangjiapds', 'fangjiastatic', 'geluke'] + def k8s_config_map = ['fangjiabkoff': 'fangjia-bkoff', 'chafangtong': 'chafangtong', 'fangjia': 'fangjia-coresite', 'fangjiapds': 'fangjia-pds', 'fangjiastatic': 'fangjia-static', 'geluke':"geluke"] + for (def project : projects) { + if (params.PROJECT_NAME == project) { + dir("deliverables/k8s") { + withKubeConfig([credentialsId: 'K8SSecret', serverUrl: 'https://k8s.fangjia.com:6443']) { + def orgVersion = "${k8s_config_map[project]}:latest" + def nowVersion = "${k8s_config_map[project]}:${env.BUILD_TAG.toLowerCase()}" + sh "sed -i 's/${orgVersion}/${nowVersion}/g' ${k8s_config_map[project]}.yaml" + sh "kubectl apply -f ${k8s_config_map[project]}.yaml" + } + } + } + } + } + } + } + } + +} \ No newline at end of file diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AverageStatisticsController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AverageStatisticsController.java index 3b91e6583..71ff8fb02 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AverageStatisticsController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/AverageStatisticsController.java @@ -968,9 +968,6 @@ public class AverageStatisticsController { */ public Object baseAction(AverageStatisticsModel model){ Pager pager = model.getPager(25); - if (StringUtils.isBlank(model.getCityDisplay())) { - return model; - } pager.setTotalRows(avgBaseDao.count(model.getCityDisplay(), model.getRegion(), model.getName(),null, model.getStartDate(), model.getEndDate())); model.setBaseList(avgBaseDao.findAll(model.getCityDisplay(), model.getRegion(), model.getName(),null, model.getStartDate(), model.getEndDate(), pager)); return model; @@ -987,6 +984,8 @@ public class AverageStatisticsController { list.add("ÊÇ·ñ¼ÓÈëÖ¸µ¼¼Û"); list.add("µ÷²éʱ¼ä"); list.add("µ÷²éÈË"); + list.add("À´Ô´"); + list.add("À´Ô´Ð¡ÇøÃû"); data.add(list); HSSFWorkbook workbook = new HSSFWorkbook(); HSSFSheet sheet = workbook.createSheet("µ¼ÈëÄ£°å"); @@ -994,10 +993,12 @@ public class AverageStatisticsController { 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); - HSSFCell cell6= row.createCell(6); + HSSFCell cell3 = row.createCell(3); + HSSFCell cell4 = row.createCell(4); + HSSFCell cell5 = row.createCell(5); + HSSFCell cell6 = row.createCell(6); + HSSFCell cell7 = row.createCell(7); + HSSFCell cell8 = row.createCell(8); cell0.setCellValue("³ÇÊÐ"); cell1.setCellValue("ÇøÓò"); cell2.setCellValue("Ð¡ÇøÃû"); @@ -1005,6 +1006,8 @@ public class AverageStatisticsController { cell4.setCellValue("ÊÇ·ñ¼ÓÈëÖ¸µ¼¼Û"); cell5.setCellValue("µ÷²éʱ¼ä"); cell6.setCellValue("µ÷²éÈË"); + cell7.setCellValue("À´Ô´"); + cell8.setCellValue("À´Ô´Ð¡ÇøÃû"); HttpServletResponse response = ActionContext.getContext().getResponse(); response.setCharacterEncoding("UTF-8"); response.setContentType("application/x-download;charset=UTF-8"); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DataController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DataController.java index bef3b773e..3d55ac818 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DataController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DataController.java @@ -769,6 +769,7 @@ public class DataController { outfields.add("districtsHasLoudong"); outfields.add("districtsHasFanghao"); outfields.add("priceCoverage"); + outfields.add("districtAliasTotalCount"); outfields.add("priceCreditGte80Coverage"); outfields.add("priceCreditGte66Coverage"); outfields.add("priceCreditGte60Coverage"); @@ -801,6 +802,7 @@ public class DataController { map.put("districtsHasLoudong", cityInfo.getDistrictsHasLoudong() == null ? 0 : cityInfo.getDistrictsHasLoudong()); map.put("districtsHasFanghao", cityInfo.getDistrictsHasFanghao() == null ? 0 : cityInfo.getDistrictsHasFanghao()); map.put("priceCoverage", cityInfo.getPriceCoverage()); + map.put("districtAliasTotalCount", cityInfo.getDistrictAliasTotalCount()); map.put("priceCreditGte80Coverage", cityInfo.getPriceCreditGte80Coverage()); map.put("priceCreditGte66Coverage", cityInfo.getPriceCreditGte66Coverage()); map.put("priceCreditGte60Coverage", cityInfo.getPriceCreditGte60Coverage()); @@ -921,7 +923,8 @@ public class DataController { put( "estateCompany" , "ÎïÒµ¹«Ë¾" ); put( "cubagePercent" , "ÈÝ»ýÂÊ" ); put( "virescencePercent" , "ÂÌ»¯ÂÊ" ); - put( "carSite" , "Í£³µÎ»" ); + put( "carSite" , "Í£³µÎ»" ); + put( "carSiteCount" , "Í£³µÎ»ÃèÊö" ); put( "estateCharge" , "ÎïÒµ·Ñ" ); put( "floorplanPics" , "Â¥²ãÆ½ÃæÍ¼" ); put( "outPics" , "Í⾰ͼ" ); @@ -949,7 +952,6 @@ public class DataController { put( "liveDate","¿ªÒµÊ±¼ä"); put( "divisible","ÊÇ·ñ¿É·Ö¸î"); put( "unifiedManage","ÊÇ·ñͳһ¹ÜÀí"); - put( "carSiteCount","³µÎ»ÊýÁ¿"); put( "metroInfo","µØÌúÑØÏß"); put( "metroNames","µØÌúÕ¾Ãû"); put( "facilities","ÅäÌ×ÉèÊ©"); @@ -996,7 +998,42 @@ public class DataController { put("committee","¾Óί»á"); put("schools","¶Ô¿ÚѧУ"); put("houseStructure","·¿Îݽṹ"); - } };// + put("estateType2","ÎïÒµÀàÐÍ"); + put("buildDate","½¨ÖþÄê´ú"); + put("alias","±ðÃû"); + put("addrAlias","µØÖ·±ðÃû"); + put("mainTypeArea","Ö÷Á¦Ãæ»ý"); + put("loudongCount","Â¥¶°Êý"); + put("township","ÏçÕò½ÖµÀ"); + put("schools","¶Ô¿ÚСѧ"); + put("kindergartens","¶Ô¿ÚÓ×¶ùÔ°"); + put("elevator","µçÌÝ"); + put("landProperty","ȨÊôÀà±ð"); + put("usageCard","ÍÁµØÊ¹ÓÃȨ֤ºÅ"); + put("landUsageStart","ÍÁµØÊ¹ÓÃÄêÏÞ"); + put("occupancyRate","ÈëסÂÊ"); + put("mainType","Ö÷Á¦»§ÐÍ"); + put("mappingAlias","Ó³Éä±ðÃû"); + put("districtAliasTotalCount", "±ðÃû×ÜÁ¿"); + + put("undergroundCarSite", "µØÏ³µÎ»Êý"); + put("landCarSite", "µØÉϳµÎ»Êý"); + put("parkingFee", "³µÎ»ÔÂ×â½ð"); + put("sight", "¿ª¼äÃæ»ý"); + put("lobbyHeight", "´óÌòã¸ß"); + put("standardHeight", "±ê×¼²ã¸ß"); + put("clearHeight", "¾»¸ß"); + put("standardArea", "±ê×¼²ãÃæ»ý"); + put("foreign", "ÊÇ·ñÉæÍâ"); + put("register", "ÊÇ·ñ¿É×¢²á"); + put("divisible", "ÊÇ·ñ¿É·Ö¸î"); + put("elevatorsCount","µçÌÝÊýÁ¿"); + put("personElevatorsCount","¿ÍÌÝÊý"); + put("goodsElevatorCount","»õÌÝÊý"); + put("realUsePercent","µÃ·¿ÂÊ"); + put("landFloor","µØÉϲãÊý"); + put("undergroundFloor","µØÏ²ãÊý"); + } };// return map; } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/District2Controller.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/District2Controller.java index 3d3ca01eb..ff1ff0425 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/District2Controller.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/District2Controller.java @@ -756,6 +756,7 @@ public class District2Controller { data.put("carSiteCount", district.getCarSiteCount()); data.put("modificationDate", new Date()); data.put("publisherType", 11); + data.put("township", district.getTownship()); data.put("businessQuarter", district.getBusinessQuarter()); @@ -811,6 +812,9 @@ public class District2Controller { data.put("landCarSite", district.getLandCarSite()); data.put("undergroundCarSite", district.getUndergroundCarSite()); + data.put("landFloor", district.getLandFloor()); + data.put("undergroundFloor", district.getUndergroundFloor()); + data.put("clearHeight", district.getClearHeight()); data.put("standardHeight", district.getStandardHeight()); data.put("standardArea", district.getStandardArea()); @@ -828,10 +832,10 @@ public class District2Controller { }else if(district.getCategory().equals("shop")){ data.put("propertyStatus", district.getPropertyStatus()); data.put("shopEstateType2", district.getShopEstateType2()); + data.put("landFloor", district.getLandFloor()); + data.put("undergroundFloor", district.getUndergroundFloor()); + data.put("realUsePercent", district.getRealUsePercent()); } - - - districtService.updateById(data, district.getId()); msg="±£´æ³É¹¦!"; } 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 659fe43c9..657388333 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 @@ -1306,6 +1306,7 @@ public class DistrictController { && StringUtils.isNotBlank(district.getRegion())) { // signFiledEditFlag(district, null); districtService.save(district); + districtUpdateTaskService.createTask(district, 5); } if (model.isGoPic()) { @@ -2012,6 +2013,23 @@ public class DistrictController { if (newName != null || newRegion != null) { districtUpdateTaskService.createTask(orgDis, 2, newName, newRegion); districtUpdateTaskService.createTask(orgDis, 6, newName, newRegion); + + District distTask = new District(); + distTask.setCity(orgDis.getCity()); + if(StringUtils.isNotBlank(newName)){ + distTask.setRegion(newRegion); + }else{ + distTask.setRegion(orgDis.getRegion()); + } + + distTask.setEstateType2(orgDis.getEstateType2()); + if(StringUtils.isNotBlank(newName)){ + distTask.setName(newName); + }else{ + distTask.setName(orgDis.getName()); + } + + districtUpdateTaskService.createTask(distTask, 5); } if (StringUtils.isNotBlank(district.getEstateType2()) diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationAuditController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationAuditController.java index 52b1ecb2d..a101d08b2 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationAuditController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/EvaluationAuditController.java @@ -305,11 +305,11 @@ public class EvaluationAuditController { if(trades!=null && model.getAuditPrice()!=null){ int charge = 0; if(model.getAuditPrice() > 0 && model.getAuditPrice() <= 100){ - charge = 40; + charge = 20; }else if(model.getAuditPrice() > 100 && model.getAuditPrice() <= 300){ - charge = 160; + charge = 70; }else if(model.getAuditPrice() > 300){ - charge = 360; + charge = 80; } trades.setCharge((int) charge); userTradesService.update(trades); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/YugudanController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/YugudanController.java index 3a51dcc61..5d15317e7 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/YugudanController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/YugudanController.java @@ -401,11 +401,11 @@ public class YugudanController { double price = model.getPeopleEditPrice(); double charge = 0; if(price > 0 && price <= 100){ - charge = 40; + charge = 20; }else if(price > 100 && price <= 300){ - charge = 160; + charge = 70; }else if(price > 300){ - charge = 360; + charge = 80; } EvaluationAudit audit = evaluationAuditService.findByEvalutionId(String.valueOf(model.getId())); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/fjtEvaluationController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/fjtEvaluationController.java index 93eec6a06..cba98d594 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/fjtEvaluationController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/fjtEvaluationController.java @@ -313,7 +313,7 @@ public class fjtEvaluationController { Map userDetailMap = getUserDetailMap(uids); for(UserTradesBo bo : list){ row = sheet.createRow(i++); - if(bo.getRole() == 12){//Å©Ðаæ + if(bo.getRole() == 12 || bo.getRole() == 16){//Å©Ðаæ //EvaluationAudit audit = evaluationAuditService.findByEvalutionId(String.valueOf(bo.getEvaluationId())); EvaluationAudit audit = evalAuditMap.get(Long.valueOf(bo.getEvaluationId())); if(audit == null){ @@ -359,7 +359,8 @@ public class fjtEvaluationController { } row.createCell(17).setCellValue(DateUtil.formatByPattern(bo.getEvaluationDate(), "yyyyÄêMMÔÂddÈÕ")); - + + }else{ row.createCell(0).setCellValue(bo.getReportNum()); row.createCell(1).setCellValue(audit.getCity()); @@ -405,6 +406,11 @@ public class fjtEvaluationController { } row.createCell(21).setCellValue(bo.getArea()); + + FjtEvaluation ev = evalMap.get(Long.valueOf(bo.getEvaluationId())); + if(ev.getCertificateAddress() != null) { + row.createCell(22).setCellValue(ev.getCertificateAddress()); + } }else{ row.createCell(0).setCellValue(bo.getReportNum()); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/BaseAvgImportServlet.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/BaseAvgImportServlet.java index f4594ad70..f640377a3 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/BaseAvgImportServlet.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/util/BaseAvgImportServlet.java @@ -1,6 +1,7 @@ package com.fangjia.bkoff.util; import com.fangjia.core.Constants; +import com.fangjia.core.RegionData; import com.fangjia.core.util.DataUtil; import com.fangjia.core.util.DateUtil; import com.fangjia.core.util.HttpRequest; @@ -8,11 +9,13 @@ import com.fangjia.core.util.HttpRequestException; import com.fangjia.dal.QueryParam; import com.fangjia.dal.common.DistrictKey; import com.fangjia.dal.mongo.dao.AvgBaseDao; +import com.fangjia.dal.mongo.model.AverageStatistics; import com.fangjia.dal.mongo.model.AvgBase; import com.fangjia.dal.mongo.model.bkoff.GuidingPrice; import com.fangjia.dal.seaweed.model.District; import com.fangjia.service.datastore.DistrictService; import com.fangjia.service.mongo.bkoff.GuidingPriceService; +import com.fangjia.service.mongo.fangjia.AverageStatisticsService; import net.sf.json.JSONObject; import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItemFactory; @@ -47,12 +50,12 @@ import java.util.*; public class BaseAvgImportServlet extends HttpServlet { - private static final String[] columns = { "³ÇÊÐ", "ÇøÓò", "Ð¡ÇøÃû", "¼Û¸ñ", "ÊÇ·ñ¼ÓÈëÖ¸µ¼¼Û", "µ÷²éʱ¼ä", "µ÷²éÈË" }; + private static final String[] columns = { "³ÇÊÐ", "ÇøÓò", "Ð¡ÇøÃû", "¼Û¸ñ", "ÊÇ·ñ¼ÓÈëÖ¸µ¼¼Û", "µ÷²éʱ¼ä", "µ÷²éÈË" , "À´Ô´", "À´Ô´Ð¡ÇøÃû"}; private AvgBaseDao avgBaseDao; private GuidingPriceService guidingPriceService; private DistrictService districtService; - + private AverageStatisticsService averageStatisticsService; @Override public void init(ServletConfig config) throws ServletException { @@ -62,6 +65,7 @@ public class BaseAvgImportServlet extends HttpServlet { avgBaseDao = (AvgBaseDao) context.getBean("avgBaseDao"); guidingPriceService = (GuidingPriceService) context.getBean("guidingPriceService"); districtService = (DistrictService) context.getBean("districtService"); + averageStatisticsService = (AverageStatisticsService) context.getBean("averageStatisticsService"); } catch (Exception e) { e.printStackTrace(); } @@ -108,10 +112,6 @@ public class BaseAvgImportServlet extends HttpServlet { long version = new Date().getTime(); infoMap = checkUploadData(sheet, name, version, infoMap, realName); infoMap.put("version", version); -// String info = map.get("info"); -// if(StringUtils.isNotBlank(info) && info.equals("success")){ -// new CookieContext("fangjia.com").saveCookie(response, "upload_version", version); -// } String json = JSONObject.fromObject(infoMap).toString(); if (infoMap.containsKey("success")) { response.getWriter().write(infoMap.get("success").toString()); @@ -174,11 +174,11 @@ public class BaseAvgImportServlet extends HttpServlet { } private Map checkUploadData(Sheet sheet, String name, long version, Map infoMap, - String realName) { + String realName) { int totalNum = sheet.getLastRowNum(); System.out.println("ÉÏ´«Îļþ¹²:" + totalNum + "¸ö"); - if (totalNum > 5000) { - totalNum = 5000; + if (totalNum > 20000) { + totalNum = 20000; } Integer totalLine = 0;// ×ÜÐÐÊý @@ -371,7 +371,8 @@ public class BaseAvgImportServlet extends HttpServlet { } else if (key.equals("¼Û¸ñ") && map.get(key) != null) { String val = formatNumer(map.get(key)); if (StringUtils.isNotBlank(val)) { - int x = Integer.parseInt(val); + double dd = Double.parseDouble(val); + int x = (int) dd; avgBase.setPrice(x); } @@ -385,23 +386,63 @@ public class BaseAvgImportServlet extends HttpServlet { Date applyDate = (DateUtil.parseDate(map.get(key), "yyyy-MM-dd")); avgBase.setCreationDate(applyDate == null ? curDate : applyDate); } else if (key.equals("µ÷²éÈË") && map.get(key) != null) { - avgBase.setUserName(map.get(key)); + } else if (key.equals("À´Ô´") && map.get(key) !=null){ + avgBase.setSource(map.get(key).replaceAll("\\s", "")); + } else if (key.equals("À´Ô´Ð¡ÇøÃû") && map.get(key) != null){ + avgBase.setSourceCommName(map.get(key).replaceAll("\\s", "")); } + avgBase.setRegion(RegionData.formatRegion(avgBase.getCity(), avgBase.getRegion())); avgBase.setCategory("district"); - } - if (avgBase.getIsGuidancePrice() == 1) { - - DistrictKey districtKey = new DistrictKey(avgBase.getCity(), avgBase.getRegion(), + District dis = null; + if(StringUtils.isNotBlank(avgBase.getSourceCommName()) && !avgBase.getSourceCommName().equals(avgBase.getDistrictName())){ + DistrictKey districtKey = new DistrictKey(avgBase.getCity(), RegionData.formatRegion(avgBase.getCity(), avgBase.getRegion()), avgBase.getDistrictName()); - District dis = districtService.findOneByKey(districtKey, "district"); - GuidingPrice price = guidingPriceService.findByBizKey(avgBase.getCity(), avgBase.getRegion(), + dis = districtService.findOneByKey(districtKey, "district"); + if(dis.getAlias() == null){ + dis.setAlias(Collections.singletonList(avgBase.getSourceCommName())); + }else if(!dis.getAlias().contains(avgBase.getSourceCommName())){ + dis.getAlias().add(avgBase.getSourceCommName()); + } + if(dis.getMappingAlias() == null){ + dis.setMappingAlias(Collections.singletonList(avgBase.getSourceCommName())); + }else if(!dis.getMappingAlias().contains(avgBase.getSourceCommName())){ + dis.getMappingAlias().add(avgBase.getSourceCommName()); + } + districtService.save(dis); + } + if(StringUtils.isNotBlank(avgBase.getSource()) && avgBase.getSource().equalsIgnoreCase("GXD")){ + AverageStatistics averageStatistics = averageStatisticsService.findSecendAverageStatictics(avgBase.getCity(), avgBase.getRegion(), avgBase.getDistrictName(), "district"); + if(averageStatistics != null){ + averageStatistics.setGxdEsfPrice(avgBase.getPrice()); + }else{ + averageStatistics = new AverageStatistics(); + averageStatistics.setGxdEsfPrice(avgBase.getPrice()); + averageStatistics.setCategory("district"); + averageStatistics.setCity(avgBase.getCity()); + averageStatistics.setRegion(avgBase.getRegion()); + averageStatistics.setName(avgBase.getDistrictName()); + if(dis != null){ + averageStatistics.setMasterDistrictName(dis.getDistrictName()); + averageStatistics.setModificationDate(new Date()); + } + } + averageStatisticsService.save(averageStatistics); + } + + if (avgBase.getIsGuidancePrice() == 1) { + if(dis == null){ + DistrictKey districtKey = new DistrictKey(avgBase.getCity(), avgBase.getRegion(), avgBase.getDistrictName()); + dis = districtService.findOneByKey(districtKey, "district"); + } + GuidingPrice price = guidingPriceService.findByBizKey(avgBase.getCity(), RegionData.formatRegion(avgBase.getCity(), avgBase.getRegion()), avgBase.getDistrictName(),avgBase.getCreationDate()); if (price != null) { price.setGuidingPerson(avgBase.getUserName()); price.setGuidingDate(avgBase.getCreationDate()); price.setGuidingValue(avgBase.getPrice()); + price.setModifyDate(new Date()); guidingPriceService.save(price); } else { @@ -414,8 +455,9 @@ public class BaseAvgImportServlet extends HttpServlet { price.setGuidingPerson(avgBase.getUserName()); price.setGuidingDate(avgBase.getCreationDate()); price.setGuidingValue(avgBase.getPrice()); - price.setEstateType(dis.getEstateType2().indexOf("±ðÊû") > -1 ? "±ðÊû" : "ÆÕͨסլ"); + price.setEstateType(dis.getEstateType2().contains("±ðÊû") ? "±ðÊû" : "ÆÕͨסլ"); price.setCat("district"); + price.setModifyDate(new Date()); guidingPriceService.save(price); HttpRequest request = new HttpRequest(); HashMap params = new HashMap(); @@ -430,11 +472,10 @@ public class BaseAvgImportServlet extends HttpServlet { } catch (HttpRequestException e) { e.printStackTrace(); } + }else{ + System.out.println("Ð¡Çø²»´æÔÚ"+ avgBase.getDistrictName()); } } - - if(dis !=null) { - } } avgBases.add(avgBase); diff --git a/projects/fangjia-bkoff/src/main/webapp/averageStatistics/base.ftl b/projects/fangjia-bkoff/src/main/webapp/averageStatistics/base.ftl index 417d20240..dd6935446 100644 --- a/projects/fangjia-bkoff/src/main/webapp/averageStatistics/base.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/averageStatistics/base.ftl @@ -66,6 +66,8 @@ 是å�¦åŠ å…¥æŒ‡å¯¼ä»· 调查时间 调查人 + æ�¥æº� + æ�¥æº�å°�区å�� @@ -94,7 +96,17 @@ <#if it.userName??> ${it.userName} - + + + <#if it.source??> + ${it.source} + + + + <#if it.sourceCommName??> + ${it.sourceCommName} + + diff --git a/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/districtDetail.ftl b/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/districtDetail.ftl index a3cb6949e..b173ee86a 100644 --- a/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/districtDetail.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/districtDetail.ftl @@ -254,6 +254,9 @@ <#if (it.tsfhouseNewPrice)?? || (it.tsfhouseEsfPrice)??> 365房产 + <#if (it.gxdNewPrice)?? || (it.gxdEsfPrice)??> + GXD + @@ -345,7 +348,10 @@ 新房 二手房 - + <#if (it.gxdNewPrice)?? || (it.gxdEsfPrice)??> + 新房 + 二手房 + @@ -430,7 +436,7 @@ <#if (it.ganjiNewPrice)?? || (it.ganjiEsfPrice)??> ${it.ganjiNewPrice!} ${it.ganjiEsfPrice!} - + <#if (it.yungujiaNewPrice)?? || (it.yungujiaEsfPrice)??> ${it.yungujiaNewPrice!} ${it.yungujiaEsfPrice!} @@ -443,6 +449,10 @@ ${it.tsfhouseNewPrice!} ${it.tsfhouseEsfPrice!} + <#if (it.gxdNewPrice)?? || (it.gxdEsfPrice)??> + ${it.gxdNewPrice!} + ${it.gxdEsfPrice!} + diff --git a/projects/fangjia-bkoff/src/main/webapp/data/cityShow.ftl b/projects/fangjia-bkoff/src/main/webapp/data/cityShow.ftl index 701f96360..b46fd9431 100644 --- a/projects/fangjia-bkoff/src/main/webapp/data/cityShow.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/data/cityShow.ftl @@ -76,8 +76,8 @@ å…¥ä½�æ—¶é—´ <#if disDetail.openDate??>${disDetail.openDate * 100}%<#else>未知 - å…¥ä½�率 -   + 别å�� + <#if disDetail.alias??>${disDetail.alias * 100}%<#else>未知 ç»�纬度-mapabc <#if disDetail.latLng??>${disDetail.latLng * 100}%<#else>未知 ç»�纬度-百度 @@ -106,12 +106,12 @@ 物业费 <#if disDetail.estateCharge??>${disDetail.estateCharge * 100}%<#else>未知 - 外景图 - <#if disDetail.outPics??>${disDetail.outPics * 100}%<#else>未知 - - -   -   + 竣工时间 + <#if disDetail.finishBuildingDate??>${disDetail.finishBuildingDate * 100}%<#else>未知 + 建筑年代 + <#if disDetail.buildDate??>${disDetail.buildDate * 100}%<#else>未知 + 主力é�¢ç§¯ + <#if disDetail.mainTypeArea??>${disDetail.mainTypeArea * 100}%<#else>未知 @@ -285,7 +285,7 @@ $(document).ready(function(){ '租金', '户数', 'å…¥ä½�æ—¶é—´', - 'å…¥ä½�率', + '别å��', 'ç»�纬度-mapabc', 'ç»�纬度-百度', 'å� åœ°é�¢ç§¯', @@ -297,8 +297,8 @@ $(document).ready(function(){ '绿化率', 'å�œè½¦ä½�', '物业费', - '房型图', - '外景图' + '竣工时间', + '主力é�¢ç§¯' ], labels: { rotation: -45, @@ -328,14 +328,14 @@ $(document).ready(function(){ <#if disDetail.block??>${disDetail.block * 100}<#else>0, <#if disDetail.address??>${disDetail.address * 100}<#else>0, <#if disDetail.estateType2??>${disDetail.estateType2 * 100}<#else>0, <#if cityInfo.priceCoverage??>${cityInfo.priceCoverage * 100}<#else>0, <#if disDetail.rentPrice??>${disDetail.rentPrice * 100}<#else>0, <#if disDetail.householdCount??>${disDetail.householdCount * 100}<#else>0, - <#if disDetail.openDate??>${disDetail.openDate * 100}<#else>0, 0, + <#if disDetail.openDate??>${disDetail.openDate * 100}<#else>0, <#if disDetail.alias??>${disDetail.alias * 100}<#else>0, <#if disDetail.latLng??>${disDetail.latLng * 100}<#else>0, <#if disDetail.latLng2??>${disDetail.latLng2 * 100}<#else>0, <#if disDetail.allArea??>${disDetail.allArea * 100}<#else>0, <#if disDetail.buildArea??>${disDetail.buildArea * 100}<#else>0, <#if disDetail.buildType??>${disDetail.buildType * 100}<#else>0, <#if disDetail.developer??>${disDetail.developer * 100}<#else>0, <#if disDetail.estateCompany??>${disDetail.estateCompany * 100}<#else>0, <#if disDetail.cubagePercent??>${disDetail.cubagePercent * 100}<#else>0, <#if disDetail.virescencePercent??>${disDetail.virescencePercent * 100}<#else>0, <#if disDetail.carSite??>${disDetail.carSite * 100}<#else>0, - <#if disDetail.estateCharge??>${disDetail.estateCharge * 100}<#else>0, <#if disDetail.floorplanPics??>${disDetail.floorplanPics * 100}<#else>0, - <#if disDetail.outPics??>${disDetail.outPics * 100}<#else>0], + <#if disDetail.estateCharge??>${disDetail.estateCharge * 100}<#else>0, <#if disDetail.finishBuildingDate??>${disDetail.finishBuildingDate * 100}<#else>0, + <#if disDetail.mainTypeArea??>${disDetail.mainTypeArea * 100}<#else>0], dataLabels: { enabled: true, rotation: -90, diff --git a/projects/fangjia-bkoff/src/main/webapp/district/add.ftl b/projects/fangjia-bkoff/src/main/webapp/district/add.ftl index 1691f1e94..1a3f7a7cd 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district/add.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district/add.ftl @@ -257,10 +257,9 @@ checked> å°�高层   checked> 高层   checked> 超高层   - checked> 独栋   - checked> å�Œæ‹¼   - checked> è�”排   - checked> å� åŠ    + checked> SOHO   + checked> LOFT   + checked> 酒店å¼�公寓   @@ -365,7 +364,7 @@ - å°�区性质 + æ�ƒå±žç±»åˆ« @@ -704,6 +703,7 @@ $(document).ready(function(){ success: function(model) { $("#block option").remove(); if (model.blockList.length > 0) { + $("").appendTo($("#block")); $.each(model.blockList, function(i, block){ $("").appendTo($("#block")); }); diff --git a/projects/fangjia-bkoff/src/main/webapp/district/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/district/edit.ftl index 52454f04e..9c9421494 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district/edit.ftl @@ -314,15 +314,15 @@ checked> å� åŠ    checked> è€�å¼�别墅洋房   +
checked > 多层   checked> å°�高层   checked> 高层   checked> 超高层   - checked> 独栋   - checked> å�Œæ‹¼   - checked> è�”排   - checked> å� åŠ    + checked> SOHO + checked> LOFT   + checked> 酒店å¼�公寓  
@@ -590,7 +590,7 @@ <#else> - �区性质 + �属类别 diff --git a/projects/fangjia-bkoff/src/main/webapp/district2/add.ftl b/projects/fangjia-bkoff/src/main/webapp/district2/add.ftl index bef1afb70..1d2094b22 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district2/add.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district2/add.ftl @@ -25,7 +25,7 @@ - + @@ -123,46 +123,52 @@ - - - - - + +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> - - - - - - - - - - - - - + @@ -203,6 +209,19 @@ 层 + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> + +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> - + +<#-- --> +<#-- --> +<#-- --> +<#-- --> + + + + + - - - - - - - - - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- --> - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- --> - - - - - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> - - - - - - - - - - - - - - - - - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> + + + + + + + + + - + + - + - + @@ -368,31 +397,31 @@ - - - - - - - - - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- --> @@ -400,12 +429,12 @@ 个 - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- --> - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- --> @@ -475,67 +504,67 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> diff --git a/projects/fangjia-bkoff/src/main/webapp/district2/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/district2/edit.ftl index 4caf1d803..882fa8ed6 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district2/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district2/edit.ftl @@ -25,7 +25,7 @@
类型*类型* 商铺
二级分类 - 商务区商铺   - 交通设施商铺   - 市场类商铺   - 社区内铺   - ä½�宅底商   - 百货购物中心商铺   - 商业综å�ˆä½“   - -
建筑状�乡镇街� - +
二级分类--> +<#-- 商务区商铺  --> +<#-- 交通设施商铺  --> +<#-- 市场类商铺  --> +<#-- 社区内铺  --> +<#-- ä½�宅底商  --> +<#-- 百货购物中心商铺  --> +<#-- 商业综å�ˆä½“  --> +<#-- --> +<#--
建筑状�--> +<#-- --> +<#--
租售类型--> +<#-- --> +<#--
租�年�--> +<#-- --> +<#--
付款方�--> +<#-- --> +<#--
租售类型 - -
租�年� - -
付款方� - -
�车�数�车�数 个
地上层数 + 层 +
地下层数 + 层 +
�地�积 @@ -251,71 +270,71 @@
是��分割 - -
是�统一管� - -
地�沿线 - -
地�站� - -
装修情况 - -
物业概况 - -
交通情况 - -
周边情况 - -
�套设施 - -
�述 - -
是��分割--> +<#-- --> +<#--
是�统一管�--> +<#-- --> +<#--
地�沿线--> +<#-- --> +<#--
地�站�--> +<#-- --> +<#--
装修情况--> +<#-- --> +<#--
物业概况--> +<#-- --> +<#--
交通情况--> +<#-- --> +<#--
周边情况--> +<#-- --> +<#--
�套设施--> +<#-- --> +<#--
�述--> +<#-- --> +<#--
��业� @@ -323,11 +342,17 @@
项目特色得房率 - +
项目特色--> +<#-- --> +<#--
diff --git a/projects/fangjia-bkoff/src/main/webapp/district2/addOffice.ftl b/projects/fangjia-bkoff/src/main/webapp/district2/addOffice.ftl index 207cd11ae..6e6b47bc5 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district2/addOffice.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district2/addOffice.ftl @@ -156,36 +156,43 @@
乡镇街� + +
环线�置
智能水平 - -
预售许�� - -
特色项目 - -
智能水平--> +<#-- --> +<#--
预售许��--> +<#-- --> +<#--
特色项目--> +<#-- --> +<#--
总楼层 @@ -194,19 +201,19 @@
会议室 - -
会议室--> +<#-- --> +<#--
入�时间 - -
入�时间--> +<#-- --> +<#--
是��分割 @@ -223,49 +230,49 @@
交房标准 - -
楼内�套 - -
交房标准--> +<#-- --> +<#--
楼内�套--> +<#-- --> +<#--
设计�� - -
施工�� - -
租售类型 - -
租�年� - -
付款方� - -
设计��--> +<#-- --> +<#--
施工��--> +<#-- --> +<#--
租售类型--> +<#-- --> +<#--
租�年�--> +<#-- --> +<#--
付款方�--> +<#-- --> +<#--
物 业 费 @@ -297,6 +304,19 @@
地上层数 + 层 +
地下层数 + 层 +
车�月租金 @@ -346,18 +366,27 @@ 米
是å�¦æ¶‰å¤– - - +   + +        +   + +
是å�¦å�¯æ³¨å†Œ - - +   + +        +   + +
�车时间 - -
空调 - -
空调开放时间 - -
�车时间--> +<#-- --> +<#--
空调--> +<#-- --> +<#--
空调开放时间--> +<#-- --> +<#--
空调加时 - -
空调加时--> +<#-- --> +<#--
电梯数�
电梯�牌 - -
电梯�牌--> +<#-- --> +<#--
客梯数 @@ -419,12 +448,12 @@
装修情况 - -
装修情况--> +<#-- --> +<#--
安防系统 - -
网络通讯 - -
地�沿线 - -
装修标准 - -
地�站� - -
周边�套 - -
�套设施 - -
交通概况 - -
物业概况 - -
安防系统--> +<#-- --> +<#--
网络通讯--> +<#-- --> +<#--
地�沿线--> +<#-- --> +<#--
装修标准--> +<#-- --> +<#--
地�站�--> +<#-- --> +<#--
周边�套--> +<#-- --> +<#--
�套设施--> +<#-- --> +<#--
交通概况--> +<#-- --> +<#--
物业概况--> +<#-- --> +<#--
- - - - + + - + +<#-- --> +<#-- --> +<#-- --> +<#-- -->
+ <#if markMap?? && markMap["cat"]?? && markMap["cat"] == 1> <#else> @@ -232,55 +232,67 @@
<#if markMap?? && markMap["shop_estate_type2"]?? && markMap["shop_estate_type2"] == 1> - - <#else> - - 二级分类 - <#assign x1 = 0> - <#assign x2 = 0> - <#assign x3 = 0> - <#assign x4 = 0> - <#assign x5 = 0> - <#assign x6 = 0> - <#assign x7 = 0> - <#if district?? && district.shopEstateType2??> - <#list district.shopEstateType2 as l> - <#if l == "商务区商铺"> - <#assign x1 = 1> - - <#if l == "交通设施商铺"> - <#assign x2 = 1> - - <#if l == "市场类商铺"> - <#assign x3 = 1> - - <#if l == "社区内铺"> - <#assign x4 = 1> - - <#if l == "ä½�宅底商"> - <#assign x5 = 1> - - <#if l == "百货购物中心商铺"> - <#assign x6 = 1> - - <#if l == "商业综å�ˆä½“"> - <#assign x7 = 1> - - - - checked="checked"/>商务区商铺   - checked="checked"/>交通设施商铺   - checked="checked"/>市场类商铺   - checked="checked"/>社区内铺   - checked="checked"/>ä½�宅底商   - checked="checked"/>百货购物中心商铺   - checked="checked"/>商业综å�ˆä½“   - +
+ <#if markMap?? && markMap["township"]?? && markMap["township"]?is_number && markMap["township"] == 1> + + <#else> + + + 乡镇街� +
<#if markMap?? && markMap["shop_estate_type2"]?? && markMap["shop_estate_type2"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- 二级分类--> +<#-- <#assign x1 = 0>--> +<#-- <#assign x2 = 0>--> +<#-- <#assign x3 = 0>--> +<#-- <#assign x4 = 0>--> +<#-- <#assign x5 = 0>--> +<#-- <#assign x6 = 0>--> +<#-- <#assign x7 = 0>--> +<#-- <#if district?? && district.shopEstateType2??>--> +<#-- <#list district.shopEstateType2 as l>--> +<#-- <#if l == "商务区商铺">--> +<#-- <#assign x1 = 1>--> +<#-- --> +<#-- <#if l == "交通设施商铺">--> +<#-- <#assign x2 = 1>--> +<#-- --> +<#-- <#if l == "市场类商铺">--> +<#-- <#assign x3 = 1>--> +<#-- --> +<#-- <#if l == "社区内铺">--> +<#-- <#assign x4 = 1>--> +<#-- --> +<#-- <#if l == "ä½�宅底商">--> +<#-- <#assign x5 = 1>--> +<#-- --> +<#-- <#if l == "百货购物中心商铺">--> +<#-- <#assign x6 = 1>--> +<#-- --> +<#-- <#if l == "商业综å�ˆä½“">--> +<#-- <#assign x7 = 1>--> +<#-- --> +<#-- --> +<#-- --> +<#-- checked="checked"/>商务区商铺  --> +<#-- checked="checked"/>交通设施商铺  --> +<#-- checked="checked"/>市场类商铺  --> +<#-- checked="checked"/>社区内铺  --> +<#-- checked="checked"/>ä½�宅底商  --> +<#-- checked="checked"/>百货购物中心商铺  --> +<#-- checked="checked"/>商业综å�ˆä½“  --> +<#-- --> +<#--
@@ -292,56 +304,56 @@
+<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> - - - - - - - - - - - - - - - - - + + + + + + + + - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- --> - - - - - - - - - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> + <#if markMap?? && markMap["business_status"]?? && markMap["business_status"] == 1> + + <#else> + + + ��业� + + + + +
--> +<#-- <#if markMap?? && markMap["property_status"]?? && markMap["property_status"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 建筑状�--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["rent_type"]?? && markMap["rent_type"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 租售类型--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["lease_term"]?? && markMap["lease_term"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 租�年�--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["payment_pattern"]?? && markMap["payment_pattern"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 付款方�--> +<#-- --> +<#--
- <#if markMap?? && markMap["property_status"]?? && markMap["property_status"] == 1> - - <#else> - - - 建筑状� - -
- <#if markMap?? && markMap["rent_type"]?? && markMap["rent_type"] == 1> - - <#else> - - - 租售类型 - -
- <#if markMap?? && markMap["lease_term"]?? && markMap["lease_term"] == 1> - - <#else> - - - 租�年� - -
- <#if markMap?? && markMap["payment_pattern"]?? && markMap["payment_pattern"] == 1> - - <#else> - - - 付款方� - -
+ <#if markMap?? && markMap["car_site_count"]?? && markMap["car_site_count"] == 1> <#else> @@ -421,6 +433,30 @@
+ <#if markMap?? && markMap["land_floor"]?? && markMap["land_floor"] == 1> + + <#else> + + + 地上楼层 + 层 +
+ <#if markMap?? && markMap["underground_floor"]?? && markMap["underground_floor"] == 1> + + <#else> + + + 地下楼层 + 层 +
<#if markMap?? && markMap["all_area"]?? && markMap["all_area"] == 1> @@ -482,18 +518,18 @@
- <#if markMap?? && markMap["live_date"]?? && markMap["live_date"] == 1> - - <#else> - - - 开业时间 - -
--> +<#-- <#if markMap?? && markMap["live_date"]?? && markMap["live_date"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 开业时间--> +<#-- --> +<#--
<#if markMap?? && markMap["finish_building_date"]?? && markMap["finish_building_date"] == 1> @@ -541,63 +577,88 @@
- <#if markMap?? && markMap["sideset"]?? && markMap["sideset"] == 1> - - <#else> - - - 是��分割 - -
- <#if markMap?? && markMap["unified_manage"]?? && markMap["unified_manage"] == 1> - - <#else> - - - 是�统一管� - - -
- <#if markMap?? && markMap["metro_info"]?? && markMap["metro_info"] == 1> - - <#else> - - - 地�沿线 - -
--> +<#-- <#if markMap?? && markMap["sideset"]?? && markMap["sideset"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 是��分割--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["unified_manage"]?? && markMap["unified_manage"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 是�统一管�--> +<#-- --> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["metro_info"]?? && markMap["metro_info"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 地�沿线--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["metro_names"]?? && markMap["metro_names"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 地�站�--> +<#-- --> +<#--
- <#if markMap?? && markMap["metro_names"]?? && markMap["metro_names"] == 1> - - <#else> - - - 地�站� - + +
+ <#if markMap?? && markMap["real_use_percent"]?? && markMap["real_use_percent"] == 1> + + <#else> + + + 得房率 +
@@ -609,125 +670,114 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- <#if markMap?? && markMap["fitment"]?? && markMap["fitment"] == 1> - - <#else> - - - 装修情况 - -
- <#if markMap?? && markMap["build_structure"]?? && markMap["build_structure"] == 1> - - <#else> - - - 建筑结构 - -
- <#if markMap?? && markMap["property_info"]?? && markMap["property_info"] == 1> - - <#else> - - - 物业概况 - -
- <#if markMap?? && markMap["traffic"]?? && markMap["traffic"] == 1> - - <#else> - - - 交通概况 - -
- <#if markMap?? && markMap["surrounding"]?? && markMap["surrounding"] == 1> - - <#else> - - - 周边情况 - -
- <#if markMap?? && markMap["facilities"]?? && markMap["facilities"] == 1> - - <#else> - - - �套设施 - -
- <#if markMap?? && markMap["description"]?? && markMap["description"] == 1> - - <#else> - - - �述 - -
- <#if markMap?? && markMap["business_status"]?? && markMap["business_status"] == 1> - - <#else> - - - ��业� - -
- <#if markMap?? && markMap["characteristic"]?? && markMap["characteristic"] == 1> - - <#else> - - - 项目特色 - -
+<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> + +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["fitment"]?? && markMap["fitment"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 装修情况--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["build_structure"]?? && markMap["build_structure"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 建筑结构--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["property_info"]?? && markMap["property_info"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 物业概况--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["traffic"]?? && markMap["traffic"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 交通概况--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["surrounding"]?? && markMap["surrounding"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 周边情况--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["facilities"]?? && markMap["facilities"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- �套设施--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["description"]?? && markMap["description"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- �述--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["characteristic"]?? && markMap["characteristic"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 项目特色--> +<#-- --> +<#--
--> - - - - -
- -
+<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#--
--> +<#-- --> +<#--
--> diff --git a/projects/fangjia-bkoff/src/main/webapp/district2/editOffice.ftl b/projects/fangjia-bkoff/src/main/webapp/district2/editOffice.ftl index 8dd9ca8ee..bfb1302a3 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district2/editOffice.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district2/editOffice.ftl @@ -258,6 +258,19 @@ + + + <#if markMap?? && markMap["township"]?? && markMap["township"]?is_number && markMap["township"] == 1> + + <#else> + + + 乡镇街� + + + + + <#if markMap?? && markMap["loop_line_info"]?? && markMap["loop_line_info"] == 1> @@ -281,48 +294,48 @@ - - - - - - - - - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- --> - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- --> - - - - - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> - - - - - - - - - - - - - - - - - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> + + + + + + + + + + @@ -673,77 +716,81 @@ 是��注册 - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- --> - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- --> - - - - - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- --> - - - - +<#-- --> +<#-- --> +<#-- --> +<#-- -->
- <#if markMap?? && markMap["intelligence_level"]?? && markMap["intelligence_level"] == 1> - - <#else> - - - 智能水平 - -
- <#if markMap?? && markMap["licence"]?? && markMap["licence"] == 1> - - <#else> - - - 预售许�� - -
- <#if markMap?? && markMap["characteristic"]?? && markMap["characteristic"] == 1> - - <#else> - - - 特色项目 - -
--> +<#-- <#if markMap?? && markMap["intelligence_level"]?? && markMap["intelligence_level"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 智能水平--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["licence"]?? && markMap["licence"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 预售许��--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["characteristic"]?? && markMap["characteristic"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 特色项目--> +<#-- --> +<#--
<#if markMap?? && markMap["total_floor"]?? && markMap["total_floor"] == 1> @@ -336,31 +349,31 @@
- <#if markMap?? && markMap["meeting_room"]?? && markMap["meeting_room"] == 1> - - <#else> - - - 会议室 - -
--> +<#-- <#if markMap?? && markMap["meeting_room"]?? && markMap["meeting_room"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 会议室--> +<#-- --> +<#--
- <#if markMap?? && markMap["live_date"]?? && markMap["live_date"] == 1> - - <#else> - - - 入�时间 - -
--> +<#-- <#if markMap?? && markMap["live_date"]?? && markMap["live_date"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 入�时间--> +<#-- --> +<#--
<#if markMap?? && markMap["divisible"]?? && markMap["divisible"] == 1> @@ -389,91 +402,91 @@
- <#if markMap?? && markMap["delivery_level"]?? && markMap["delivery_level"] == 1> - - <#else> - - - 交房标准 - -
- <#if markMap?? && markMap["build_facilities"]?? && markMap["build_facilities"] == 1> - - <#else> - - - 楼内�套 - -
--> +<#-- <#if markMap?? && markMap["delivery_level"]?? && markMap["delivery_level"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 交房标准--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["build_facilities"]?? && markMap["build_facilities"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 楼内�套--> +<#-- --> +<#--
- <#if markMap?? && markMap["build_designer"]?? && markMap["build_designer"] == 1> - - <#else> - - - 设计�� - -
- <#if markMap?? && markMap["cons_company"]?? && markMap["cons_company"] == 1> - - <#else> - - - 施工�� - -
- <#if markMap?? && markMap["rent_type"]?? && markMap["rent_type"] == 1> - - <#else> - - - 租售类型 - -
- <#if markMap?? && markMap["lease_term"]?? && markMap["lease_term"] == 1> - - <#else> - - - 租�年� - -
- <#if markMap?? && markMap["payment_pattern"]?? && markMap["payment_pattern"] == 1> - - <#else> - - - 付款方� - -
--> +<#-- <#if markMap?? && markMap["build_designer"]?? && markMap["build_designer"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 设计��--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["cons_company"]?? && markMap["cons_company"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 施工��--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["rent_type"]?? && markMap["rent_type"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 租售类型--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["lease_term"]?? && markMap["lease_term"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 租�年�--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["payment_pattern"]?? && markMap["payment_pattern"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 付款方�--> +<#-- --> +<#--
<#if markMap?? && markMap["estate_charge"]?? && markMap["estate_charge"] == 1> @@ -536,6 +549,32 @@ 个
+ <#if markMap?? && markMap["land_floor"]?? && markMap["land_floor"] == 1> + + <#else> + + + 地上楼层 + 层 +
+ <#if markMap?? && markMap["underground_floor"]?? && markMap["underground_floor"] == 1> + + <#else> + + + 地下楼层 + 层 +
<#if markMap?? && markMap["parking_fee"]?? && markMap["parking_fee"] == 1> @@ -661,7 +700,11 @@ 是å�¦æ¶‰å¤– - +   + checked /> +        +   + checked/>
- +   + checked /> +        +   + checked/>
- <#if markMap?? && markMap["is_work_bus"]?? && markMap["is_work_bus"] == 1> - - <#else> - - - 是�有�车 - -
--> +<#-- <#if markMap?? && markMap["is_work_bus"]?? && markMap["is_work_bus"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 是�有�车--> +<#-- --> +<#--
- <#if markMap?? && markMap["work_bus_time"]?? && markMap["work_bus_time"] == 1> - - <#else> - - - �车时间 - -
--> +<#-- <#if markMap?? && markMap["work_bus_time"]?? && markMap["work_bus_time"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- �车时间--> +<#-- --> +<#--
- <#if markMap?? && markMap["lighting_ventilation"]?? && markMap["lighting_ventilation"] == 1> - - <#else> - - - 空调 - -
- <#if markMap?? && markMap["conditioner_time"]?? && markMap["conditioner_time"] == 1> - - <#else> - - - 空调开放时间 - -
--> +<#-- <#if markMap?? && markMap["lighting_ventilation"]?? && markMap["lighting_ventilation"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 空调--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["conditioner_time"]?? && markMap["conditioner_time"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 空调开放时间--> +<#-- --> +<#--
- <#if markMap?? && markMap["conditioner_timelag"]?? && markMap["conditioner_timelag"] == 1> - - <#else> - - - 空调加时 - -
--> +<#-- <#if markMap?? && markMap["conditioner_timelag"]?? && markMap["conditioner_timelag"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 空调加时--> +<#-- --> +<#--
@@ -757,18 +804,18 @@ 个
- <#if markMap?? && markMap["elevator_brand"]?? && markMap["elevator_brand"] == 1> - - <#else> - - - 电梯�牌 - -
--> +<#-- <#if markMap?? && markMap["elevator_brand"]?? && markMap["elevator_brand"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 电梯�牌--> +<#-- --> +<#--
<#if markMap?? && markMap["person_elevators_count"]?? && markMap["person_elevators_count"] == 1> @@ -804,18 +851,18 @@
- - - - +<#-- --> +<#-- --> +<#-- --> +<#-- -->
- <#if markMap?? && markMap["fitment"]?? && markMap["fitment"] == 1> - - <#else> - - - 装修情况 - -
--> +<#-- <#if markMap?? && markMap["fitment"]?? && markMap["fitment"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 装修情况--> +<#-- --> +<#--
<#if markMap?? && markMap["open_date"]?? && markMap["open_date"] == 1> @@ -922,140 +969,140 @@
- - - - - - - - - - - -
- <#if markMap?? && markMap["safeSystem"]?? && markMap["safeSystem"] == 1> - - <#else> - - - 安防系统 - -
- <#if markMap?? && markMap["network_way"]?? && markMap["network_way"] == 1> - - <#else> - - - 网络通讯 - -
+<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["safeSystem"]?? && markMap["safeSystem"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 安防系统--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["network_way"]?? && markMap["network_way"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 网络通讯--> +<#-- --> +<#--
--> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#--
--> +<#-- --> +<#--
--> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["metro_info"]?? && markMap["metro_info"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 地�沿线--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["fitment_level"]?? && markMap["fitment_level"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 装修标准--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["metro_names"]?? && markMap["metro_names"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 地�站�--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["surrounding"]?? && markMap["surrounding"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 周边�套--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["facilities"]?? && markMap["facilities"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- �套设施--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["traffic"]?? && markMap["traffic"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 交通概况--> +<#-- --> +<#--
--> +<#-- <#if markMap?? && markMap["property_info"]?? && markMap["property_info"] == 1>--> +<#-- --> +<#-- <#else>--> +<#-- --> +<#-- --> +<#-- 物业概况--> +<#-- --> +<#--
--> - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- <#if markMap?? && markMap["metro_info"]?? && markMap["metro_info"] == 1> - - <#else> - - - 地�沿线 - -
- <#if markMap?? && markMap["fitment_level"]?? && markMap["fitment_level"] == 1> - - <#else> - - - 装修标准 - -
- <#if markMap?? && markMap["metro_names"]?? && markMap["metro_names"] == 1> - - <#else> - - - 地�站� - -
- <#if markMap?? && markMap["surrounding"]?? && markMap["surrounding"] == 1> - - <#else> - - - 周边�套 - -
- <#if markMap?? && markMap["facilities"]?? && markMap["facilities"] == 1> - - <#else> - - - �套设施 - -
- <#if markMap?? && markMap["traffic"]?? && markMap["traffic"] == 1> - - <#else> - - - 交通概况 - -
- <#if markMap?? && markMap["property_info"]?? && markMap["property_info"] == 1> - - <#else> - - - 物业概况 - -
- - - - - -
- -
+<#-- --> +<#-- --> +<#-- --> +<#-- --> +<#--
--> +<#-- --> +<#--
--> diff --git a/projects/fangjia-bkoff/src/main/webapp/evaluationAudit/list.ftl b/projects/fangjia-bkoff/src/main/webapp/evaluationAudit/list.ftl index efec6b2ea..826290bd0 100644 --- a/projects/fangjia-bkoff/src/main/webapp/evaluationAudit/list.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/evaluationAudit/list.ftl @@ -316,11 +316,11 @@ var price = new Number(val)*10000 var charge = 0; if(price > 0 && price <= 1000000){ - charge = 40; + charge = 20; }else if(price > 1000000 && price <= 3000000){ - charge = 160; + charge = 70; }else if(price > 3000000){ - charge = 360 + charge = 80; } if(price != 0){ $(id).html(charge+'å…ƒ'); diff --git a/projects/fangjia-bkoff/src/main/webapp/seawater/houseList.ftl b/projects/fangjia-bkoff/src/main/webapp/seawater/houseList.ftl index 38771bc5d..6955b465c 100644 --- a/projects/fangjia-bkoff/src/main/webapp/seawater/houseList.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/seawater/houseList.ftl @@ -158,6 +158,13 @@ æ�¿å�— 装修 æœ�å�‘ + 梯 + 户 + 户型结构 + 交易æ�ƒå±ž + 房æ�ƒæ‰€å±ž +<#-- 房屋年é™�--> + é…�备电梯 物业类型 æ�¥æº� 状æ€� @@ -200,6 +207,13 @@ ${it.block!} ${it.fitment!} ${it.direction!} + ${it.lift!} + ${it.liftHousehold!} + ${it.roomStructure!} + ${it.tradeProperty!} + ${it.propertyOwnership!} +<#-- ${it.housingAge!}--> + ${it.elevator!} ${it.estateType!} <#if it.url??> diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/Constants.java b/projects/fangjia-core/src/main/java/com/fangjia/core/Constants.java index 5b64d35c0..7a9f45104 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/Constants.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/Constants.java @@ -8,6 +8,6 @@ public interface Constants { String LOG_MONGO_URI = "mongodb://192.168.0.42:52002"; String SEABIRD_MONGO_URI = "mongodb://192.168.0.74:57007"; String SEAWATER_MONGO_URI = "mongodb://192.168.0.206:27020"; - String MSVC_FANG_JIA_DATA_SERVICE_BASE_PATH ="http://192.168.0.19:38080/FangJiaDataService"; + String MSVC_FANG_JIA_DATA_SERVICE_BASE_PATH ="http://192.168.0.100:38080/FangJiaDataService"; } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/CompanyController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/CompanyController.java index 8ee67198f..69eff3bbd 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/CompanyController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/CompanyController.java @@ -35,4 +35,11 @@ public class CompanyController { public Object agreeMentAction(FangjiaModel model) { return model; } + + /** + * ¿Í»§ + */ + public Object cstmAction(FangjiaModel model){ + return model; + } } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/DistrictController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/DistrictController.java index b82a39c7c..23728998e 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/DistrictController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/DistrictController.java @@ -1,5 +1,6 @@ package com.fangjia.coresite.controllers; +import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -18,6 +19,8 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import com.fangjia.core.util.*; +import com.fangjia.dal.QueryParam; +import com.fangjia.service.datastore.*; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; @@ -69,12 +72,6 @@ import com.fangjia.service.bo.HouseBo; import com.fangjia.service.bo.NewsBo; import com.fangjia.service.bo.RentHouseBo; import com.fangjia.service.common.CookieName; -import com.fangjia.service.datastore.DistrictService; -import com.fangjia.service.datastore.HouseService; -import com.fangjia.service.datastore.MicroBlogService; -import com.fangjia.service.datastore.PicService; -import com.fangjia.service.datastore.RegionStatService; -import com.fangjia.service.datastore.RentHouseService; import com.fangjia.service.datastore.bean.DistrictQueryBean; import com.fangjia.service.datastore.bean.HousePriceQueryBean; import com.fangjia.service.datastore.bean.HouseQueryBean; @@ -405,6 +402,19 @@ public class DistrictController { feedFooter(model); return model;*/ } + public Object hidelistAction(HttpServletRequest request,DistrictModel model) throws Exception { + if(StringUtils.isNotBlank(model.getCityName())){ + List params = new ArrayList(); + params.add(new QueryParam("visible", 0)); + params.add(new QueryParam("city", model.getCityName())); + params.add(new QueryParam("category", "district")); + List districts = districtService.findAllByParams(params, 0, 0,new String[]{"city", "region", "name"}); + model.setDistricts(districts); + CacheUtils.putValue(CacheUtils.CachePolicyEnum.NEXT_MONTH, this.getClass(), "district-hide-list-crawl-"+model.getCityName(), (Serializable) districts); + } + + return model; + } /** * µ×²¿ÈÈÃÅÍÆ¼ö diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/IndustryController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/IndustryController.java index 8f19695a7..64738f526 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/IndustryController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/IndustryController.java @@ -80,4 +80,20 @@ public class IndustryController { public Object consultingAction(FangjiaModel model) { return model; } + + + /** + * ֤ȯ + * @param model + * @return + */ + public Object bondAction(FangjiaModel model) { + return model; + } + + + /** + * ½ðÈÚÏû·Ñ + */ + public Object costAction(FangjiaModel model){return model;} } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java index eab5dbd3c..52c181ac4 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java @@ -10,14 +10,22 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.logging.Handler; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.fangjia.core.util.DataUtil; -import com.fangjia.core.util.DingDingMessageUtil; -import com.fangjia.core.util.HttpRequest; -import com.fangjia.core.util.HttpRequestException; +import com.fangjia.core.util.*; +import com.fangjia.coresite.FangjiaConfig; +import com.fangjia.coresite.model.FangjiaModel; +import com.fangjia.coresite.model.user.Message; +import com.fangjia.coresite.model.user.SendCodeJsonModel; +import com.fangjia.coresite.model.user.SendCodeModel; +import com.fangjia.coresite.model.user.UserRegJsonModel; +import com.fangjia.service.fangjia.FangJiaUserService; +import com.fangjia.service.sms.SmsException; +import com.fangjia.service.sms.SmsService; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; @@ -43,7 +51,16 @@ public class SaleLeadsController { private SaleLeadsService saleLeadsService; private ServerAreaService serverAreaService; - private NewsResourceService newsResourceService; + private NewsResourceService newsResourceService; + /** + * ¶ÌÐÅService + */ + private SmsService smsService; + + /** + * Óû§Service + */ + private FangJiaUserService fangJiaUserService; private static final CoresiteCookieContext COOKIE_CONTEXT = CoresiteCookieContext .getInstance(); @@ -251,7 +268,180 @@ public class SaleLeadsController { return model; } - private SaleLeads converValue(SaleLeads saleLeads) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, UnsupportedEncodingException { + public Object checkCodeAction(SendCodeModel model, HttpServletRequest req){ + String mobile = StringUtils.trimToNull(model.getMobile()); + String type = StringUtils.trimToNull(model.getType()); + String code = StringUtils.trimToNull(model.getCode()); + String codeToken = StringUtils.trimToNull(model.getCodeToken()); + String imgCode = StringUtils.trimToNull(model.getImgCode()); + UserRegJsonModel result = new UserRegJsonModel(); + if (!checkIsMobile(mobile)) { + result.setResult(Message.RESULT_FAIL); + result.setMsg(Message.MIBILE_FORMAT); + return result; + } + + String cacheCode = getCacheCode(mobile, type); + if (cacheCode == null) { + result.setResult(Message.RESULT_FAIL); + result.setMsg(Message.MOBILE_NOT_SEND_CODE); + return result; + } + + if (!cacheCode.equals(code)) { + result.setResult(Message.RESULT_FAIL); + result.setMsg(Message.CODE_ERROR); + return result; + } + + if (StringUtils.isBlank(mobile) || StringUtils.isBlank(type) || StringUtils.isBlank(codeToken) || StringUtils.isBlank(code) || StringUtils.isBlank(imgCode)) { + result.setResult(Message.RESULT_FAIL); + result.setMsg(Message.PARAM_NOT_NULL); + return result; + } + + String imgCacheCode = getCacheCode(codeToken, Message.SMS_CODE_TYPE_LOGIN); + if(!imgCode.toLowerCase().equals(imgCacheCode)){ + result.setResult(Message.RESULT_FAIL); + result.setMsg(Message.IMG_CODE_ERROR); + return result; + } + return result; + } + + public Object doAdd2Action(SaleLeadsModel model, HttpServletRequest req, + HttpServletResponse res) throws UnsupportedEncodingException, NoSuchMethodException, IllegalAccessException, InvocationTargetException { + + SaleLeads saleLeads = null; + if (saleLeads == null) { + saleLeads = model.getSaleLeads(); + } + + + String refUrl = model.getBackUrl(); + if(StringUtils.isBlank(refUrl)){ + refUrl = req.getScheme() + "//www.fangjia.com"; + } + + // ³ÇÊÐËùÔÚÊ¡ + ServerArea serverArea = serverAreaService.findByDisplay(saleLeads + .getCity()); + if (serverArea != null) { + saleLeads.setProvince(serverArea.getProvince()); + } + // Óû§ + String tempId = COOKIE_CONTEXT.getCookieValue(req, CookieName.UID); + saleLeads.setTempId(tempId); + saleLeads.setUserId(LoginUtil.getUserId(req)); + + //µÚÒ»´Î½øÀ´£¬Ã»µÄÒµÎñÐèÇóʱ£¬ÓÃmidÉèÖÃÒµÎñÐèÇó + if(StringUtils.isBlank(saleLeads.getBusiness())){ + try{ + saleLeads.setBusiness(SalesLeadEnum.getById(model.getMid()) + .getValue()); + }catch (Exception e){ + System.out.println("ÎÞ·¨×ª»»Mid: "+model.getMid()); + } + + } + + saleLeads.setCreateDate(new Date()); + saleLeads.setModifyDate(new Date()); + // ÍøÕ¾À´Ô´ + String source = COOKIE_CONTEXT.getCookieValue(req, + CookieName.SITE_SOURCE); + if (StringUtils.isNotBlank(source)) { + saleLeads.setClueSource(source); + saleLeads.setChannelType(SourceUtils.getSampleBaiduSiteType(source)); + } + + + if(StringUtils.isNotBlank(saleLeads.getBusiness())){ + saleLeads.setBusiness(saleLeads.getBusiness()); + } + + if (saleLeads.getId()!=null) { + saleLeads.setId(null); + } + saleLeads = converValue(saleLeads); + String body = + "ÒµÎñÐèÇó£º" + saleLeads.getBusiness() + "\n\n" + + "ÐÕÃû£º" + saleLeads.getUname() + "\n\n" + + "ÊÖ»ú£º" + saleLeads.getMobile() + "\n\n" + + "×ÉѯÄÚÈÝ£º" + saleLeads.getRemarks()+ "\n\n" ; + body = body.replaceAll("null", "").replaceAll("ÆäËû£¬ÇëÌîд", ""); + if (StringUtils.isNotBlank(refUrl) && refUrl.contains("bd_vid")) { + body += "ÏßË÷À´Ô´£º°Ù¶È"; + } else if (StringUtils.isNotBlank(refUrl) && refUrl.contains("didata.wechat")) { + body += "ÏßË÷À´Ô´: µØÊý¹«ÖÚºÅ"; + } else { + body += "ÏßË÷À´Ô´£º·¿¼ÛÍø"; + } + System.out.println(body); + try { + JSONObject requestBody = new JSONObject(); + requestBody.put("msgtype", "text"); + JSONObject markdown = new JSONObject(); + markdown.put("title", "ÏúÊÛÏßË÷"); + markdown.put("content", body); + requestBody.put("text", markdown); + HttpRequest request = new HttpRequest(); + final String ding_url = "https://oapi.dingtalk.com/robot/send?access_token=894650a12af9497bed599df1d5f93b21d6da5bbae45f35f18c5825580ebbdf64"; + Map headers = new HashMap(); + headers.put("Content-Type", "application/json; charset=utf-8"); + request.postWithBody(ding_url, requestBody, headers, "UTF-8"); + } catch (Exception e) { + e.printStackTrace(); + } + saleLeadsService.save(saleLeads); + + // ¶ÔÓÚ°Ù¶È¹ã¸æ¹ýÀ´µÄÐÅÏ¢£¬½øÐлش« + try { + if (StringUtils.isNotBlank(refUrl) && refUrl.contains("bd_vid")) { + HttpRequest httpRequest = new HttpRequest(); + final String baiduUrl = "https://ocpc.baidu.com/ocpcapi/api/uploadConvertData"; + Map bdHeaders = new HashMap(); + bdHeaders.put("Content-Type", "application/json; charset=utf-8"); + + JSONObject requestBody = new JSONObject(); + // https://fengchao.baidu.com/fc/toolscenter/optimize/track/user/27002539 + requestBody.put("token", "EZGISwlOClRMEZErT2ThZTEjpLAzs2wE@9POwrGLqpRtQeGhvvCug1N3OK1tq3skk"); + JSONArray jsonArray = new JSONArray(); + JSONObject contentJson = new JSONObject(); + contentJson.put("logidUrl", refUrl); + contentJson.put("newType", "3"); + jsonArray.add(contentJson); + requestBody.put("conversionTypes", jsonArray); + String result1 = httpRequest.postWithBody(baiduUrl, requestBody, bdHeaders, "UTF-8"); + LOG.info("°Ù¶È»Ø´«³É¹¦:" + result1); + } + } catch (HttpRequestException e) { + e.printStackTrace(); + } + + + //String refUrl = req.getHeader("referer"); + String url = ""; + + if(StringUtils.isNotBlank(refUrl) && refUrl.contains("/resource/info")){ + url = refUrl.substring(refUrl.indexOf("/resource/info"), refUrl.length()); + } else if (StringUtils.isNotBlank(refUrl) && refUrl.contains("didata.wechat")) { // µØÊý¹«ÖÚºÅÌø×ª + url = "/enquire/didataSuccess"; + if (StringUtils.isNotBlank(refUrl)) { + url = url + "?backUrl=" + URLEncoder.encode(refUrl); + } + } else{ + url = "/enquire/success"; + if (StringUtils.isNotBlank(refUrl)) { + url = url + "?backUrl=" + URLEncoder.encode(refUrl); + } + } + model.setViewType("redirect"); + model.setViewParam("location", url); + return model; + + } + private SaleLeads converValue(SaleLeads saleLeads) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, UnsupportedEncodingException { // Field[] fields = saleLeads.getClass().getDeclaredFields(); for(Field s : fields){ @@ -301,6 +491,86 @@ public class SaleLeadsController { return ret; } + public Object sendCodeAction(SendCodeModel model, SendCodeJsonModel resultModel, HttpServletRequest request) { + String mobile = StringUtils.trimToNull(model.getMobile()); + String type = StringUtils.trimToNull(model.getType()); + String codeToken = StringUtils.trimToNull(model.getCodeToken()); + + Long sendCodeTime = (Long) CacheUtils.getValue(FangJiaUserService.class, mobile); + + if(sendCodeTime != null) { + Long curTime = new Date().getTime(); + long second = (curTime - sendCodeTime)/1000; + if(second < 60 ){ + resultModel.setResult(Message.RESULT_FAIL); + resultModel.setMsg(Message.SMS_CODE_SEND_FAIL_TIME); + return resultModel; + } + } + + String code = fangJiaUserService.randomCode(); + try { + String ip = AnalyticsUtil.getIpAddress(request); + Long ipVisitCount = (Long) CacheUtils.getValue(FangJiaUserService.class, ip); + if(ipVisitCount != null && ipVisitCount > 3){ + resultModel.setResult(Message.RESULT_FAIL); + resultModel.setMsg("¸ÃIP¶ÌÐÅ·¢ËÍÆµ·±"); + return resultModel; + } + if(ipVisitCount == null){ + ipVisitCount = (long) 0; + } + + CacheUtils.putValue(CacheUtils.CachePolicyEnum.TODAY, FangJiaUserService.class, ip, ipVisitCount+1); + System.out.println(mobile + " ÑéÖ¤Âë ¡¾"+ code+"¡¿"); + //²âÊÔÏÈÈ¥µô·¢¶ÌÐÅ + smsService.send(model.getMobile(), "¡¾·¿¼ÛÍø¡¿ÄãµÄÑéÖ¤ÂëÊÇ" + code + ",ÑéÖ¤Âë5·ÖÖÓÄÚÓÐЧ£¬ÇëÁ¢¼´ÑéÖ¤¡£"); + if(FangjiaConfig.getConfig().isTestEnvironment()){ + DingDingMessageUtil.sendTextMessage("¡¾·¿¼ÛÍø¡¿ÄãµÄÑéÖ¤ÂëÊÇ" + code + ",ÑéÖ¤Âë5·ÖÖÓÄÚÓÐЧ£¬ÇëÁ¢¼´ÑéÖ¤¡£"); + } + resultModel.setResult(Message.RESULT_SUCCESS); + CacheUtils.putValue(CacheUtils.CachePolicyEnum.TINY, FangJiaUserService.class, mobile + "_" + type, code); + CacheUtils.putValue(CacheUtils.CachePolicyEnum.TINY, FangJiaUserService.class, mobile, new Date().getTime()); + + } catch (Exception e) { + resultModel.setResult(Message.RESULT_FAIL); + resultModel.setMsg(Message.SMS_CODE_SEND_FAIL); + } + + return resultModel; + } + + private boolean checkIsMobile(String mobile) { + Pattern p = Pattern.compile("^1\\d{10}$"); + Matcher m = p.matcher(mobile); + return m.matches(); + } + + /** + * »ñÈ¡»º´æµÄÑéÖ¤Âë + * @author yinjihuan + * @param mobile ÊÖ»ú + * @param type ÀàÐÍ + * @return + */ + private String getCacheCode(String mobile, String type) { + String cacheCode = (String) CacheUtils.getValue(FangJiaUserService.class, mobile + "_" + type); + return cacheCode; + } + + + + + /** + * Êý¾ÝÄÜÁ¦ + * @param model + * @return + * @throws Exception + */ + public Object dataAbilityAction(FangjiaModel model) { + return model; + } + public Object resultAction(SaleLeadsModel model) { return model; } @@ -332,7 +602,16 @@ public class SaleLeadsController { public void setNewsResourceService(NewsResourceService newsResourceService) { this.newsResourceService = newsResourceService; } - - + public FangJiaUserService getFangJiaUserService() { + return fangJiaUserService; + } + + public void setFangJiaUserService(FangJiaUserService fangJiaUserService) { + this.fangJiaUserService = fangJiaUserService; + } + + public void setSmsService(SmsService smsService) { + this.smsService = smsService; + } } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SolutionController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SolutionController.java index ccc5285c3..5e5b0435e 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SolutionController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SolutionController.java @@ -107,4 +107,52 @@ public class SolutionController { */ public Object paimaiAction(FangjiaModel model){return model;} + /** + * ²ÆÁ¦ÆÀ¼¶½â¾ö·½°¸ + * @param model + * @return + */ + public Object financialAction(FangjiaModel model){return model;} + + /** + * Ò»·¿Ò»¼Û + * @param model + * @return + */ + public Object onehouseAction(FangjiaModel model){return model;} + + + /** + * Â¥ÅÌÆÀ¼¶ + * @param model + * @return + */ + public Object levelAction(FangjiaModel model){return model;} + + /** + * µØÖ·ÖÎÀí + * @param model + * @return + */ + public Object addrProAction(FangjiaModel model){return model;} + + /** + * Íøµã²¼¾Ö + */ + public Object outletsAction(FangjiaModel model){return model;} + + /** + * ÐÅÓÿ¨ + * @param model + * @return + */ + public Object cardAction(FangjiaModel model){return model;} + + /** + * µØÊý + * @param model + * @return + */ + public Object dishuAction(FangjiaModel model){return model;} + } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TrendController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TrendController.java index cccf755b8..76020e4b8 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TrendController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TrendController.java @@ -13,6 +13,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; +import com.fangjia.coresite.model.*; import net.sf.json.JSONObject; import org.apache.commons.collections.CollectionUtils; @@ -30,10 +31,6 @@ import com.fangjia.core.util.SecurityUtil; import com.fangjia.core.util.CacheUtils.CachePolicyEnum; import com.fangjia.core.util.DateUtil; import com.fangjia.coresite.FangjiaRudder; -import com.fangjia.coresite.model.HighchartsModel; -import com.fangjia.coresite.model.JsonModel; -import com.fangjia.coresite.model.RestfulModelAndView; -import com.fangjia.coresite.model.TrendModel; import com.fangjia.dal.FacetQueryResult; import com.fangjia.dal.SortParam; import com.fangjia.dal.common.DistrictKey; @@ -1157,6 +1154,8 @@ public class TrendController { } } + + public final String getSimpleDomain(HttpServletRequest request, TrendModel model) { return StringUtils.substringBetween(request.getRequestURL().toString(), "http://", "." + model.getDomain()); } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/DistrictModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/DistrictModel.java index e3315c836..5ac69e8ef 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/DistrictModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/DistrictModel.java @@ -138,6 +138,7 @@ public class DistrictModel extends BaseModel { private int picOrder; private String bigPicUrl; private int allPicCount; + private List districts; public boolean isHousePriceInfo() { return housePriceInfo; @@ -779,4 +780,11 @@ public class DistrictModel extends BaseModel { this.districtStatBo = districtStatBo; } + public List getDistricts() { + return districts; + } + + public void setDistricts(List districts) { + this.districts = districts; + } } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SaleLeadsModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SaleLeadsModel.java index d9390b8bc..7079c8838 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SaleLeadsModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/SaleLeadsModel.java @@ -18,7 +18,11 @@ public class SaleLeadsModel extends BaseModel{ public String downUrl; public String resourceId; - + + public String codeToken; + + public String code; + public String getMid() { return mid; } @@ -58,7 +62,20 @@ public class SaleLeadsModel extends BaseModel{ public void setResourceId(String resourceId) { this.resourceId = resourceId; } - - + public String getCodeToken() { + return codeToken; + } + + public void setCodeToken(String codeToken) { + this.codeToken = codeToken; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/SendCodeModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/SendCodeModel.java index 7c47a22ff..a2cb83945 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/SendCodeModel.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/user/SendCodeModel.java @@ -21,12 +21,20 @@ public class SendCodeModel extends BaseModel { private String mobile; private String codeToken; private String code; + private String imgCode; public void setCode(String code) { this.code = code; } public String getCode() { return code; } + + public String getImgCode() { + return imgCode; + } + public void setImgCode(String imgCode) { + this.imgCode = imgCode; + } public void setCodeToken(String codeToken) { this.codeToken = codeToken; } diff --git a/projects/fangjia-coresite/src/main/resources/urlrewrite2.0.xml b/projects/fangjia-coresite/src/main/resources/urlrewrite2.0.xml index d96ca92fe..009d4316c 100644 --- a/projects/fangjia-coresite/src/main/resources/urlrewrite2.0.xml +++ b/projects/fangjia-coresite/src/main/resources/urlrewrite2.0.xml @@ -369,5 +369,11 @@ / + + + + /power + + \ 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 8d977c1b1..642cb2483 100644 --- a/projects/fangjia-coresite/src/main/webapp/baidu_analysis.ftl +++ b/projects/fangjia-coresite/src/main/webapp/baidu_analysis.ftl @@ -1,9 +1,18 @@ +<#----> @@ -230,12 +236,12 @@ $(".office03").click(function(){ $(document).ready(function(){ //百度地图API功能 var map = new BMap.Map('officeMap01'); - var poi = new BMap.Point(121.476903,31.235288); + var poi = new BMap.Point(121.461133,31.237838); map.centerAndZoom(poi, 16); map.enableScrollWheelZoom(); var content = '
' + - '地�:上海市黄浦区黄陂北路227�中区广场1207室' + + '地�:上海市�安区江�路212�凯迪克大厦1709' + '
'; //创建检索信�窗�对象 @@ -268,7 +274,7 @@ $(document).ready(function(){ map.enableScrollWheelZoom(); var content = '
' + - '地�:上海市黄浦区黄陂北路227�中区广场1207室' + + '地�:上海市�安区江�路212�凯迪克大厦1709' + '
'; //创建检索信�窗�对象 diff --git a/projects/fangjia-coresite/src/main/webapp/company/cstm.ftl b/projects/fangjia-coresite/src/main/webapp/company/cstm.ftl new file mode 100644 index 000000000..e434f560f --- /dev/null +++ b/projects/fangjia-coresite/src/main/webapp/company/cstm.ftl @@ -0,0 +1,287 @@ + + + + + +客户 - 房价网 fangjia.com + + +<#include "../jsconstants.ftl" /> + + + + + + + + + + + + +<#include "/header/v5/_header.ftl"/> + + + + +
+
+
+

典型客户

+
+
+
+
+
+
+
+
+
+
+ + + + +
+
+
+

�作案例

+
+
+
+
+
+ +
+
+
+
+

地�治�项目

+

+

�国有银行总行

+

+

完�存�地�与楼盘信�治�,对多��数�进行��和优化,建设一套行内自有的楼盘数�标准化平�和数�质�管�平�

+

+

通过处��完整数��去除��数��去除噪音数��处�异常数�,完�房产数�的检验�治��映射关�等工作,集�家所长,将�数�整��一套新的行内标准数�。

+

+

1�楼盘字典

+

2�样本数�库

+

3�行政区划表�片区表

+

4�供应商数�质�监测

+
+ +
+

信用�地��销

+

+

�国有银行总行信用�部

+

+

å­˜é‡�客户消费金é¢�增长    æ²‰å¯‚客户è�¥é”€ä¿ƒæ´»    å­˜é‡�客户æ��é¢�增信

+

+

地数平�批�处�信用�客户的地�信�,自动建立消费潜力评分模型,输出客户进行消费潜力评分。 银行��此评分对客户进行分层,�定高消费潜力客户群体,有针对性地设计相关的�销策略,以���销�果。

+

+

1�信用�地�标准化

+

2�信用�消费金�增长率明显��

+

3�精准促活高消费潜力�眠客户

+

4��低�销�本,���销效果

+
+
+ + +
+
+

押�线上估值与管�

+

+

�国有银行�大分行

+

+

加快零售数字化建设,押�从贷�到贷�全生命周期AI级管�,贷�押�估值线上化,贷�押�价格波动监测�评级。

+

+

地数�托大数�+科学算法+专业模型计算,打造行业领先的AI估值系统,系统�实时在线进行抵押物估值,多渠�海�数���与计算,能得到最接近市场公�价的估值结果。�时,建立了一套�常完善的线上线下结�的押�估值体系,为银行押�数字化管��供AI�务,大大��效能,满足业务与风控的�求。

+

+

1�押�估值数字化转型

+

2�房贷作业�程时效��40%

+

3�有效监控押�市值波动,��风险防范

+

4�大幅�低押�估值�本投入

+
+ +
+

��增信

+

+

�知�互�网银行

+

+

�行对信�产�客户进行��增信,实现差异化销售策略。在授信模型中增加房产估值�评级�房产大数�等维度,以综�判断申贷人的�济实力和消费能力,从而为调整�度�供客观的数�支�。

+

+

针对用户输入的房产地�信�,实时为用户地�对应的房产进行评估�评级和分类,通过用户地�的“物业类型�“价格评级�“周边消费�“周边�套详情�等维度分�,结�银行内部风控,快速预估用户授信等级。�用于客户已有信�产�的��环节,通过了解申请人�动产的综�价值以��于城市中水平,帮助判断审批授信�度。

+

+

1�实现精准��

+

2����转化率明显上�

+
+
+
+ +
+ + +
+ +
+ + + +
+ +
+ + +
+ +
+
+
+ + + +<#include "/header/v5/_footer.ftl"/> + + + + + diff --git a/projects/fangjia-coresite/src/main/webapp/district/hidelist.ftl b/projects/fangjia-coresite/src/main/webapp/district/hidelist.ftl new file mode 100644 index 000000000..9963b48ae --- /dev/null +++ b/projects/fangjia-coresite/src/main/webapp/district/hidelist.ftl @@ -0,0 +1,21 @@ +<#ftl attributes={"content_type":"text/html; charset=UTF-8"}> +<#compress> + + + + <#include "../jsconstants.ftl" /> + + + + + + +
+ <#list districts! as dist> + ${dist.name!} + +
+<#include "/analytics.ftl" /> + + + \ No newline at end of file diff --git a/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl b/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl index 323aeb051..fcda2fdf4 100644 --- a/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl +++ b/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl @@ -12,33 +12,36 @@ 关于我们 公�简介 �系我们 - �作伙伴 - 人�招募 -
  • - 解决方案 - è´·å‰�估值 - 内评缓释 - 房生活 - è�¥é”€è޷客 - 地å�€ç²¾å‡†è�¥é”€ - 地å�€æ ‡å‡†åŒ– + +
  • + 产å“� + 地å�€æ ‡å‡†åŒ– + 地å�€æ•°æ�®æ²»ç�† + 一房一价 + 财力评级 + 楼盘评级 + 地数平å�° + 房价通 + API +
  • - 行业应用 + 解决方案 + 信用å�¡ + 网点布局规划 + 押å“�价值管ç�† + ä½�ç½®è�¥é”€ 银行 - 互è�”网金èž� - 评估机构 - 政府部门 - 大数æ�®è¡Œä¸š - 行业ä¼�业 + 互金 + 政府机构
  • +
  • 快速链接 - 行业动æ€� - æ•°æ�®åˆ†æž� - æˆ�功案例 - å…¬å�¸åЍæ€� + 行业动æ€� + 典型案例 + 咨询研究
  • @@ -96,6 +99,21 @@ + +
     
    + + <#include "contact.ftl"/>
    diff --git a/projects/fangjia-coresite/src/main/webapp/header/v5/_header.ftl b/projects/fangjia-coresite/src/main/webapp/header/v5/_header.ftl index f84257629..a23386fdd 100644 --- a/projects/fangjia-coresite/src/main/webapp/header/v5/_header.ftl +++ b/projects/fangjia-coresite/src/main/webapp/header/v5/_header.ftl @@ -8,58 +8,137 @@ diff --git a/projects/fangjia-coresite/src/main/webapp/index.ftl b/projects/fangjia-coresite/src/main/webapp/index.ftl index efec6e4b6..0856b496a 100644 --- a/projects/fangjia-coresite/src/main/webapp/index.ftl +++ b/projects/fangjia-coresite/src/main/webapp/index.ftl @@ -3,7 +3,8 @@ -专业全�的房产大数��务商 - 房价网 fangjia.com + +全国房价查询,上海房价,房产评估,地��索,房产信�网 - 房价网 fangjia.com <#include "/jsconstants.ftl" /> @@ -17,6 +18,24 @@ @@ -37,144 +46,306 @@ -
    +
    + +
    + +
    +

    +

    地�(�置)信�是银行��的数�资产,银行在业务�程中已完�了相关的数�采集和积累,但地�信�并未�挥其��的作用。 + 估家科技通过人工智能将“地�-建筑物-环境�三者关�的多维度数�进行链接并建立评级模型,结�银行�类场景�供智能化的�务,包括数�资产数字化建设�客户洞察�地��销��置风控�网点规划布局�押�价值全�程管�等,助力银行加速数字化建设,推动高质��展。 +

    +
    +
    +
    + +
    +
    +
    + +
    +
    +

    +

    地�(�置)信�是银行��的数�资产,银行在业务�程中已完�了相关的数�采集和积累,但地�信�并未�挥其��的作用。 + 估家科技通过人工智能将“地�-建筑物-环境�三者关�的多维度数�进行链接并建立评级模型,结�银行�类场景�供智能化的�务,包括数�资产数字化建设�客户洞察�地��销��置风控�网点规划布局�押�价值全�程管�等,助力银行加速数字化建设,推动高质��展。 +

    +
    +
    +
    + + +
    +
    + +
      + +
    • 地å�€æ²»ç�†/地å�€æ ‡å‡†åŒ–
    • +
    • 地å�€è�”想
    • +
    • 行政区划ã€�地ç�†ç¼–ç �映射
    • +
    • 建设房产大数æ�®åº“/楼盘字典
    • +
    • 地å�€æ ‡ç­¾ï¼ˆæ¶‰å†œã€�法æ‹�等)
    • +
    +
    +
    + +
      + +
    • 客户分层-地å�€è´¢åŠ›è¯„çº§
    • +
    • 财富客户筛选
    • +
    • 沉ç�¡å®¢æˆ·ä¿ƒæ´»
    • +
    • 促销策略,æ��å�‡æ¶ˆè´¹é¢�
    • +
    • 辅助授信é¢�度审批
    • +
    +
    +
    + +
      + +
    • 网点/网周综å�ˆæ•°æ�®åˆ†æž�与å�¯è§†åŒ–呈现
    • +
    • 网点è¾�射范围商圈/社区特å¾�分æž�
    • +
    • 网点客户财力评级与财富客户筛选
    • +
    • 网周å�Œä¸šé“¶è¡Œå¸ƒç‚¹åˆ†æž�
    • +
    • 优质客户è�šå®¢ç‚¹åˆ†æž�与网点布局优化策略
    • +
    +
    +
    + +
    +
    + +
      + +
    • 线上获客:
    • + 移动C端查询房产估值ã€�评级æœ�务å‰�ç½®
      +   +
    • è´·å‰�估值:
    • + 线上房产询价/ 智能房产估值系统 法æ‹�ä¿¡æ�¯æŸ¥è¯¢
      +   +
    • 贷中审核:
    • + 建立银行内评系统估值/租金模型
      + �供评估样本�相关房产大数� +
    +
      + +
    • è´·å�Žç®¡ç�†ï¼š
    • + 批é‡�å¤�估押å“�价值
      + 抵押物��处置价值预测 + 押�全视角画�/风险预警
      +   +
    • æ•°æ�®å»ºè®¾ï¼š
    • + 为银行建立行内标准化押å“�æ•°æ�®åº“,并æŒ�ç»­æ›´æ–°æ•°æ�®
      +
    +
    + +
    + +
      + +
    • 申å�¡åœ°å�€æ ‡å‡†åŒ–与风险评级
    • +
    • æ��å�‡æ¶ˆè´¹é‡‘é¢�/沉寂促活
    • +
    • å�¡å¯„/退信地å�€åˆ†æž�
    • +
    • å�ˆä½œå•†æˆ·å¸ƒç‚¹åˆ†æž�
    • +
    +
    +
    + +
    +
    + +

    +

    地�治�/地�标准化

    +

    地��想

    +

    行政区划�地�编�映射

    +

    建设房产大数�库/楼盘字典

    +

    地�标签(涉农�法�等)

    +
    +
    + +

    +

    客户分层-地�财力评级

    +

    财富客户筛选

    +

    沉�客户促活

    +

    促销策略,��消费�

    +

    辅助授信�度审批

    +

    +

    +
    +
    + +

    +

    网点/网周综�数�分�与�视化呈现

    +

    网点�射范围商圈/社区特�分�

    +

    网点客户财力评级与财富客户筛选

    +

    网周�业银行布点分�

    +

    优质客户�客点分�与网点布局优化策略

    +
    +
    + +

    +

    线上获客:

    +

    移动C端查询房产估值�评级�务�置

    +

    贷�估值:

    +

    线上房产询价/ 智能房产估值系统 法�信�查询

    +

    贷中审核:

    +

    建立银行内评系统估值/租金模型 + �供评估样本�相关房产大数�

    +

    贷�管�:

    +

    批��估押�价值 + 抵押物��处置价值预测 + 押�全视角画�/风险预警

    +

    数�建设:

    +

    为银行建立行内标准化押�数�库,并�续更新数�

    +
    +
    + +

    +

    申�地�标准化与风险评级

    +

    ��消费金�/沉寂促活

    +

    �寄/退信地�分�

    +

    �作商户布点分�

    +
    +
    + + +
    +
    +
    +

    +

    使用大数�在线估值方�,大大缩�银行对于贷�估值业务的时间;全�程估价管�平�,将信贷业务中贷�估值�贷中审批�贷�管�的全�程环节��与方进行作业整�,高效��传统评估业务�程。

    + +
    +
    + +
    +
    +
    + +
    +
    +

    使用大数�在线估值方�,大大缩�银行对于贷�估值业务的时间;全�程估价管�平�,将信贷业务中贷�估值�贷中审批�贷�管�的全�程环节��与方进行作业整�,高效��传统评估业务�程。

    -
    + +
    +
    +
    + +
    +
    +

    +

    10年数�积累,拥有体�超过6亿的样本库,为内评系统�供最精准的样本数�;�天超过600万+的新鲜动�样本数�入库处�,��数�的�时更新。

    + +
    + +
    +
    + + +
    +
    +
    + +
    +
    +

    +

    10年数�积累,拥有体�超过6亿的样本库,为内评系统�供最精准的样本数�;�天超过600万+的新鲜动�样本数�入库处�,��数�的�时更新。

    +
    +
    +
    + +
    -

    -

    10年数�积累,拥有体�超过6亿的样本库,为内评系统�供最精准的样本数�;�天超过600万+的新鲜动�样本数�入库处�,��数�的�时更新。

    - +

    +

    利用强大的CPDB数�库和高效批�地�处�技术,实现快速精准的批��估;帮助客户定义押�预警体系,并通过�类指标给出��程度的风险预警。

    +
    - +
    -
    +
    -
    - -
    -
    -

    -

    10年数�积累,拥有体�超过6亿的样本库,为内评系统�供最精准的样本数�;�天超过600万+的新鲜动�样本数�入库处�,��数�的�时更新。

    - -
    -
    -
    -
    -
    -
    +

    利用强大的CPDB数�库和高效批�地�处�技术,实现快速精准的批��估;帮助客户定义押�预警体系,并通过�类指标给出��程度的风险预警。

    - -
    -
    -
    -
    -
    -
    -

    -

    在银行客户端建立以房为中心的金�生活频�,帮助客户从自我房产分�出�,进行以房�资,以房�房以�以房投资,充分结�金�产�,�高客户粘性并形�稳定的产�获客渠�,�时获�客户数�进行二次�销。

    - -
    -
    - -
    -
    -
    -
    -
    -
    - -
    -
    -

    -

    在银行客户端建立以房为中心的金�生活频�,帮助客户从自我房产分�出�,进行以房�资,以房�房以�以房投资,充分结�金�产�,�高客户粘性并形�稳定的产�获客渠�,�时获�客户数�进行二次�销。

    - -
    -
    -
    -
    -
    -
    - -
    -
    -

    -

    �对市场的日益竞争,有效利用房估值�房产管�在客户端帮助银行获�房产金�产�的客户。

    -
    -
    +
    +
    +
    + +
    + +
    +

    +

    在银行客户端建立以房为中心的金�生活频�,帮助客户从自我房产分�出�,进行以房�资,以房�房以�以房投资,充分结�金�产�,�高客户粘性并形�稳定的产�获客渠�,�时获�客户数�进行二次�销。

    +
    +
    +
    + +
    +
    +
    + +
    +
    +

    +

    在银行客户端建立以房为中心的金�生活频�,帮助客户从自我房产分�出�,进行以房�资,以房�房以�以房投资,充分结�金�产�,�高客户粘性并形�稳定的产�获客渠�,�时获�客户数�进行二次�销。

    +
    +
    +
    + + +

    您还在为批�地�数�标准化烦�,您�通过在线方�申请测试数�或�系数�顾问,他们将�常��为您的数�需求�身定制�适的解决方案。

    - 立�查看 + 立�查看
    -
    +<#--
    --> -
    -
    -
    -

    -

    欢迎亲自体验CPDB房产大数�库,您�通过在线方�申请测试数�或�系数�顾问,他们将�常��为您的数�需求�身定制�适的解决方案。

    -
    - -
    -
    +<#--
    --> +<#--
    --> +<#--
    --> +<#--

    --> +<#--

    欢迎亲自体验CPDB房产大数�库,您�通过在线方�申请测试数�或�系数�顾问,他们将�常��为您的数�需求�身定制�适的解决方案。

    --> +<#--
    --> +<#-- --> +<#--
    --> +<#--
    --> <#include "/header/v5/_footer.ftl"/> diff --git a/projects/fangjia-coresite/src/main/webapp/industry/bond.ftl b/projects/fangjia-coresite/src/main/webapp/industry/bond.ftl new file mode 100644 index 000000000..37ae0c951 --- /dev/null +++ b/projects/fangjia-coresite/src/main/webapp/industry/bond.ftl @@ -0,0 +1,160 @@ + + + + + + �券 客户地�分� fangjia.com + + + <#include "../jsconstants.ftl" /> + + + + + + + + + + + + + + +<#include "/header/v5/_header.ftl"/> + + + + +
    +
    +
    + +
    + +
    +

    +

    近年�,�券行业迎�了金�科技化�数�资产化���市场化��展生�化的新趋势,�对诸多新的机�和挑战。

    +

    数�资产的数��质�,采集���和应用能力的强弱影��券商的��能力与竞争力,基于地�(�置)的数�建设与价值挖掘为�券行业带�了新的方�与��。

    +
    +
    +
    + +
    +
    +
    + +
    +
    +

    +

    近年�,�券行业迎�了金�科技化�数�资产化���市场化��展生�化的新趋势,�对诸多新的机�和挑战。

    +

    数�资产的数��质�,采集���和应用能力的强弱影��券商的��能力与竞争力,基于地�(�置)的数�建设与价值挖掘为�券行业带�了新的方�与��。 +

    +
    +
    +
    + + +
    +
    +
    +

    +

    �券行业获新�易,如果客户在开户�程中因为没有按�规�求输入正确的地�信�,从而造�客户�失是�常�惜的。为了�低开户�失率,引入估家科技地�智能�务,在开户�程中增加地��想,��用户体验。�时自动化进行“地�有效性判断�,�时�现问题并给予�示,指导客户按�规�求完�开户。

    + +
    +
    + +
    +
    +
    +
    +
    +
    + +
    +
    +

    +

    �券行业获新�易,如果客户在开户�程中因为没有按�规�求输入正确的地�信�,从而造�客户�失是�常�惜的。为了�低开户�失率,引入估家科技地�智能�务,在开户�程中增加地��想,��用户体验。�时自动化进行“地�有效性判断�,�时�现问题并给予�示,指导客户按�规�求完�开户。

    +
    +
    +
    + + +
    +
    +
    + +
    +
    +

    +

    在�券行业的存�客户中,�眠户�沉寂客户有�很大的�比,这部分客户缺少交易数�,券商无法进行精准的客户价值识别,难以�定财富客户。 + 估家科技将人工智能与�置大数�结�,自主研�了地�(�置)财力评级,将“地�-建筑物-环境�三者关�的多维度数�进行链接并建立评级模型,实现精准客户价值识别,尤其针对缺�业务数�的存�客户的促活促销,助力券商在�销场景找到财富客户,全����销ROI +

    +
    +
    +
    + +
    +
    +
    + +
    +
    +

    +

    在�券行业的存�客户中,�眠户�沉寂客户有�很大的�比,这部分客户缺少交易数�,券商无法进行精准的客户价值识别,难以�定财富客户。 + 估家科技将人工智能与�置大数�结�,自主研�了地�(�置)财力评级,将“地�-建筑物-环境�三者关�的多维度数�进行链接并建立评级模型,实现精准客户价值识别,尤其针对缺�业务数�的存�客户的促活促销,助力券商在�销场景找到财富客户,全����销ROI +

    +
    +
    +
    + +
    +

    如想了解详情,请致电 400-188-3787 �系我们,或者留下您的�系方�和需求,我们会第一时间�系您。

    + 立�咨询 +
    + +<#--
    --> + + +<#include "/header/v5/_footer.ftl"/> + + + + + diff --git a/projects/fangjia-coresite/src/main/webapp/industry/consulting.ftl b/projects/fangjia-coresite/src/main/webapp/industry/consulting.ftl index 695c438bd..e7031f6cf 100644 --- a/projects/fangjia-coresite/src/main/webapp/industry/consulting.ftl +++ b/projects/fangjia-coresite/src/main/webapp/industry/consulting.ftl @@ -116,31 +116,37 @@
    -
    -

    -

    房价网为�类大数�平�(DMP)�供以空间地�匹�的房产数�多维度画�,实现地��置精准�销。

    - 立�查看 -
    -
    -

    -

    房价网为�类大数�平�(DMP)�供以空间地�匹�的房产数�多维度画�,实现地��置精准�销。

    - 立�查看 +
    +

    如想了解详情,请致电 400-188-3787 �系我们,或者留下您的�系方�和需求,我们会第一时间�系您。

    + 立�咨询
    -
    -
    -
    -
    -

    -

    欢迎亲自体验CPDB房产大数�库,您�通过在线方�申请测试数�或�系数�顾问,他们将�常��为您的数�需求�身定制�适的解决方案。

    -
    - -
    -
    +<#--
    --> +<#--

    --> +<#--

    房价网为�类大数�平�(DMP)�供以空间地�匹�的房产数�多维度画�,实现地��置精准�销。

    --> +<#-- 立�查看--> +<#--
    --> +<#--
    --> +<#--

    --> +<#--

    房价网为�类大数�平�(DMP)�供以空间地�匹�的房产数�多维度画�,实现地��置精准�销。

    --> +<#-- 立�查看--> +<#--
    --> + +<#--
    --> + +<#--
    --> +<#--
    --> +<#--
    --> +<#--

    --> +<#--

    欢迎亲自体验CPDB房产大数�库,您�通过在线方�申请测试数�或�系数�顾问,他们将�常��为您的数�需求�身定制�适的解决方案。

    --> +<#--
    --> +<#-- --> +<#--
    --> +<#--
    --> <#include "/header/v5/_footer.ftl"/> diff --git a/projects/fangjia-coresite/src/main/webapp/industry/cost.ftl b/projects/fangjia-coresite/src/main/webapp/industry/cost.ftl new file mode 100644 index 000000000..06ee7674d --- /dev/null +++ b/projects/fangjia-coresite/src/main/webapp/industry/cost.ftl @@ -0,0 +1,166 @@ + + + + + + 消费金� 客户价值分� fangjia.com + + + <#include "../jsconstants.ftl" /> + + + + + + + + + + + + + + +<#include "/header/v5/_header.ftl"/> + + + + +
    +
    +
    + +
    + +
    +

    +

    在消费金�业务�程中,消金公�对客户�济实力/消费能力的精准判断至关��,根���消费场景结�客户的综�实力��好智能�置�适的产��授信�度,�为�销转化的关键点。

    +
    +

    估家科技以地��置为核心,通过地�-房产-地段-环境等�素实现的财力评级,从全新的维度对客户进行精准分层,从而为授信��类�销场景�供决策��。

    +
    +
    +
    + +
    +
    +
    + +
    +
    +

    +

    在消费金�业务�程中,消金公�对客户�济实力/消费能力的精准判断至关��,根���消费场景结�客户的综�实力��好智能�置�适的产��授信�度,�为�销转化的关键点。

    +

    估家科技以地��置为核心,通过地�-房产-地段-环境等�素实现的财力评级,从全新的维度对客户进行精准分层,从而为授信��类�销场景�供决策��。

    +
    +
    +
    + + +
    +
    +
    +

    +

    消费金�的业务场景无抵押�无担�,因此综�风控能力是消金公�最��的能力之一。

    +
    +

    地��置�房产的相关属性,��与客户的逾期率有直接的关�,区域特��房产价值�楼盘基础信�等都是风控模型中的��因�。�时,从已知的逾期客户的地�(�置)分布中也能通过模型�现更多�置特�,�断风控模型的多元化和精准度。

    +
    +
    + +
    +
    +
    +
    +
    +
    + +
    +
    +

    +

    消费金�的业务场景无抵押�无担�,因此综�风控能力是消金公�最��的能力之一。

    +

    地��置�房产的相关属性,��与客户的逾期率有直接的关�,区域特��房产价值�楼盘基础信�等都是风控模型中的��因�。�时,从已知的逾期客户的地�(�置)分布中也能通过模型�现更多�置特�,�断风控模型的多元化和精准度。

    +
    +
    +
    + + +
    +
    +
    + +
    +
    +

    +

    地�(�置)信�是消金公�的��数�资产,由于原始地�的质��差��,加上地�信�本身�常��,这部分数�并未�挥其��的作用,需�应用科技力�实现自动化数�治��长期建设。

    +
    +

    估家科技是地�(�置)AI价值挖掘领域的领跑者,�多年�建立了国内最大的地�与�动产大数�库,以人工智能技术与大数�结�,助力金�机构数字化建设,实现高质��展。

    +
    +
    +
    + +
    +
    +
    + +
    +
    +

    +

    地�(�置)信�是消金公�的��数�资产,由于原始地�的质��差��,加上地�信�本身�常��,这部分数�并未�挥其��的作用,需�应用科技力�实现自动化数�治��长期建设。

    +

    估家科技是地�(�置)AI价值挖掘领域的领跑者,�多年�建立了国内最大的地�与�动产大数�库,以人工智能技术与大数�结�,助力金�机构数字化建设,实现高质��展。

    +
    +
    +
    + +
    +

    如想了解详情,请致电 400-188-3787 �系我们,或者留下您的�系方�和需求,我们会第一时间�系您。

    + 立�咨询 +
    + +<#--
    --> + + +<#include "/header/v5/_footer.ftl"/> + + + + + diff --git a/projects/fangjia-coresite/src/main/webapp/industry/government.ftl b/projects/fangjia-coresite/src/main/webapp/industry/government.ftl index 971ad7cee..f478666e4 100644 --- a/projects/fangjia-coresite/src/main/webapp/industry/government.ftl +++ b/projects/fangjia-coresite/src/main/webapp/industry/government.ftl @@ -3,8 +3,8 @@ -行业应用之政府部门 - 房价网 fangjia.com - +政府部门 - 课题研究,城市房价检测,智慧城市,地�大数� 房价网 fangjia.com + <#include "../jsconstants.ftl" /> @@ -40,12 +40,18 @@

    行业应用之政府部门

    我们与国家统计局�上海统计局�以�政府房地产研究机构�作行业课题研究,
    并为�地公�机构�供房产调研报告等。

    +
    @@ -57,9 +63,9 @@

    房价网�以为政府研究机构�供从区域到城市,从城市到�区,从�区到楼栋,从楼栋到房�的全�覆盖的房产大数�,并为行业研究�供数�咨询�务。我们始终以第三方身份,�障数�的公正��明和客观。

    - +<#-- -->
    @@ -69,9 +75,9 @@

    房价网�为百姓买�房产�办�公��缴纳税费等涉�房价评估所需出具房产报告;以�公�处涉�继承��赠等业务时,第三方专业房产评估报告。

    @@ -88,9 +94,9 @@

    房价网�为百姓买�房产�办�公��缴纳税费等涉�房价评估所需出具房产报告;以�公�处涉�继承��赠等业务时,第三方专业房产评估报告。

    diff --git a/projects/fangjia-coresite/src/main/webapp/industry/itfin.ftl b/projects/fangjia-coresite/src/main/webapp/industry/itfin.ftl index f19b347f4..cae347dd1 100644 --- a/projects/fangjia-coresite/src/main/webapp/industry/itfin.ftl +++ b/projects/fangjia-coresite/src/main/webapp/industry/itfin.ftl @@ -36,15 +36,20 @@ @@ -56,10 +61,10 @@

    使用房价网在线评估系统,为�一处房产输出详细的报告,并为�一笔贷款业务进行高效评估;客户���在自有客户端�时�地评估,高效率沟通客户并给出贷款建议。

    - +<#-- -->
    @@ -68,10 +73,10 @@

    在互金行业的客户端,包括网站�微信以�APP端,增加房产估值模�,通过“房估值��“有房就贷�和“我的房产�等增加客户活动�并获�房贷产�的目标客户。

    - +<#-- -->
    @@ -86,10 +91,10 @@

    在互金行业的客户端,包括网站�微信以�APP端,增加房产估值模�,通过“房估值��“有房就贷�和“我的房产�等增加客户活动�并获�房贷产�的目标客户。

    - +<#-- -->
    @@ -101,28 +106,14 @@

    从在线获客转�至贷��贷��务,进行一站�客户�资产管�;针对抵押贷款的�个环节,以�资产综�质�,应用专业平��高风险控制管���销转�率。

    - -
    - - -
    -
    -
    - -
    -
    -

    -

    从在线获客转�至贷��贷��务,进行一站�客户�资产管�;针对抵押贷款的�个环节,以�资产综�质�,应用专业平��高风险控制管���销转�率。

    - +<#-- -->
    +
    @@ -131,34 +122,34 @@

    从在线获客转�至贷��贷��务,进行一站�客户�资产管�;针对抵押贷款的�个环节,以�资产综�质�,应用专业平��高风险控制管���销转�率。

    - +<#-- -->
    -
    -

    -

    挖掘存�以�潜在客户贷款业务需求,在客户端精准获客

    - 立�查看 +
    +

    如想了解详情,请致电 400-188-3787 �系我们,或者留下您的�系方�和需求,我们会第一时间�系您。

    + 立�咨询
    -
    -
    -
    -
    -

    -

    欢迎亲自体验CPDB房产大数�库,您�通过在线方�申请测试数�或�系数�顾问,他们将�常��为您的数�需求�身定制�适的解决方案。

    -
    - -
    -
    +<#--
    --> + +<#--
    --> +<#--
    --> +<#--
    --> +<#--

    --> +<#--

    欢迎亲自体验CPDB房产大数�库,您�通过在线方�申请测试数�或�系数�顾问,他们将�常��为您的数�需求�身定制�适的解决方案。

    --> +<#--
    --> +<#-- --> +<#--
    --> +<#--
    --> <#include "/header/v5/_footer.ftl"/> diff --git a/projects/fangjia-coresite/src/main/webapp/jsconstants.ftl b/projects/fangjia-coresite/src/main/webapp/jsconstants.ftl index 3ddcd3d91..bf723dca2 100644 --- a/projects/fangjia-coresite/src/main/webapp/jsconstants.ftl +++ b/projects/fangjia-coresite/src/main/webapp/jsconstants.ftl @@ -20,3 +20,5 @@ var Constants = { <#if scheme?? && scheme == "https" > + +<#include "baidu_analysis.ftl" /> diff --git a/projects/fangjia-coresite/src/main/webapp/product/ptas.ftl b/projects/fangjia-coresite/src/main/webapp/product/ptas.ftl index 45b8f0581..b3b1fa203 100644 --- a/projects/fangjia-coresite/src/main/webapp/product/ptas.ftl +++ b/projects/fangjia-coresite/src/main/webapp/product/ptas.ftl @@ -46,13 +46,19 @@ @@ -144,28 +150,28 @@

    为银行�互金行业,�供高效低�本�客观公正的在线评估�务

    - 立�查看 + 立�查看

    为银行�互金行业,�供高效低�本�客观公正的在线评估�务

    - 立�查看 + 立�查看
    -
    +<#--
    --> -
    -
    -
    -

    -

    欢迎亲自体验CPDB房产大数�库,您�通过在线方�申请测试数�或�系数�顾问,他们将�常��为您的数�需求�身定制�适的解决方案。

    -
    - -
    -
    +<#--
    --> +<#--
    --> +<#--
    --> +<#--

    --> +<#--

    欢迎亲自体验CPDB房产大数�库,您�通过在线方�申请测试数�或�系数�顾问,他们将�常��为您的数�需求�身定制�适的解决方案。

    --> +<#--
    --> +<#-- --> +<#--
    --> +<#--
    --> <#include "/header/v5/_footer.ftl"/> diff --git a/projects/fangjia-coresite/src/main/webapp/resource/industry.ftl b/projects/fangjia-coresite/src/main/webapp/resource/industry.ftl index d98b62dae..eceb299f6 100644 --- a/projects/fangjia-coresite/src/main/webapp/resource/industry.ftl +++ b/projects/fangjia-coresite/src/main/webapp/resource/industry.ftl @@ -65,7 +65,7 @@
    - <#include "sub_nav.ftl"/> +<#-- <#include "sub_nav.ftl"/>-->
    <#list newsResources as newsResource> diff --git a/projects/fangjia-coresite/src/main/webapp/saleLeads/apply-old.ftl b/projects/fangjia-coresite/src/main/webapp/saleLeads/apply-old.ftl new file mode 100644 index 000000000..f03b8f3f9 --- /dev/null +++ b/projects/fangjia-coresite/src/main/webapp/saleLeads/apply-old.ftl @@ -0,0 +1,1013 @@ + + + + + + 房产数�业务咨询 - 房价网 fangjia.com + + + <#include "../jsconstants.ftl" /> + + + + + + + + + + + + + + + + +<#escape x as x?html> + + +
    + <#if mid?? && mid=="1001"> +
    +
    +

    贷�估值解决方案

    +

    +

    房价网�过长时间积累,以大数�为��,结�近�年�断钻研科学专业的估价方法和AVM房价计算模型,系统自动生�估值,高效低�本,客观公正。

    +
    +
    + <#elseif mid?? && mid=="1002"> +
    +
    +

    银行内评系统解决方案

    +

    +

    银行内评缓释系统是用历�数�建模预测未�,�化已产生和�能潜在风险,但先决�件是足够体�和精准度的数�。

    +
    +
    + <#elseif mid?? && mid=="1003"> +
    +
    +

    贷�管�解决方案

    +

    +

    �对大�押�的批��估,房价网�以�供从地�标准化到风险预警一系列贷�管�解决方案,自动化处�低�本高效率。

    +
    +
    + <#elseif mid?? && mid=="1004"> +
    +
    +

    房生活金�客户端�销解决方案

    +

    +

    为银行移动客户端创造具有长期性�延展性�个性化的强金�属性应用场景,�高用户粘性,��产��销,�续挖掘现有客户的价值。

    +
    +
    + <#elseif mid?? && mid=="1005"> +
    +
    +

    房贷业务获客解决方案

    +

    +

    基于房产大数�,为金�行业客户端平��供房产估值�务,实现房贷业务的快速精准获客。

    +
    +
    + <#elseif mid?? && mid=="1006"> +
    +
    +

    地�精准�销解决方案

    +

    +

    房价网为�类大数�平�(DMP)�供以空间地�匹�的房产数�多维度画�,实现地��置精准�销。

    +
    +
    + <#elseif mid?? && mid=="1007"> +
    +
    +

    地�标准化解决方案

    +

    +

    无论在风控��信还是�销领域,任何批�地�数�的处�都离�开地�标准化。
    房价网基于强大的CPDB数�库和人机技术,为�行业�供高效智能的地�标准化�务。

    +
    +
    + <#elseif mid?? && (mid=="1009" || mid=="1018")> +
    +
    +


    China Property Database

    +

    一站�获�超过10年的时间�列房产数�,
    数�全��精度高�覆盖范围广,
    �续稳定的数���,周度更新频率,中国应用广泛的房产大数�库

    +
    +
    + <#elseif mid?? && mid=="1010"> +
    +
    +

    API数�接�解决方案

    +

    +

    房价网API基于房价网的大数�库CPDB(China Property Database),是房价网商务基础�务的��开放途径。
    开�人员能基于房价网API开�应用程�,将数��供给银行�金�机构�商家�开�者�社区媒体和�行�业。

    +
    +
    + <#elseif mid?? && mid=="1019"> +
    +
    +

    +

    �费�客观�公正的第三方在线房产估值平�

    +

    房价网基于CPDB房产大数�库,利用AVM自动估价模型,对全国367个城市所有区域房产进行估值,并�供真实有效的房产全维度信�,为您的投资决策�供帮助。

    +
    +
    + <#elseif mid?? && mid=="1013"> +
    +
    +


    Aprisal Management Paltform

    +

    利用CPDB大数�,在线高效管�贷�评估业务。
    房价网将信贷业务中贷�估值�贷中审批�贷�管�的全�程环节��与方进行作业整�,一站�解决信贷业务的�类问题。

    +
    +
    + <#elseif mid?? && mid=="1014"> +
    +
    +


    Property Data Service

    +

    从�头资产分类到获客转��贷��贷��务,进行一站�资产管�;针对抵押贷款的�个环节,以�资产综�质�和申请人的�信情况,针对性的设计,�高风险控制管���销转�率。

    +
    +
    + <#elseif mid?? && mid=="1015"> +
    +
    +


    Professional Estate Price Tracking Analysis System

    +

    实现�命性的一户一信�,能够�到对房产的实时精准评估,快速了解历�价格情况与楼盘综�情况,并对�续价格涨跌幅进行实时监控。

    +
    +
    + <#elseif mid?? && mid=="1017"> +
    +
    +

    +

    《房产专业调查评估报告》是能精确到户的第三方调查报告,主�内容是分��套房�背�的微观信�,用客观公正的数�为广大买家��家�评估师�公�员�分�师�房产�纪人等业内人士�供最专业�客观�先进的房产分�数�。

    +
    +
    + <#else> +
    +
    +

    +

    +
    +
    + + +
    +
    + + <#if mid?? && mid=="1016"> +
    +

    +

    请填写您的信�并下载您所需�的资料。

    +
    + <#else> +
    +

    +

    请填写您的信�,我们的专业数�顾问将会尽快与您�得�系。

    +
    + +
    + <#-- action="${wwwUrl}/saleLeads/doAdd"--> +
    + + + + +
    +
    +<#--
    --> +<#-- --> +<#-- --> +<#--
    --> +<#--
    --> +<#--
    --> +<#-- --> +<#-- --> +<#--
    --> +<#--
    --> +
    + + +
    +
    + +
    + + +   åˆ·æ–° +
    +
    +
    + +
    + + + ��验�� + 60s +
    +
    + <#--
    --> + <#-- --> + <#-- --> + <#--
    --> + <#-- 刷新--> + <#--
    --> + <#--
    --> + <#--
    --> + <#-- --> + <#-- --> + <#--
    --> + <#--
    --> + <#--
    --> + <#-- --> + <#-- --> + <#--
    --> + <#--
    --> +
    +<#--
    --> +<#--
    --> +<#-- --> +<#--
    --> +<#-- --> +<#-- --> +<#-- <#include "/header/v5/_city_select.ftl" />--> +<#--
    --> +<#--
    所在城市�能为空
    --> +<#--
    --> +<#--
    --> +<#-- --> +<#-- --> +<#--
    --> +<#--
    --> +<#--
    --> + +<#--
    --> +<#-- --> +<#--
    --> +<#-- --> +<#-- --> +<#--
    工作�能�能为空
    --> +<#--
    --> +<#--
    --> +<#-- --> +<#-- --> +<#--
    工作�能�能为空
    --> +<#--
    --> +<#--
    --> +<#-- --> +<#-- --> +<#--
    工作�能�能为空
    --> +<#--
    --> +<#--
    --> +<#-- --> +<#-- --> +<#--
    工作�能�能为空
    --> +<#--
    --> +<#--
    --> +<#-- --> +<#-- --> +<#--
    工作�能�能为空
    --> +<#--
    --> +<#--
    --> +<#-- --> +<#-- --> +<#--
    工作�能�能为空
    --> +<#--
    --> +<#--
    --> +<#-- --> +<#-- --> +<#--
    工作�能�能为空
    --> +<#--
    --> +<#--
    --> +<#-- --> +<#-- --> +<#--
    工作�能�能为空
    --> +<#--
    --> +<#--
    --> +<#-- --> +<#-- --> +<#--
    工作�能�能为空
    --> +<#--
    --> +<#--
    --> +<#-- --> +<#-- --> +<#--
    --> +<#-- --> +<#-- --> +<#--
    --> +<#--
    --> +<#--
    --> +<#-- --> +<#-- --> +<#--
    --> +<#--
    --> +<#--
    --> +<#-- --> +<#-- --> +<#--
    --> +<#--

    解决方案

    --> +<#--

    贷�估值解决方案

    --> +<#--

    银行内评系统解决方案

    --> +<#--

    贷�管�解决方案

    --> +<#--

    房生活金�客户端解决方案

    --> +<#--

    房贷业务获客解决方案

    --> +<#--

    地�精准�销解决方案

    --> +<#--

    地�标准化解决方案

    --> +<#--

    数�测试

    --> +<#--

    CPDB房产大数�库测试

    --> +<#--

    API数�接�测试

    --> +<#--

    房产评估数�测试

    --> +<#--

    数�产�

    --> +<#--

    AMP估价管�平�

    --> +<#--

    PDS�动产大数��务平�

    --> +<#--

    房价通

    --> +<#--

    房产专业调查评估报告

    --> +<#--

    其他,请填写

    --> +<#--
    --> +<#--
    --> +<#--
    --> +<#--
    --> +<#-- --> +<#-- --> +<#--
    其他业务需求�能为空
    --> +<#--
    --> +<#--
    --> + + +
    +<#--

    数��密声明:
    填写此表�表示您��房价网�您��产�和�务的相关信�邮件,如果您�想接收此类邮件,请勾掉以下选项

    --> +<#--
    --> +<#--
    --> +<#-- --> +<#-- 我想�接收�自房价网的邮件--> +<#--
    --> +<#--
    --> + �交 +
    +
    +
    +
    + + <#include "/header/v5/_footer.ftl" /> + <#include "../citys.ftl"/> + + + + + + + + + + + + + + + + + + + diff --git a/projects/fangjia-coresite/src/main/webapp/saleLeads/apply.ftl b/projects/fangjia-coresite/src/main/webapp/saleLeads/apply.ftl index aab69abc0..398b218a7 100644 --- a/projects/fangjia-coresite/src/main/webapp/saleLeads/apply.ftl +++ b/projects/fangjia-coresite/src/main/webapp/saleLeads/apply.ftl @@ -1,823 +1,633 @@ - - -房产数�业务咨询 - 房价网 fangjia.com - - -<#include "../jsconstants.ftl" /> + + + 房产数�业务咨询 - 房价网 fangjia.com + + + <#include "../jsconstants.ftl" /> - - - - - + + + + + - + - - + + + <#escape x as x?html> -
    -
    - -
    -
    - -
    - <#if mid?? && mid=="1001"> -
    -
    -

    贷�估值解决方案

    -

    -

    房价网�过长时间积累,以大数�为��,结�近�年�断钻研科学专业的估价方法和AVM房价计算模型,系统自动生�估值,高效低�本,客观公正。

    -
    -
    - <#elseif mid?? && mid=="1002"> -
    -
    -

    银行内评系统解决方案

    -

    -

    银行内评缓释系统是用历�数�建模预测未�,�化已产生和�能潜在风险,但先决�件是足够体�和精准度的数�。

    -
    -
    - <#elseif mid?? && mid=="1003"> -
    +
    -

    贷�管�解决方案

    -

    -

    �对大�押�的批��估,房价网�以�供从地�标准化到风险预警一系列贷�管�解决方案,自动化处�低�本高效率。

    -
    -
    - <#elseif mid?? && mid=="1004"> -
    -
    -

    房生活金�客户端�销解决方案

    -

    -

    为银行移动客户端创造具有长期性�延展性�个性化的强金�属性应用场景,�高用户粘性,��产��销,�续挖掘现有客户的价值。

    -
    -
    - <#elseif mid?? && mid=="1005"> -
    -
    -

    房贷业务获客解决方案

    -

    -

    基于房产大数�,为金�行业客户端平��供房产估值�务,实现房贷业务的快速精准获客。

    -
    -
    - <#elseif mid?? && mid=="1006"> -
    -
    -

    地�精准�销解决方案

    -

    -

    房价网为�类大数�平�(DMP)�供以空间地�匹�的房产数�多维度画�,实现地��置精准�销。

    -
    -
    - <#elseif mid?? && mid=="1007"> -
    -
    -

    地�标准化解决方案

    -

    -

    无论在风控��信还是�销领域,任何批�地�数�的处�都离�开地�标准化。
    房价网基于强大的CPDB数�库和人机技术,为�行业�供高效智能的地�标准化�务。

    -
    -
    - <#elseif mid?? && (mid=="1009" || mid=="1018")> -
    -
    -


    China Property Database

    -

    一站�获�超过10年的时间�列房产数�,
    数�全��精度高�覆盖范围广,
    �续稳定的数���,周度更新频率,中国应用广泛的房产大数�库

    -
    -
    - <#elseif mid?? && mid=="1010"> -
    -
    -

    API数�接�解决方案

    -

    -

    房价网API基于房价网的大数�库CPDB(China Property Database),是房价网商务基础�务的��开放途径。
    开�人员能基于房价网API开�应用程�,将数��供给银行�金�机构�商家�开�者�社区媒体和�行�业。

    -
    -
    - <#elseif mid?? && mid=="1019"> -
    -
    -

    -

    �费�客观�公正的第三方在线房产估值平�

    -

    房价网基于CPDB房产大数�库,利用AVM自动估价模型,对全国367个城市所有区域房产进行估值,并�供真实有效的房产全维度信�,为您的投资决策�供帮助。

    -
    -
    - <#elseif mid?? && mid=="1013"> -
    -
    -


    Aprisal Management Paltform

    -

    利用CPDB大数�,在线高效管�贷�评估业务。
    房价网将信贷业务中贷�估值�贷中审批�贷�管�的全�程环节��与方进行作业整�,一站�解决信贷业务的�类问题。

    -
    -
    - <#elseif mid?? && mid=="1014"> -
    -
    -


    Property Data Service

    -

    从�头资产分类到获客转��贷��贷��务,进行一站�资产管�;针对抵押贷款的�个环节,以�资产综�质�和申请人的�信情况,针对性的设计,�高风险控制管���销转�率。

    -
    -
    - <#elseif mid?? && mid=="1015"> -
    -
    -


    Professional Estate Price Tracking Analysis System

    -

    实现�命性的一户一信�,能够�到对房产的实时精准评估,快速了解历�价格情况与楼盘综�情况,并对�续价格涨跌幅进行实时监控。

    -
    -
    - <#elseif mid?? && mid=="1017"> -
    -
    -

    -

    《房产专业调查评估报告》是能精确到户的第三方调查报告,主�内容是分��套房�背�的微观信�,用客观公正的数�为广大买家��家�评估师�公�员�分�师�房产�纪人等业内人士�供最专业�客观�先进的房产分�数�。

    -
    -
    - <#else> -
    -
    -

    -

    定期更新房产大数�行业信�,房产数�研究分�,房价网动���作伙伴案例,并�供�类�供下载的相关数�与文档。

    -
    -
    - - -
    -
    - - <#if mid?? && mid=="1016"> -
    -

    -

    请填写您的信�并下载您所需�的资料。

    -
    - <#else> -
    -

    -

    请填写您的信�,我们的专业数�顾问将会尽快与您�得�系。

    -
    - -
    -
    - - - - -
    -
    -
    - - -
    -
    -
    - - -
    -
    -
    - - -
    -
    -
    - - -
    -
    -
    - - -
    -
    -
    -
    -
    - -
    - - - <#include "/header/v5/_city_select.ftl" /> -
    -
    所在城市�能为空
    -
    -
    - - -
    -
    -
    - -
    - -
    - - -
    工作�能�能为空
    -
    -
    - - -
    工作�能�能为空
    -
    -
    - - -
    工作�能�能为空
    -
    -
    - - -
    工作�能�能为空
    -
    -
    - - -
    工作�能�能为空
    -
    -
    - - -
    工作�能�能为空
    -
    -
    - - -
    工作�能�能为空
    -
    -
    - - -
    工作�能�能为空
    -
    -
    - - -
    工作�能�能为空
    -
    -
    - - -
    - - -
    -
    -
    - - -
    -
    -
    - - -
    -

    解决方案

    -

    贷�估值解决方案

    -

    银行内评系统解决方案

    -

    贷�管�解决方案

    -

    房生活金�客户端解决方案

    -

    房贷业务获客解决方案

    -

    地�精准�销解决方案

    -

    地�标准化解决方案

    -

    数�测试

    -

    CPDB房产大数�库测试

    -

    API数�接�测试

    -

    房产评估数�测试

    -

    数�产�

    -

    AMP估价管�平�

    -

    PDS�动产大数��务平�

    -

    房价通

    -

    房产专业调查评估报告

    -

    其他,请填写

    -
    -
    -
    -
    - - -
    其他业务需求�能为空
    -
    -
    - - -
    -

    数��密声明:
    填写此表�表示您��房价网�您��产�和�务的相关信�邮件,如果您�想接收此类邮件,请勾掉以下选项

    -
    -
    - - 我想�接收�自房价网的邮件 -
    -
    - �交 +
    -
    -<#include "/header/v5/_footer.ftl" /> -<#include "../citys.ftl"/> +
    + <#if mid?? && mid=="1001"> +
    +
    +

    贷�估值解决方案

    +

    +

    房价网�过长时间积累,以大数�为��,结�近�年�断钻研科学专业的估价方法和AVM房价计算模型,系统自动生�估值,高效低�本,客观公正。

    +
    +
    + <#elseif mid?? && mid=="1002"> +
    +
    +

    银行内评系统解决方案

    +

    +

    银行内评缓释系统是用历�数�建模预测未�,�化已产生和�能潜在风险,但先决�件是足够体�和精准度的数�。

    +
    +
    + <#elseif mid?? && mid=="1003"> +
    +
    +

    贷�管�解决方案

    +

    +

    �对大�押�的批��估,房价网�以�供从地�标准化到风险预警一系列贷�管�解决方案,自动化处�低�本高效率。

    +
    +
    + <#elseif mid?? && mid=="1004"> +
    +
    +

    房生活金�客户端�销解决方案

    +

    +

    为银行移动客户端创造具有长期性�延展性�个性化的强金�属性应用场景,�高用户粘性,��产��销,�续挖掘现有客户的价值。

    +
    +
    + <#elseif mid?? && mid=="1005"> +
    +
    +

    房贷业务获客解决方案

    +

    +

    基于房产大数�,为金�行业客户端平��供房产估值�务,实现房贷业务的快速精准获客。

    +
    +
    + <#elseif mid?? && mid=="1006"> +
    +
    +

    地�精准�销解决方案

    +

    +

    房价网为�类大数�平�(DMP)�供以空间地�匹�的房产数�多维度画�,实现地��置精准�销。

    +
    +
    + <#elseif mid?? && mid=="1007"> +
    +
    +

    地�标准化解决方案

    +

    +

    无论在风控��信还是�销领域,任何批�地�数�的处�都离�开地�标准化。
    房价网基于强大的CPDB数�库和人机技术,为�行业�供高效智能的地�标准化�务。

    +
    +
    + <#elseif mid?? && (mid=="1009" || mid=="1018")> +
    +
    +


    China Property Database

    +

    一站�获�超过10年的时间�列房产数�,
    数�全��精度高�覆盖范围广,
    �续稳定的数���,周度更新频率,中国应用广泛的房产大数�库

    +
    +
    + <#elseif mid?? && mid=="1010"> +
    +
    +

    API数�接�解决方案

    +

    +

    房价网API基于房价网的大数�库CPDB(China Property Database),是房价网商务基础�务的��开放途径。
    开�人员能基于房价网API开�应用程�,将数��供给银行�金�机构�商家�开�者�社区媒体和�行�业。

    +
    +
    + <#elseif mid?? && mid=="1019"> +
    +
    +

    +

    �费�客观�公正的第三方在线房产估值平�

    +

    房价网基于CPDB房产大数�库,利用AVM自动估价模型,对全国367个城市所有区域房产进行估值,并�供真实有效的房产全维度信�,为您的投资决策�供帮助。

    +
    +
    + <#elseif mid?? && mid=="1013"> +
    +
    +


    Aprisal Management Paltform

    +

    利用CPDB大数�,在线高效管�贷�评估业务。
    房价网将信贷业务中贷�估值�贷中审批�贷�管�的全�程环节��与方进行作业整�,一站�解决信贷业务的�类问题。

    +
    +
    + <#elseif mid?? && mid=="1014"> +
    +
    +


    Property Data Service

    +

    从�头资产分类到获客转��贷��贷��务,进行一站�资产管�;针对抵押贷款的�个环节,以�资产综�质�和申请人的�信情况,针对性的设计,�高风险控制管���销转�率。

    +
    +
    + <#elseif mid?? && mid=="1015"> +
    +
    +


    Professional Estate Price Tracking Analysis System

    +

    实现�命性的一户一信�,能够�到对房产的实时精准评估,快速了解历�价格情况与楼盘综�情况,并对�续价格涨跌幅进行实时监控。

    +
    +
    + <#elseif mid?? && mid=="1017"> +
    +
    +

    +

    《房产专业调查评估报告》是能精确到户的第三方调查报告,主�内容是分��套房�背�的微观信�,用客观公正的数�为广大买家��家�评估师�公�员�分�师�房产�纪人等业内人士�供最专业�客观�先进的房产分�数�。

    +
    +
    + <#else> +
    +
    +

    +

    +
    +
    + - +
    +
    - - - - + <#if mid?? && mid=="1016"> +
    +

    +

    请填写您的信�并下载您所需�的资料。

    +
    + <#else> +
    +

    +

    请填写您的信�,我们的专业数�顾问将会尽快与您�得�系。

    +
    + +
    +
    - + + + + +
    +
    - +
    + - - + ��验�� + + 60s +
    +
    - + + + + + + + + + + + + + + $("#sendCode1").click(function() { + + if(!checkImgCode($("#image_input_code").val())){ + scrollTo(0,0); + return false; + } + sendCode($(this)); + }); + + // ��验��以�倒计时 + var countdown = 60; + var sendCode = function(obj) { + if (countdown < 60) { + return; + } + var mobile = $("#mobile").val(); + if (checkContactName() && checkMobile(mobile) && checkImgCode($("#image_input_code").val())) { + obj.addClass("waiting"); + settime(obj); + doSendCode(mobile); + } + } + + var doSendCode = function(mobile) { + $.ajax({ + type : "POST", + url : basePath+"/saleLeads/sendCode", + data : { + "type" : "login", + "mobile" : mobile, + "codeToken" : codeToeken, + "code" : $("#image_input_code").val() + }, + success : function(result) { + var re = $.parseJSON(result); + if (re.result == "fail") { + countdown = 0; + if (re.msg == "输入的图形��正确") { + $("#smsCodeInput").parent().find(".error span").text("图形验��错误"); + $("#smsCodeInput").parent().find(".error").show(); + } else { + console.log(re.msg) + $("#smsCodeInput").parent().find(".error span").text(+re.msg); + $("#smsCodeInput").parent().find(".error").show(); + } + } else { + $("#smsCodeInput").parent().find(".error").hide(); + } + }, + error : function(data, status) { + countdown = 0; + alert("��失败,请�试"); + } + }) + } + + var settime = function(obj) { + if (countdown == 0) { + obj.removeClass("waiting"); + obj.html("��验��"); + countdown = 60; + return; + } else { + obj.html("�新��(" + countdown + ")"); + countdown--; + } + setTimeout(function() { + settime(obj) + }, 1000) + } + + + $(".content-block01").scroll(function () { + $(".content-block01 .letter").css("position","absolute"); + $(".content-block01 .letter").css("top", 116 - $("#cityContainer").position().top); + }); + + + $("body").delegate(".popup-about01 a","click", function(){ + $("#selectedCity,#city").val($(this).text()); + //$(".adBoxApp01").show(); + }); + $(".popup-about01-mobile .cityGPS").on("click", function () { + $("#selectedCity,#city").val($(this).find("p").text()); + //$(".adBoxApp01").show(); + }); + $("body").delegate(".popup-about01-mobile a","click", function(){ + $("#selectedCity,#city").val($(this).text()); + //$(".adBoxApp01").show(); + }); + $(".popup-about01 .icon-left").on("click", function () { + //$(".adBoxApp01").show(); + }); + + + diff --git a/projects/fangjia-coresite/src/main/webapp/saleLeads/dataAbility.ftl b/projects/fangjia-coresite/src/main/webapp/saleLeads/dataAbility.ftl new file mode 100644 index 000000000..abdf23629 --- /dev/null +++ b/projects/fangjia-coresite/src/main/webapp/saleLeads/dataAbility.ftl @@ -0,0 +1,454 @@ + + + + + +数�能力 - 房价网 fangjia.com + + +<#include "../jsconstants.ftl" /> + + + + + + + + + + + + + +<#include "/header/v5/_header.ftl"/> + + + + +
    +
    +
    +
    + +

    行政区划库

    +
    +<#--
    --> +<#-- 基础数�--> +<#--
    --> +
    全国367个城市/地区的行政区划信��行政代�库
    +
    +
      +
    1. �级行政区
    2. +
    3. 地级行政区
    4. +
    5. 县级行政区
    6. +
    7. 乡级行政区
    8. +
    9. 行政代�库
    10. +
    +
    +
    + +
    +
    + +

    地�数�库

    +
    +<#--
    --> +<#-- 楼盘字典--> +<#--
    --> +
    覆盖全国的地�大数�库,数�结构标准�颗粒度精细,地�匹�能力行业领先
    +
    +
      +
    1. 全国地�库
    2. +
    3. 地�别�库
    4. +
    5. 地��标信�库
    6. +
    7. POI数�库
    8. +
    9. 涉农标签
    10. +
    +
    +
    +
    +
    + +

    楼盘字典

    +
    +
    �托国内最早线上房产估值平�房价网,�七年全国房产数�积累,专业专注
    +
    + +
      +
    1. �区��库
    2. +
    3. 楼栋/房�信�库
    4. +
    5. �区别�库
    6. +
    7. �区基础信�
    8. +
    9. 地��标信�
    10. +
    11. �区围�
    12. +
    13. �区特�标签
    14. +
    +
    +
    +
    +
    + +

    商业地产库

    +
    +
    全国商业地产大数�库,解决��匹�等难题
    +
    +
      +
    1. 商业地产��库
    2. +
    3. 办公楼/商铺租金
    4. +
    5. 办公楼/商铺�价
    6. +
    7. 商业地产租金指数
    8. +
    9. 商业地产基础数�库
    10. +
    11. 商业地产样本库
    12. +
    +
    +
    +
    +
    + +

    市场动�数�

    +
    +
    自2006年以�的时间�列市场动�数�积累,数�多元丰富,满足��场景需求
    +
    + +
      +
    1. 全国城市房价走势/涨跌幅
    2. +
    3. 全国楼盘�价/一房一价
    4. +
    5. 城市/区域/楼盘房价指数
    6. +
    7. 房产出租/出售挂牌数�
    8. +
    9. 房产�交数�
    10. +
    11. 全国法�房数�
    12. +
    13. 房产评估样本大数�库
    14. +
    +
    +
    +
    +
    + +
    +
    + +

    +

    302个地级�以上城市,40个地区�自治州�盟,以�25个�直辖县级��

    +
    +
    + +

    +

    90万个楼盘以�200万商业�酒店�医疗�教育机构�观览建筑等

    +
    +
    + +

    +

    行政区:1512,县:853,市:307,行政区自治县:117,旗:49,自治旗:3

    +
    +
    + +

    +

    1,003,000,000

    +
    +
    + +

    +

    143,000,000

    +
    +
    + +

    +

    805,000,000

    +
    +
    +
    +
    + +

    +

    302个地级�以上城市,40个地区�自治州�盟,以�25个�直辖县级��

    +
    +
    + +

    +

    90万个楼盘以�135万商业�酒店�医疗�教育机构�观览建筑等

    +
    +
    + +

    +

    行政区:1512,县:853,市:307,行政区自治县:117,旗:49,自治旗:3

    +
    +
    + +

    +

    1,001,000,000

    +
    +
    + +

    +

    109,000,000

    +
    +
    + +

    +

    805,000,000

    +
    +
    + +<#--
    --> +<#--
    --> +<#-- --> +<#--
    --> +<#--
    --> + +
    +
    +
    + +
    +
    +

    +

    创立国内最早线上第三方房产估值平�“房价网�为中国上亿套房产估值

    +
    +
    +
    +
    +
    +
    +

    +

    深耕17年房产/地��置基础数�建设和交易数�沉淀,数�覆盖全国367个城市�地区

    +
    +
    + +
    +
    +
    +
    +
    +
    + +
    +
    +

    +

    深耕17年房产/地��置基础数�建设和交易数�沉淀,数�覆盖全国367个城市�地区

    +
    +
    +
    +
    +
    +
    + +
    +
    +

    +

    自主研�的自动房产估值级�模型�数�治�方案�数�资产建设等�务,为国有银行等业内头部机构所采用

    +
    +
    +
    + +
    +
    +
    +

    +

    基于自然语言处�算法的��识别系统�供了先进的地�处�机制,能对��城市���形�的地�,�供地�的补全�纠错�标准化等�务。

    +
    +
    + +
    +
    +
    +
    +
    +
    + +
    +
    +

    +

    基于自然语言处�算法的��识别系统�供了先进的地�处�机制,能对��城市���形�的地�,�供地�的补全�纠错�标准化等�务。

    +
    +
    +
    + + +
    +

    如想了解详情,请致电 400-188-3787 �系我们,或者留下您的�系方�和需求,我们会第一时间�系您。

    + 立�咨询 +
    + + + + +<#--
    --> +<#--
    --> +<#--
    --> +<#--

    --> +<#--

    欢迎亲自体验CPDB房产大数�库,您�通过在线方�申请测试数�或�系数�顾问,他们将�常��为您的数�需求�身定制�适的解决方案。

    --> +<#--
    --> +<#-- --> +<#--
    --> +<#--
    --> + +<#include "/header/v5/_footer.ftl"/> + + + + + diff --git a/projects/fangjia-coresite/src/main/webapp/se_analysis.ftl b/projects/fangjia-coresite/src/main/webapp/se_analysis.ftl index 12fff7984..d1646bfcb 100644 --- a/projects/fangjia-coresite/src/main/webapp/se_analysis.ftl +++ b/projects/fangjia-coresite/src/main/webapp/se_analysis.ftl @@ -1,15 +1,15 @@ - +<#----> + + + + + + + +<#include "/header/v5/_header.ftl"/> + + + + + + +
    +
    +
    + +
    +
    +

    +

    ��金�机构数字化转型加速度,数�资产的综�建设迫在眉�。数�资产的数��质�,采集�管�和应用能力的强弱直接影�金�机构的��与创造价值的能力,也将决定未�新的竞争优势。一个良好的数�治�体系,为数�资产管�打下�实的基础,是实现数�资产��和�现的����和�障。

    +

    地�信�是金�机构的��数�资产,在金�业务过程中已�完�了地�数�的积累和存储。然而,地�信��常��,普�存在信��准确��完整�数�����标准�统�应用难度高等一系列问题,需�应用科技力�实现自动化数�治��长期建设。

    +
    +
    +
    + + +<#--
    --> +<#--
    --> +<#--
    --> +<#--

    银�监会2022年5月�布《银行业金�机构数�治�指引》,�求银行业金�机构�高数�管�和数�质�质效,将数�应用嵌入到业务���风

    --> +<#--

    险管�和内部控制的全�程。地�数�是金�大数�的��组�部分,地�信�数字化建设是实现数智银行转型��或缺的一环。

    --> + +<#--
    --> + +<#--
    --> +<#--

    银�监会2022年5月�布《银行业金�机构数�治�指引》,�求银行业金�机构�高数�管�和数�质�质效,将数�应用嵌入到业务���风险管�和内部控制的全�程。--> +<#-- 地�数�是金�大数�的��组�部分,地�信�数字化建设是实现数智银行转型��或缺的一环。

    --> + +<#--
    --> +<#--
    --> +<#--
    --> + +
    +
    + +
    +
    + + +
    +
    +
    + +
    +
    +
    +

    地�治�应用场景

    +

    实现存�客户地�信�批�标准化,解决海�地�治�难的困扰;

    +

    新增客户系统录入地��想,��用户体验;

    +

    新增地�信�实时标准化,按�规�求映射行政编�;

    +

    建立模型对��供应商的数�进行数���建设,以适用��业务场景;

    +

    建立楼盘字典�行内自有地�/楼盘数�库,并�续更新数�;

    +

    为�类系统�供地�/房产�相关数�样本,为系统输入结果的准确性�

    +

        ä¾›ä¿�障。

    +
    +
    + +
    +
    + + +
    +

    如想了解详情,请致电 400-188-3787 �系我们,或者留下您的�系方�和需求,我们会第一时间�系您。

    + 立�咨询 +
    + + + +<#include "/header/v5/_footer.ftl"/> + + + + + diff --git a/projects/fangjia-coresite/src/main/webapp/solution/api.ftl b/projects/fangjia-coresite/src/main/webapp/solution/api.ftl index bc3d737bb..3f12f34f2 100644 --- a/projects/fangjia-coresite/src/main/webapp/solution/api.ftl +++ b/projects/fangjia-coresite/src/main/webapp/solution/api.ftl @@ -198,19 +198,19 @@
    -
    +<#--
    --> -
    -
    -
    -

    -

    您还在为批�地�数�标准化烦�,您�通过在线方�申请测试数�或�系数�顾问,他们将�常��为您的数�需求�身定制�适的解决方案。

    -
    - -
    -
    +<#--
    --> +<#--
    --> +<#--
    --> +<#--

    --> +<#--

    您还在为批�地�数�标准化烦�,您�通过在线方�申请测试数�或�系数�顾问,他们将�常��为您的数�需求�身定制�适的解决方案。

    --> +<#--
    --> +<#--
    --> +<#-- 立�查看--> +<#--
    --> +<#--
    --> +<#--
    --> <#include "/header/v5/_footer.ftl"/> diff --git a/projects/fangjia-coresite/src/main/webapp/solution/appraisal.ftl b/projects/fangjia-coresite/src/main/webapp/solution/appraisal.ftl index 8dc59c316..a12a12f77 100644 --- a/projects/fangjia-coresite/src/main/webapp/solution/appraisal.ftl +++ b/projects/fangjia-coresite/src/main/webapp/solution/appraisal.ftl @@ -3,8 +3,8 @@ -贷�估值解决方案 - 房价网 fangjia.com - +押�价值管� - 房价网 fangjia.com + <#include "../jsconstants.ftl" /> @@ -30,20 +30,18 @@ <#include "/header/v5/_header.ftl"/> - -
    -

    您�通过在线方��系专业顾问,他们将�常��为您�供更多�务。

    - 立�咨询 +<#--
    --> +<#--

    您�通过在线方��系专业顾问,他们将�常��为您�供更多�务。

    --> +<#-- 立�咨询--> +<#--
    --> +
    +

    如想了解详情,请致电 400-188-3787 �系我们,或者留下您的�系方�和需求,我们会第一时间�系您。

    + 立�咨询
    -
    -
    -
    -
    -

    -

    欢迎亲自体验CPDB房产大数�库,您�通过在线方�申请测试数�或�系数�顾问,他们将�常��为您的数�需求�身定制�适的解决方案。

    -
    - -
    -
    + + +<#--
    --> +<#--
    --> +<#--
    --> +<#--

    --> +<#--

    欢迎亲自体验CPDB房产大数�库,您�通过在线方�申请测试数�或�系数�顾问,他们将�常��为您的数�需求�身定制�适的解决方案。

    --> +<#--
    --> +<#-- --> +<#--
    --> +<#--
    -->
    <#--
    申请贷款
    --> diff --git a/projects/fangjia-coresite/src/main/webapp/trend/trend.ftl b/projects/fangjia-coresite/src/main/webapp/trend/trend.ftl index ea155f653..d7bdff836 100644 --- a/projects/fangjia-coresite/src/main/webapp/trend/trend.ftl +++ b/projects/fangjia-coresite/src/main/webapp/trend/trend.ftl @@ -186,14 +186,14 @@
    -
    - +<#---->

    房价网��供关于�区或地�的全�数�,包�城市�区数�库�楼栋数�库,
    ��供超过70个字段的多维度数�,包��区信�,房产信�,周边信�以�关于�区和房产的数�分�等信�。

    @@ -386,7 +385,7 @@ $(document).ready(function(){ naver(); <#else> - var url = Constants.cityUrl + '/trend/yearData?defaultCityName=${cityName}&districtName=${districtName!}®ion=${region!}&block=${block!}&keyword=${keyword!}'; + var url = Constants.cityUrl + '/trend/quarterData?defaultCityName=${cityName}&districtName=${districtName!}®ion=${region!}&block=${block!}&keyword=${keyword!}'; $.getJSON(encodeURI(url), function(data) { createChart('container', data, false); diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictUpdateTaskDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictUpdateTaskDao.java index 3cae08b33..8af39b5f4 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictUpdateTaskDao.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictUpdateTaskDao.java @@ -22,4 +22,6 @@ public interface DistrictUpdateTaskDao extends MongoDao { void createTask(District district); + void createTask(District district, int status); + } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictUpdateTaskDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictUpdateTaskDaoImpl.java index f89522172..bbd3aec67 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictUpdateTaskDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictUpdateTaskDaoImpl.java @@ -72,7 +72,6 @@ public class DistrictUpdateTaskDaoImpl extends MongoDaoImpl task.setCreateDate(new Date()); task.setStatus(1); task.setType(4); - task.setRegion(district.getRegion()); task.setName(district.getName()); if ("district".equals(district.getCategory())) { if(StringUtils.isNotBlank(district.getEstateType2())){ @@ -86,7 +85,22 @@ public class DistrictUpdateTaskDaoImpl extends MongoDaoImpl this.save(task); } - - + + @Override + public void createTask(District district, int status) { + DistrictUpdateTask task = new DistrictUpdateTask(); + task.setCity(district.getCity()); + task.setRegion(district.getRegion()); + task.setCreateDate(new Date()); + task.setStatus(5); + task.setName(district.getName()); + if(district.getEstateType2().contains("±ðÊû")){ + task.setEstateType("villa"); + }else{ + task.setEstateType("district"); + } + this.save(task); + } + } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/NewResourceRecommendEnum.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/NewResourceRecommendEnum.java index 4eb63c496..e53f9ba4e 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/NewResourceRecommendEnum.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/NewResourceRecommendEnum.java @@ -28,8 +28,23 @@ public enum NewResourceRecommendEnum { FJT("1020", "·¿¼Ûͨ"), FANG_JIA_ZOU_SHI("1021", "·¿¼Û×ßÊÆ"), FDANG_DIAO_BAO_GAO("1022", "·¿µ÷±¨¸æ"), - FA_PAI_FANG("1023", "·¨ÅÄ·¿Êý¾Ý½â¾ö·½°¸"); - + FA_PAI_FANG("1023", "·¨ÅÄ·¿Êý¾Ý½â¾ö·½°¸"), + FINANCIAL_LEVEL("1024", "²ÆÁ¦ÆÀ¼¶½â¾ö·½°¸"), + + ADDRESS_PROCESS("1025", "µØÖ·Êý¾ÝÖÎÀí"), + ONE_HOUSE_ONE_PRICE("1026", "Ò»·¿Ò»¼Û"), + COMMUNITY_LEVEL("1027", "Â¥ÅÌÆÀ¼¶"), + DATA_POWER("1028", "Â¥ÅÌÆÀ¼¶"), + FUND("1029", "»¥½ð"), + COLLATERAL("1030", "ѺƷ¼ÛÖµ¹ÜÀí"), + CARD("1031", "ÐÅÓÿ¨"), + NET("1032", "Íøµã²¼¾Ö"), + GOV("1034", "Õþ¸®»ú¹¹"), + BOND("1033", "֤ȯ"), + COST("1035", "Ïû·Ñ½ðÈÚ"), + ZIXUN_APP("1036", "ÒµÎñ×Éѯapp"), + ARTICLE_APP("1037", "¹«ÖÚºÅÍÆÎÄ"), + MENU_APP("1038", "¹«ÖںŲ˵¥"); NewResourceRecommendEnum(String id, String value) { this.id = id; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/SalesLeadEnum.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/SalesLeadEnum.java index 54093da2f..3310d6a09 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/SalesLeadEnum.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/fangjia/enums/SalesLeadEnum.java @@ -24,11 +24,23 @@ public enum SalesLeadEnum { BUSINESS_ASK("1018", "ÒµÎñ×Éѯ"), HOUSE_EVAL("1019", "·¿²úÆÀ¹À"), DIDATA("1020", "µØÊýƽ̨"), - FA_PAI_FANG("1023", "·¨ÅÄ·¿Êý¾Ý½â¾ö·½°¸"); - - - - + FA_PAI_FANG("1023", "·¨ÅÄ·¿Êý¾Ý½â¾ö·½°¸"), + FINANCIAL_LEVEL("1024", "²ÆÁ¦ÆÀ¼¶½â¾ö·½°¸"), + + ADDRESS_PROCESS("1025", "µØÖ·Êý¾ÝÖÎÀí"), + ONE_HOUSE_ONE_PRICE("1026", "Ò»·¿Ò»¼Û"), + COMMUNITY_LEVEL("1027", "Â¥ÅÌÆÀ¼¶"), + DATA_POWER("1028", "Â¥ÅÌÆÀ¼¶"), + FUND("1029", "»¥½ð"), + COLLATERAL("1030", "ѺƷ¼ÛÖµ¹ÜÀí"), + CARD("1031", "ÐÅÓÿ¨"), + NET("1032", "Íøµã²¼¾Ö"), + GOV("1034", "Õþ¸®»ú¹¹"), + BOND("1033", "֤ȯ"), + COST("1035", "Ïû·Ñ½ðÈÚ"), + ZIXUN_APP("1036", "ÒµÎñ×Éѯapp"), + ARTICLE_APP("1037", "¹«ÖÚºÅÍÆÎÄ"), + MENU_APP("1038", "¹«ÖںŲ˵¥"); SalesLeadEnum(String id, String value) { this.id = id; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AverageStatistics.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AverageStatistics.java index 7b2405df1..da498918c 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AverageStatistics.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AverageStatistics.java @@ -166,6 +166,8 @@ public class AverageStatistics implements MongoEntity { private Double tsfhouseEsfDiff; private Integer tsfhouseNewPrice; private Double tsfhouseNewDiff; + /**¹úÐÅ´ï*/ + private Integer gxdEsfPrice; private String level;//¼Û¸ñÆÀ¼¶ private Integer lastAvgPrice;//×îÖÕ¼Û @@ -1155,4 +1157,13 @@ public class AverageStatistics implements MongoEntity { public void setTsfhouseNewDiff(Double tsfhouseNewDiff) { this.tsfhouseNewDiff = tsfhouseNewDiff; } + + @Column(name = "gxd_esf_price") + public Integer getGxdEsfPrice() { + return gxdEsfPrice; + } + + public void setGxdEsfPrice(Integer gxdEsfPrice) { + this.gxdEsfPrice = gxdEsfPrice; + } } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AvgBase.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AvgBase.java index 394785d9d..4d1c1dfbf 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AvgBase.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AvgBase.java @@ -30,9 +30,9 @@ public class AvgBase implements MongoEntity{ private String category; private Integer status; private String dateStr; - - private Integer isGuidancePrice; + private String source; + private String sourceCommName; @Id @GeneratedValue @@ -135,4 +135,22 @@ public class AvgBase implements MongoEntity{ public void setDateStr(String dateStr) { this.dateStr = dateStr; } + + @Column(name = "source") + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + + @Column(name = "source_comm_name") + public String getSourceCommName() { + return sourceCommName; + } + + public void setSourceCommName(String sourceCommName) { + this.sourceCommName = sourceCommName; + } } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictUpdateTask.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictUpdateTask.java index 337450c36..c9227c326 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictUpdateTask.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DistrictUpdateTask.java @@ -24,7 +24,7 @@ public class DistrictUpdateTask implements MongoEntity { private Integer type; private Date createDate; private Date processingTime; - private Integer status; + private Integer status; // 1£ºÉ¾³ý 2£ºÇøÓò£¬¸÷³ÆÐÞ¸Ä 3.¹ØÁªÉ¾³ý 4.ÎïÒµÀàÐÍÐÞ¸Ä 5:ÐÂÔöÐ¡Çø private String msg; private String estateType; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/CityInfo.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/CityInfo.java index 235e3a2ee..0270b441c 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/CityInfo.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/CityInfo.java @@ -51,6 +51,7 @@ public class CityInfo implements MongoEntity { private Double priceCreditGte66Coverage; private Double priceCreditGte60Coverage; private Double priceCreditGte00Coverage; + private Integer districtAliasTotalCount; @Id @GeneratedValue @@ -378,4 +379,13 @@ public class CityInfo implements MongoEntity { public void setPriceCreditGte00Coverage(Double priceCreditGte00Coverage) { this.priceCreditGte00Coverage = priceCreditGte00Coverage; } + + @Column(name = "district_alias_total_count") + public Integer getDistrictAliasTotalCount() { + return districtAliasTotalCount; + } + + public void setDistrictAliasTotalCount(Integer districtAliasTotalCount) { + this.districtAliasTotalCount = districtAliasTotalCount; + } } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java index adb32083b..ab018c2ac 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java @@ -347,6 +347,31 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i if(source.containsKey("status")){ seawater.setStatus(source.getInt("status")); } + + if(source.containsKey("lift")){ + seawater.setLift(source.getInt("lift")); + } + + if(source.containsKey("lift_household")){ + seawater.setLiftHousehold(source.getInt("lift_household")); + } + + if(source.containsKey("room_structure")){ + seawater.setRoomStructure(source.getString("room_structure")); + } + + if(source.containsKey("trade_property")){ + seawater.setTradeProperty(source.getString("trade_property")); + } + if(source.containsKey("property_ownership")){ + seawater.setPropertyOwnership(source.getString("property_ownership")); + } + if(source.containsKey("housing_age")){ + seawater.setHousingAge(source.getString("housing_age")); + } + if(source.containsKey("elevator")){ + seawater.setElevator(source.getString("elevator")); + } seawaterList.add(seawater); } return seawaterList; diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java index 1af563193..15176face 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java @@ -62,6 +62,13 @@ public class Seawater implements SeawaterEntity { private String purpose; private String estateType; private String buildType; + private Integer lift; + private Integer liftHousehold; + private String roomStructure;//»§Ðͽṹ + private String tradeProperty; //½»Ò×ȨÊô + private String propertyOwnership; //·¿È¨ËùÊô ·Ç¹²ÓÐ + private String housingAge; //·¿ÎÝÄêÏÞ Âú¶þÄê + private String elevator; //Å䱸µçÌÝ ÓÐ/ÎÞ @Id @Column(name = "_id") @@ -325,4 +332,67 @@ public class Seawater implements SeawaterEntity { public void setBuildType(String buildType) { this.buildType = buildType; } + + @Column(name = "lift") + public Integer getLift() { + return lift; + } + + public void setLift(Integer lift) { + this.lift = lift; + } + + @Column(name = "lift_household") + public Integer getLiftHousehold() { + return liftHousehold; + } + + public void setLiftHousehold(Integer liftHousehold) { + this.liftHousehold = liftHousehold; + } + + @Column(name = "room_structure") + public String getRoomStructure() { + return roomStructure; + } + + public void setRoomStructure(String roomStructure) { + this.roomStructure = roomStructure; + } + + @Column(name = "trade_property") + public String getTradeProperty() { + return tradeProperty; + } + + public void setTradeProperty(String tradeProperty) { + this.tradeProperty = tradeProperty; + } + + @Column(name = "property_ownership") + public String getPropertyOwnership() { + return propertyOwnership; + } + + public void setPropertyOwnership(String propertyOwnership) { + this.propertyOwnership = propertyOwnership; + } + + @Column(name = "housing_age") + public String getHousingAge() { + return housingAge; + } + + public void setHousingAge(String housingAge) { + this.housingAge = housingAge; + } + + @Column(name = "elevator") + public String getElevator() { + return elevator; + } + + public void setElevator(String elevator) { + this.elevator = elevator; + } } diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/model/District.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/model/District.java index e7c2195ef..2bb00ca36 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/model/District.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seaweed/model/District.java @@ -159,6 +159,9 @@ public class District implements SeaweedEntity { private String landCarSite;// µØÉϳµÎ»Êý private String undergroundCarSite;// µØÏ³µÎ»Êý + private String landFloor;// µØÉϲãÊý + private String undergroundFloor;// µØÏ²ãÊý + private String clearHeight;// ¾»¸ß private String standardHeight;// ±ê×¼²ã¸ß private String standardArea;// ±ê×¼²ãÃæ»ý @@ -1873,4 +1876,22 @@ public class District implements SeaweedEntity { public void setNameCat(Integer nameCat) { this.nameCat = nameCat; } + + @Column(name = "land_floor") + public String getLandFloor() { + return landFloor; + } + + public void setLandFloor(String landFloor) { + this.landFloor = landFloor; + } + + @Column(name = "underground_floor") + public String getUndergroundFloor() { + return undergroundFloor; + } + + public void setUndergroundFloor(String undergroundFloor) { + this.undergroundFloor = undergroundFloor; + } } 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 new file mode 100644 index 000000000..95d5b2ad4 --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java @@ -0,0 +1,264 @@ +package com.fangjia.open.controllers; + +import com.fangjia.core.util.HttpRequest; +import com.fangjia.open.dto.addressGovernance.*; +import com.fangjia.open.interceptors.Authority; +import com.fangjia.open.interceptors.Role; +import com.fangjia.open.model.AddesssMatchModel; +import com.fangjia.open.model.AddressModel; +import com.fangjia.open.model.BasicModel; +import com.fangjia.open.model.RestfulModelAndView; +import com.fangjia.open.util.CommonDtoUtils; +import net.sf.json.JSONObject; +import org.apache.commons.lang.StringUtils; + +import java.util.HashMap; +import java.util.Map; + +/** + * µØÖ·ÖÎÀí + * + * @author shenjian + * @since 2023/5/25 + */ +@Authority(role = Role.USER) +public class AddrSvcController { + + /** + * µØÖ·½á¹¹»¯ + * + * @param model + * @return + */ + public Object structureAction(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", model.getCity()); + params.put("address", model.getAddress()); + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structure/v2", params, "UTF-8"); + 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(CommonDtoUtils.transformV(StructureDto.class, json.get("result"))); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("·þÎñÉý¼¶ÖÐ...")); + } + } catch (Exception e) { + e.printStackTrace(); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("·þÎñÉý¼¶ÖÐ...")); + } + return mav; + } + + /** + * Çø»®Ê¶±ð½Ó¿Ú + * + * @param model + * @return + */ + public Object divisionAction(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", model.getCity()); + params.put("address", model.getAddress()); + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure/v2", params, "UTF-8"); + 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(CommonDtoUtils.transformV(DistrictIdentifyDto.class, json.get("result"))); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("·þÎñÉý¼¶ÖÐ...")); + } + } catch (Exception e) { + e.printStackTrace(); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("·þÎñÉý¼¶ÖÐ...")); + } + + + return mav; + } + + /** + * µØÖ·²¹È« + */ + public Object completeAction(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", model.getCity()); + params.put("address", model.getAddress()); + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structureAndComplete", params, "UTF-8"); + 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(CommonDtoUtils.transformV(StructureAndCompleteDto.class, json.get("result"))); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("·þÎñÉý¼¶ÖÐ...")); + } + } catch (Exception e) { + e.printStackTrace(); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("·þÎñÉý¼¶ÖÐ...")); + } + return mav; + } + + /** + * µØÖ·ÑéÖ¤ + */ + public Object addrVerifyAction(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", model.getCity()); + params.put("address", model.getAddress()); + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/addrVerify", params, "UTF-8"); + 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("·þÎñÉý¼¶ÖÐ...")); + } + } catch (Exception e) { + e.printStackTrace(); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("·þÎñÉý¼¶ÖÐ...")); + } + return mav; + } + + /** + * µØÖ·Æ¥Åä + */ + public Object matchAction(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", model.getCity()); + params.put("address", model.getAddress()); + params.put("category", model.getCategory()); + params.put("district", model.getSuggestDistrict()); + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/match", params, "UTF-8"); + 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(CommonDtoUtils.transformV(MatchedBuildingDto.class, json.get("result"))); + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("·þÎñÉý¼¶ÖÐ...")); + } + } catch (Exception e) { + e.printStackTrace(); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("·þÎñÉý¼¶ÖÐ...")); + } + + + return mav; + } + + /** + * µØÖ·ÁªÏë + */ + public Object suggestionAction(AddressModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getCity())) { + mav.setModel(BasicModel.buildBadRequestModel("³ÇÊв»ÄÜΪ¿Õ")); + return mav; + } + if (StringUtils.isBlank(model.getKeyword())) { + mav.setModel(BasicModel.buildBadRequestModel("¹Ø¼ü×Ö²»ÄÜΪ¿Õ")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("city", model.getCity()); + params.put("region", model.getRegion()); + params.put("keywords", model.getKeyword()); + params.put("page", "0"); + params.put("size", String.valueOf(model.getMax() == 0 ? 20 : (model.getMax() > 100 ? 100 : model.getMax()))); + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/addressAssociation2", params, "UTF-8"); + if (json != null) { + int code = json.getInt("status"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if (json.containsKey("result")) { + JSONObject result = (JSONObject.fromObject(json.get("result"))); + if (result.getInt("totalElements") > 0) { + basicModel.setResult(CommonDtoUtils.transformListV(DistrictDto.class, result.getJSONArray("content"))); + } + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("·þÎñÉý¼¶ÖÐ...")); + } + } catch (Exception e) { + e.printStackTrace(); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("·þÎñÉý¼¶ÖÐ...")); + } + return mav; + } +} 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 e11dc5cbb..cf00f9e9c 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 @@ -1,6 +1,24 @@ package com.fangjia.open.controllers; import com.fangjia.core.util.*; +import com.fangjia.open.model.*; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; + +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.lucene.index.Term; +import org.apache.lucene.search.BooleanClause.Occur; +import org.apache.lucene.search.BooleanQuery; +import org.apache.lucene.search.TermQuery; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Row; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import com.fangjia.dal.QueryParam; import com.fangjia.dal.SdQuery; import com.fangjia.dal.SrQuery; @@ -91,6 +109,8 @@ public class AddressController { 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 @@ -496,8 +516,65 @@ public class AddressController { } 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) { - jsonResult.put("matchResult", new MatchDistrictResult()); + // ÅжÏÊÇ·ñΪ×ÔÈ»´å + 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); @@ -893,6 +970,68 @@ public class AddressController { 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(); + } + /** * ¼ÓÔØ²âÊÔÊý¾Ý * @@ -1699,6 +1838,7 @@ public class AddressController { 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){ @@ -1723,6 +1863,44 @@ public class AddressController { 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; + } + /** * Îå¼¶µØÖ·±ê×¼»¯½Ó¿Ú * @@ -1902,6 +2080,163 @@ public class AddressController { 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())) { @@ -2988,20 +3323,26 @@ public class AddressController { 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++) { - String address = poisData.getJSONObject(i).getString("address"); - if (address.contains(searchKey.toString())) { - resultMap.put("riskLevel", "A"); - resultModel.setResult(resultMap); - mav.setModel(resultModel); - return mav; - } else { - continue; - } +// JSONObject jsonObject = addressMatchProxyService.searchByAmap(searchAddress.getString("city"), model.getAddress()); +// JSONArray poisData = jsonObject.getJSONArray("pois"); +// for (int i = 0; i < poisData.size(); i++) { +// String address = poisData.getJSONObject(i).getString("address"); +// if (address.contains(searchKey.toString())) { +// resultMap.put("riskLevel", "A"); +// resultModel.setResult(resultMap); +// mav.setModel(resultModel); +// return mav; +// } else { +// 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"); } - resultMap.put("riskLevel", "B"); resultModel.setResult(resultMap); mav.setModel(resultModel); return mav; @@ -3018,6 +3359,44 @@ public class AddressController { 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; + + } catch (HttpRequestException e) { + e.printStackTrace(); + } + return Collections.emptyList(); + } + public void setAddressService(AddressService addressService) { this.addressService = addressService; } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/MeishubaoController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/MeishubaoController.java new file mode 100644 index 000000000..20ea36e9c --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/MeishubaoController.java @@ -0,0 +1,61 @@ +package com.fangjia.open.controllers; + +import com.fangjia.core.util.HttpRequest; +import com.fangjia.open.interceptors.Authority; +import com.fangjia.open.interceptors.Role; +import com.fangjia.open.model.AddesssMatchModel; +import com.fangjia.open.model.BasicModel; +import com.fangjia.open.model.RestfulModelAndView; +import net.sf.json.JSONObject; +import org.apache.commons.lang.StringUtils; + +import java.util.HashMap; +import java.util.Map; + +@Authority(role = Role.USER) +public class MeishubaoController { + + /** + * ÏêϸµØÖ·±ê×¼»¯½Ó¿Ú + * + * @param model + * @return + */ + public Object financialRatingAction(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", model.getCity()); + params.put("address", model.getAddress()); + try{ + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/meishubao/financialRating", params, "UTF-8"); + } catch(Exception e){ + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/meishubao/financialRating", 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; + } + +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/DistrictDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/DistrictDto.java new file mode 100644 index 000000000..cc71dcf21 --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/DistrictDto.java @@ -0,0 +1,50 @@ +package com.fangjia.open.dto.addressGovernance; + +public class DistrictDto { + + private String province; + private String city; + private String region; + private String name; + private String address; + + 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 getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } +} \ No newline at end of file diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/DistrictIdentifyDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/DistrictIdentifyDto.java new file mode 100644 index 000000000..03301c218 --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/DistrictIdentifyDto.java @@ -0,0 +1,101 @@ +package com.fangjia.open.dto.addressGovernance; + +/** + * Çø»®Ê¶±ðDTO + * + * @author shenjian + * @since 2023/5/25 + */ +public class DistrictIdentifyDto { + + private String province; + private String provinceCode; + private String city; + private String cityCode; + private String district; + private String districtCode; + private String township; + private String townshipCode; + private String community; + private String communityCode; + + public String getProvince() { + return province; + } + + public void setProvince(String province) { + this.province = province; + } + + public String getProvinceCode() { + return provinceCode; + } + + public void setProvinceCode(String provinceCode) { + this.provinceCode = provinceCode; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getCityCode() { + return cityCode; + } + + public void setCityCode(String cityCode) { + this.cityCode = cityCode; + } + + public String getDistrict() { + return district; + } + + public void setDistrict(String district) { + this.district = district; + } + + public String getDistrictCode() { + return districtCode; + } + + public void setDistrictCode(String districtCode) { + this.districtCode = districtCode; + } + + public String getTownship() { + return township; + } + + public void setTownship(String township) { + this.township = township; + } + + public String getTownshipCode() { + return townshipCode; + } + + public void setTownshipCode(String townshipCode) { + this.townshipCode = townshipCode; + } + + public String getCommunity() { + return community; + } + + public void setCommunity(String community) { + this.community = community; + } + + public String getCommunityCode() { + return communityCode; + } + + public void setCommunityCode(String communityCode) { + this.communityCode = communityCode; + } +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/MatchedBuildingDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/MatchedBuildingDto.java new file mode 100644 index 000000000..e666a9100 --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/MatchedBuildingDto.java @@ -0,0 +1,128 @@ +package com.fangjia.open.dto.addressGovernance; + +/** + * µØÖ·Æ¥ÅäDTO + */ +public class MatchedBuildingDto { + + /** + * ID + */ + private String id; + /** + * ÖÃÐÅ¶È + */ + private Double credit; + /** + * ³ÇÊÐ + */ + private String city; + /** + * ÇøÓò + */ + private String district; + /** + * ÏçÕò½ÖµÀ + */ + private String township; + /** + * ½¨ÖþÎïÃû³Æ + */ + private String name; + /** + * ½¨ÖþÎïµØÖ· + */ + private String address; + /** + * ¾­¶È(¸ßµÂ) + */ + private Double lng; + /** + * γ¶È(¸ßµÂ) + */ + private Double lat; + /** + * ÎïÒµÀàÐÍ + */ + private String propertyType; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Double getCredit() { + return credit; + } + + public void setCredit(Double credit) { + this.credit = credit; + } + + 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; + } + + public String getTownship() { + return township; + } + + public void setTownship(String township) { + this.township = township; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public Double getLng() { + return lng; + } + + public void setLng(Double lng) { + this.lng = lng; + } + + public Double getLat() { + return lat; + } + + public void setLat(Double lat) { + this.lat = lat; + } + + public String getPropertyType() { + return propertyType; + } + + public void setPropertyType(String propertyType) { + this.propertyType = propertyType; + } +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureAndCompleteDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureAndCompleteDto.java new file mode 100644 index 000000000..6407c8ce9 --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureAndCompleteDto.java @@ -0,0 +1,203 @@ +package com.fangjia.open.dto.addressGovernance; + +/** + * µØÖ·²¹È«DTO + * + * @author shenjian + * @since 2023/5/25 + */ +public class StructureAndCompleteDto { + + /** + * Ê¡·Ý + */ + private String province; + /** + * ³ÇÊÐ + */ + private String city; + /** + * ÇøÓò + */ + private String district; + /** + * ¿ª·¢Çø + */ + private String dev; + /** + * ÏçÕò½ÖµÀ + */ + private String township; + /** + * µÀ· + */ + private String street; + /** + * ·ºÅ + */ + private String streetNumber; + /** + * ¾Óί´åί + */ + private String community; + /** + * ´å×é + */ + private String group; + /** + * Ãû³Æ + */ + private String name; + /** + * Â¥¶° + */ + private String buildingNumber; + /** + * µ¥Ôª + */ + private String unitNumber; + /** + * Â¥²ã + */ + private String floor; + /** + * ÊҺŠ+ */ + private String roomNumber; + /** + * ¸ñʽ»¯µØÖ· + */ + private String formatAddress; + /** + * µØÖ·ÑéÖ¤ + */ + private String addrVerify; + + 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; + } + + public String getDev() { + return dev; + } + + public void setDev(String dev) { + this.dev = dev; + } + + public String getTownship() { + return township; + } + + public void setTownship(String township) { + this.township = township; + } + + public String getStreet() { + return street; + } + + public void setStreet(String street) { + this.street = street; + } + + public String getStreetNumber() { + return streetNumber; + } + + public void setStreetNumber(String streetNumber) { + this.streetNumber = streetNumber; + } + + public String getCommunity() { + return community; + } + + public void setCommunity(String community) { + this.community = community; + } + + public String getGroup() { + return group; + } + + public void setGroup(String group) { + this.group = group; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getBuildingNumber() { + return buildingNumber; + } + + public void setBuildingNumber(String buildingNumber) { + this.buildingNumber = buildingNumber; + } + + public String getUnitNumber() { + return unitNumber; + } + + public void setUnitNumber(String unitNumber) { + this.unitNumber = unitNumber; + } + + public String getFloor() { + return floor; + } + + public void setFloor(String floor) { + this.floor = floor; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getFormatAddress() { + return formatAddress; + } + + public void setFormatAddress(String formatAddress) { + this.formatAddress = formatAddress; + } + + public String getAddrVerify() { + return addrVerify; + } + + public void setAddrVerify(String addrVerify) { + this.addrVerify = addrVerify; + } +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureDto.java new file mode 100644 index 000000000..f2ca60475 --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/dto/addressGovernance/StructureDto.java @@ -0,0 +1,191 @@ +package com.fangjia.open.dto.addressGovernance; + +/** + * µØÖ·½á¹¹»¯,Çë²»ÒªÔö¼ÓÆäËû×ֶΣ¬ÓëÎĵµ¼°µØÊýÊä³öÒ»Ö + * + * @author shenjian + * @since 2023/5/25 + */ +public class StructureDto { + + /** + * Ê¡·Ý + */ + private String province; + /** + * ³ÇÊÐ + */ + private String city; + /** + * ÇøÓò + */ + private String district; + /** + * ¿ª·¢Çø + */ + private String dev; + /** + * ÏçÕò½ÖµÀ + */ + private String township; + /** + * µÀ· + */ + private String street; + /** + * ·ºÅ + */ + private String streetNumber; + /** + * ¾Óί´åί + */ + private String community; + /** + * ´å×é + */ + private String group; + /** + * Ãû³Æ + */ + private String name; + /** + * Â¥¶° + */ + private String buildingNumber; + /** + * µ¥Ôª + */ + private String unitNumber; + /** + * Â¥²ã + */ + private String floor; + /** + * ÊҺŠ+ */ + private String roomNumber; + /** + * µØÖ·ÑéÖ¤ + */ + private String addrVerify; + + 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; + } + + public String getDev() { + return dev; + } + + public void setDev(String dev) { + this.dev = dev; + } + + public String getTownship() { + return township; + } + + public void setTownship(String township) { + this.township = township; + } + + public String getStreet() { + return street; + } + + public void setStreet(String street) { + this.street = street; + } + + public String getStreetNumber() { + return streetNumber; + } + + public void setStreetNumber(String streetNumber) { + this.streetNumber = streetNumber; + } + + public String getCommunity() { + return community; + } + + public void setCommunity(String community) { + this.community = community; + } + + public String getGroup() { + return group; + } + + public void setGroup(String group) { + this.group = group; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getBuildingNumber() { + return buildingNumber; + } + + public void setBuildingNumber(String buildingNumber) { + this.buildingNumber = buildingNumber; + } + + public String getUnitNumber() { + return unitNumber; + } + + public void setUnitNumber(String unitNumber) { + this.unitNumber = unitNumber; + } + + public String getFloor() { + return floor; + } + + public void setFloor(String floor) { + this.floor = floor; + } + + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getAddrVerify() { + return addrVerify; + } + + public void setAddrVerify(String addrVerify) { + this.addrVerify = addrVerify; + } +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/AuthenticationInterceptor.java b/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/AuthenticationInterceptor.java index 5733be72d..eff33a38f 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/AuthenticationInterceptor.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/interceptors/AuthenticationInterceptor.java @@ -213,7 +213,7 @@ public class AuthenticationInterceptor implements Interceptor { if (null == apiUser) { return ret; } - if(apiUser.getDeadTime() != null && new Date().after(apiUser.getDeadTime())){ + if(apiUser.getDeadTime() != null && DateUtil.truncateDay(new Date()).after(apiUser.getDeadTime())){ return new HttpCode(OpenHttpCodeEnum.USER_EXPIRED); } if(!isOldUser(apiUser) && isExpired(token)){ 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 e1048387a..ea10ab2f4 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 @@ -22,6 +22,8 @@ public class AddesssMatchModel extends FangjiaApiModel { private String address_1; private String address_2; + private String showCode; + public String getAddress_1() { return address_1; } @@ -134,4 +136,12 @@ public class AddesssMatchModel extends FangjiaApiModel { public void setDebugName(String debugName) { this.debugName = debugName; } + + public String getShowCode() { + return showCode; + } + + public void setShowCode(String showCode) { + this.showCode = showCode; + } } 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 8c41c06ab..529d42d07 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 @@ -23,6 +23,7 @@ public class AddressModel extends FangjiaApiModel { private String preciseLevel; private String province; private String district; + private String region; private String chooseId; @@ -36,6 +37,9 @@ public class AddressModel extends FangjiaApiModel { private Integer pageNo; // ÊÇ·ñÓÃÓÚ¼ì²é private String dataLevel; + + private String keyword; + public boolean isContainsLocation() { return containsLocation; } @@ -228,5 +232,20 @@ public class AddressModel extends FangjiaApiModel { public void setDataLevel(String dataLevel) { this.dataLevel = dataLevel; } - + + public String getKeyword() { + return keyword; + } + + public void setKeyword(String keyword) { + this.keyword = keyword; + } + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommunitySummaryRequestDto.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommunitySummaryRequestDto.java new file mode 100644 index 000000000..c5af8f307 --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/CommunitySummaryRequestDto.java @@ -0,0 +1,89 @@ +package com.fangjia.open.model; + + +/** + * Ð¡Çø¿í±íÈë²ÎDTO + * + * @author shenjian + * @since 2022/10/11 + */ +public class CommunitySummaryRequestDto extends FangjiaApiModel { + + /** + * ³ÇÊÐ + */ + private String city; + + /** + * µØÖ· + */ + private String address; + + /** + * ×ÜÂ¥²ã + */ + private Integer maxFloor; + + /** + * Ãæ»ý + */ + private Float area; + + /** + * ·¿ÎÝÓÃ; + */ + private String housePurpose; + + /** + * ±¸×¢ + */ + private String memo; + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public Integer getMaxFloor() { + return maxFloor; + } + + public void setMaxFloor(Integer maxFloor) { + this.maxFloor = maxFloor; + } + + public Float getArea() { + return area; + } + + public void setArea(Float area) { + this.area = area; + } + + public String getHousePurpose() { + return housePurpose; + } + + public void setHousePurpose(String housePurpose) { + this.housePurpose = housePurpose; + } + + public String getMemo() { + return memo; + } + + public void setMemo(String memo) { + this.memo = memo; + } +} diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/util/CommonDtoUtils.java b/projects/fangjia-open/src/main/java/com/fangjia/open/util/CommonDtoUtils.java new file mode 100644 index 000000000..bebd942e0 --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/util/CommonDtoUtils.java @@ -0,0 +1,41 @@ +package com.fangjia.open.util; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; + +import java.util.List; + +/** + * ͨÓÃʵÌåÓëDTO»¥Ïàת»»¹¤¾ßÀà + * + * @author shenjian + * @date 2021/06/16 + */ +public class CommonDtoUtils { + public static T transformV(Class targetClass, Object source) { + if (source == null) { + return null; + } else { + try { + String jsonSource = JSON.toJSONString(source); + return JSONObject.parseObject(jsonSource, targetClass); + } catch (Exception var3) { + return null; + } + } + } + + public static List transformListV(Class targetClass, List listSource) { + if (listSource == null) { + return null; + } else { + try { + String jsonSource = JSON.toJSONString(listSource); + return JSONArray.parseArray(jsonSource, targetClass); + } catch (Exception var3) { + return null; + } + } + } +} \ No newline at end of file diff --git a/projects/fangjia-script/pom.xml b/projects/fangjia-script/pom.xml index 9469b6d02..cd1282a81 100644 --- a/projects/fangjia-script/pom.xml +++ b/projects/fangjia-script/pom.xml @@ -171,6 +171,11 @@ ojdbc14 10.2.0.4.0 + + org.postgresql + postgresql + 42.2.1 + com.yahoo.platform.yui yuicompressor @@ -428,11 +433,17 @@ javadbf 1.9.2 - + + + ru.yandex.clickhouse + clickhouse-jdbc + 0.2.6 + + com.alibaba fastjson diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ExportAvgPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ExportAvgPrice.groovy index e85c93bdd..fb9821df4 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ExportAvgPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/avgprice/ExportAvgPrice.groovy @@ -30,12 +30,12 @@ public class ExportAvgPrice { DSCollection dataStoreConnection = null; static main(args) { def task = new ExportAvgPrice(); - def weekends = ["2019-1-1","2019-2-1","2019-3-1","2019-4-1","2019-5-1","2019-6-1","2019-7-1","2019-8-1", "2019-9-1","2019-10-1","2019-11-1","2019-12-1","2020-1-1","2020-2-1","2020-3-1","2020-4-1","2020-5-1","2020-6-1","2020-7-1","2020-8-1", "2020-9-1","2020-10-1","2020-11-1","2020-12-1","2021-1-1","2021-2-1","2021-3-1","2021-4-1","2021-5-1","2021-6-1","2021-7-1","2021-8-1", "2021-9-1","2021-10-1"]; - def citys = ["ÎÂÖÝ"];//findAllCity(); -// task.exportAllCity(citys, weekends, "e:\\È«¹ú³ÇÊм¾¶È¾ù¼Û.csv"); - task.exportRegion(citys, weekends, "d:\\ÎÂÖÝÇøÓò¼¾¶È¾ù¼Û.csv"); + def weekends = ["2023-04-01","2023-03-01","2023-02-01","2023-01-01","2022-12-01","2022-11-01","2022-10-01","2022-09-01","2022-08-01","2022-07-01","2022-06-01","2022-05-01","2022-04-01","2022-03-01","2022-02-01","2022-01-01","2021-12-01","2021-11-01","2021-10-01","2021-09-01","2021-08-01","2021-07-01","2021-06-01","2021-05-01","2021-04-01"] + def citys = ["ÉϺ£"];//findAllCity(); +// task.exportAllCity(citys, weekends, "D:\\Êý¾Ý\\Ð¡Çø\\È«¹ú³ÇÊм¾¶È¾ù¼Û.csv"); +// task.exportRegion(citys, weekends, "D:\\Êý¾Ý\\Ð¡Çø\\ÇøÓò¼¾¶È¾ù¼Û.csv"); // task.exportBlock(citys, weekends, "e:\\ÇøÓò°å¿é¼¾¶È¾ù¼Û.csv"); -// task.exportDistrict(citys, weekends, "e:\\Ð¡Çø¼¾¶È¾ù¼Û.csv"); + task.exportDistrict(citys, weekends, "D:\\Êý¾Ý\\Ð¡Çø\\Ð¡Çø¼¾¶È¾ù¼Û.csv"); // task.exportRegionPrice("½­ËÕ"); } @@ -182,6 +182,7 @@ public class ExportAvgPrice { q.put("visible", 0); q.put("cat", "district"); q.put("city", city); +// q.put("name", "Áú°Ø¶þ´å") DSCursor cursor = getDataStoreConnection().find(q).sort(new BasicDBObject('bscore', -1)); Iterator iters = cursor.iterator() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddSzDealData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddSzDealData.groovy new file mode 100644 index 000000000..f34d40421 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddSzDealData.groovy @@ -0,0 +1,68 @@ +package com.fangjia.script.ccbevaluation + +import com.fangjia.script.util.DateUtils +import com.fangjia.script.util.ExcelUtils +import com.fangjia.script.util.MongoUtils +import com.mongodb.BasicDBObject +import com.mongodb.DBCollection + +/** + * ÉîÛÚ¹«Öںųɽ»Êý¾Ý¼Èë + */ +def datas = ExcelUtils.read("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\³É½»\\ÉîÛÚ4Ô·ݶþÊÖ·¿³É½»Êý¾Ý»ã×Ü.xls", 0, 1) +def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; +DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) + +//ûÓгɽ»Ê±¼ä£¬Ëæ»úÉú³É +//for(def d : datas){ +// def map = new BasicDBObject() +// map.city = "ÉîÛÚ" +// map.district_name = d['D'] +// map.region = d['B'] +// def roomStr = d['E'] +// if(roomStr){ +// def arrs = roomStr.split("-") +// try{ +// map.room = arrs[0].toString().toInteger() +// }catch(Exception e){ +// println "room error" +// } +// map.hall = arrs[1].toString().toInteger() +// map.toilet = arrs[3].toString().toInteger() +// } +// +// map.area = d['F'].toString().toDouble() +// map.total_price = (int)(d['G'].toString().toDouble().toInteger()*10000) +// map.avg_price = (int)(d['H'].toString().toDouble()*10000) +// def trade_date = DateUtils.getRandomDate("2023-04-01", "2023-04-30") +// map.trade_date = DateUtils.parseFromTightByPattern(trade_date, "yyyy-MM-dd") +// map.source = "Éî·¿¼Ò×å" +// map.create_date = new Date() +// map.m_date = new Date() +// DEAL_PRICE_COLL.save(map) +//} + + + +for(def d : datas){ + def map = new BasicDBObject() + map.city = "ÉîÛÚ" + map.district_name = d['D'] + map.region = d['B'] + def roomStr = d['E'] + if(roomStr){ + map.room = roomStr.toString().toDouble().toInteger() + } + + map.area = d['F'].toString().toDouble() + map.total_price = (int)(d['G'].toString().toDouble().toInteger()*10000) + map.avg_price = (int)(d['H'].toString().toDouble()) + map.sell_price = (int)(d['I'].toString().toDouble()*10000) + def trade_date = d['J'] + map.trade_date = trade_date + map.source = "Éî·¿¼Ò×å" + map.create_date = new Date() + map.m_date = new Date() + DEAL_PRICE_COLL.save(map) +} + diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddThirdPartyPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddThirdPartyPrice.groovy new file mode 100644 index 000000000..ca14ea514 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/AddThirdPartyPrice.groovy @@ -0,0 +1,88 @@ +package com.fangjia.script.ccbevaluation + +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.gj.ccb.FileUtils +import com.fangjia.script.util.DateUtils +import groovy.sql.Sql +import org.bson.types.ObjectId + +class AddThirdPartyPrice { + + public static def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.94:1521:orcl", + "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") + + static main(args) { + def task = new AddThirdPartyPrice() + task.run() + } + + def run(){ +// + def citys = ["ÁÖÖ¥","º£Î÷ÖÝ","ÌìÃÅ","´óÐ˰²Áë","ÙÙÖÝ","º×¸Ú","ÈÕ¿¦Ôò","ͳ·¬", "°¢ÀÕÌ©","µÏÇìÖÝ","DZ½­","Ëþ³Ç","¿Ë×ÎÀÕËÕ","ºÍÌï","¼ÎÓø¹Ø"] + def rows = [] + def cityCodeDatas = CcbCommonUtils.findCityCodeValue() + for(def c : citys){ + println c +" "+cityCodeDatas.get(c) + def dists = CcbCommonUtils.findAllDistrictByCity(c, "district", ["city", "region", "name","name_cat", "estate_type2","lng"]) + def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(c) + def rets = createDate(dists, distCodeMap) + println dists.size() +" "+rets.size() + if(rets){ + rows.addAll(rets) + } + } + + def fileName = "/home/goojia/ccb/BIGDATA_THIRD_PARTY_PRICE_GJ.dat" + if(CommonDatautils.isWindow()){ + fileName = "d:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\BIGDATA_THIRD_PARTY_PRICE_GJ.dat" + } + + def header = [] + FileUtils.batchCreateFile(rows, fileName, header, "utf-8", false); + } + + def createDate(dists, distCodeMap){ + def cityCodeDatas = CcbCommonUtils.findCityCodeValue() + + def results = [] + for(def d : dists){ + + def cityId = cityCodeDatas.get(d.city) + def data = distCodeMap.get(d.region) + def avgPrice = findGuidedPrice(cityId, d._id.toString()) + if(!avgPrice){ + def dbo = CommonDatautils.queryHouseCalutePrice(d.city, d.region, d.name, DateUtils.parseFromTightYYYYMMDD("2022-05-01")) + if(dbo){ + avgPrice = dbo.avg_price + } + } + if(avgPrice){ + def ret = [] + ret << new ObjectId().toString() + ret << cityId + ret << data.district_code + ret << d._id.toString() + ret << d.name + ret << "18" + ret << "21ÊÀ¼Í" + ret << 202209 + ret << avgPrice + ret << "" + ret << "" + ret << DateUtils.formatDateByPattern(new Date(), "yyyy-MM-dd") + results << ret + } + } + return results; + } + + + def findGuidedPrice(cityId, commid){ + def sql = "select avg_price from guided_price_gj where cityid='${cityId}' and commid='${commid}' and dealdate>=to_date('2022-01-01','yyyy-MM-dd')" + def avg_price = null + sqlInstance.eachRow(sql,{r-> + avg_price = r.avg_price + }); + return avg_price + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataBuildingBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataBuildingBatch.groovy index 3b92e612c..431972b91 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataBuildingBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataBuildingBatch.groovy @@ -23,7 +23,7 @@ class BigdataBuildingBatch extends BaseBatch{ @Override public void process(Object args) { - def citys = CcbCommonUtils.citys_all; + def citys = CcbCommonUtils.getRunningCitys(args) def rows = [] def headers = [] for (def city : citys) { @@ -36,7 +36,7 @@ class BigdataBuildingBatch extends BaseBatch{ def distMap = getDistrictMap(city) def rets = createCityDatas(cityCodeDatas, distCodeMap, distMap, buildingMap) println city + " " + rets.size() - def fileName = "/home/goojia/ccb/bigdata_building_fjw.dat" + def fileName = "/ccb/bigdata_building_fjw.dat" if(CommonDatautils.isWindow()){ fileName = "d:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\bigdata_building_fjw.dat" } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommbuildtypeBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommbuildtypeBatch.groovy index 066318e29..61bd39b7e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommbuildtypeBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommbuildtypeBatch.groovy @@ -7,6 +7,7 @@ import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.gj.ccb.CcbCodeUtils import com.fangjia.script.gj.ccb.FileUtils import com.fangjia.script.util.DateUtils +import groovy.sql.Sql import java.util.concurrent.CountDownLatch import java.util.concurrent.ExecutorService @@ -22,6 +23,9 @@ class BigdataCommbuildtypeBatch extends BaseBatch{ public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(40) + def sqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse?stringtype=unspecified", + "postgres", "postgres", "org.postgresql.Driver") + static main(args) { runBatch(new BigdataCommbuildtypeBatch(), args); } @@ -29,14 +33,14 @@ class BigdataCommbuildtypeBatch extends BaseBatch{ @Override public void process(Object args) { def citys = CcbCommonUtils.getRunningCitys(args) - citys = citys.unique() def rets = [] def cityCodeDatas = CcbCommonUtils.findCityCodeValue() for(def city : citys){ // def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) // def dists = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city", "region", "name", "estate_type2","name_cat","build_type", "lng","c_date", "m_date"]) - def distIds = CcbCommonUtils.findAllDistrictIdsByOracle(cityCodeDatas.get(city)); +// def distIds = CcbCommonUtils.findAllDistrictIdsByOracle(cityCodeDatas.get(city)); + def distIds = PgsqlCommUtils.findAllDistrictIdsByOracle(cityCodeDatas.get(city)) def rows = createDatas(cityCodeDatas.get(city), distIds) rets.addAll(rows) println city +" "+rows.size() @@ -50,7 +54,10 @@ class BigdataCommbuildtypeBatch extends BaseBatch{ def headers = []//["³ÇÊÐID","Ð¡ÇøID"," ½¨ÖþÀàÐÍ","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾","Êý¾Ýʱ¼ä"] FileUtils.batchCreateFile(rets, fileName,headers, "utf-8", false); - println "txt Éú³É" + println "txt Éú³É->µ¼Oracle" + + delPgData() + saveToPgSql(rets) } @@ -103,4 +110,40 @@ class BigdataCommbuildtypeBatch extends BaseBatch{ } return rets; } + + def delPgData(){ + sqlInstance.execute("delete from base.t0831_bigdata_commbuildtype_gj_h") + println "base.t0831_bigdata_commbuildtype_gj_h Êý¾ÝÒÑɾ³ý" + } + + + def saveToPgSql(rows){ + def sqls = [] + for(def r : rows) { + for (def i = 0; i < r.size(); i++) { + if("" == r[i]){ + r[i] = null + } + } + r << null + r << DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-28" + r << null + r << '2999-12-31' + r << null + r << null + r << null + } + + def sql = "insert into base.t0831_bigdata_commbuildtype_gj_h values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)" + println "start: "+new Date() + def index =0 + sqlInstance.withBatch(20000, sql){ ps-> + for(def r : rows) { + index++ + println index + ps.addBatch(r[0], r[1], r[2], r[3], r[4], r[5], r[6], r[7], r[8], r[9], r[10], r[11], r[12], r[13], r[14]) + } + } + println "end: "+new Date() + } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy index fafe61ba9..c52b21fcb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataCommunityBatch.groovy @@ -12,6 +12,7 @@ import com.fangjia.script.gj.district.FangjiaClientUtils import com.fangjia.script.util.DateUtils import com.fangjia.script.util.ExcelUtils import com.fangjia.script.util.OpenApiClient +import groovy.sql.Sql import java.util.concurrent.CopyOnWriteArrayList import java.util.concurrent.CountDownLatch @@ -28,7 +29,10 @@ import java.util.regex.Pattern @BatchOwner(Watcher.GaoJuan) class BigdataCommunityBatch extends BaseBatch{ - public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20) + public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(10) + + def sqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse?stringtype=unspecified", + "postgres", "postgres", "org.postgresql.Driver") static main(args) { runBatch(new BigdataCommunityBatch(), args); @@ -37,7 +41,6 @@ class BigdataCommunityBatch extends BaseBatch{ @Override public void process(Object args) { def citys = CcbCommonUtils.getRunningCitys(args) - def rows = [] def headers = []//["³ÇÊÐID","ÐÐÕþÇøID","Ð¡ÇøID","ÐÐÕþÇøÃû³Æ","Ð¡ÇøÃû³Æ","ÏêϸµØÖ·","γ¶È","¾­¶È","Õ¼µØ×ÜÃæ»ý","½¨Öþ×ÜÃæ»ý","ÂÌ»¯ÂÊ","ÈÝ»ýÂÊ","³µÎ»ÊýÁ¿","½¨ÖþÄê´ú","·¿ÎÝÓÃ;", @@ -51,9 +54,10 @@ class BigdataCommunityBatch extends BaseBatch{ index ++ def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) - def dists = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city","region", "name", "address","lat", "lng","all_area","build_area","virescence_percent","cubage_percent","car_site_count","finish_building_date","estate_type2","household_count","status","c_date","m_date","name_cat"]) + def dists = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city","region", "name", "address","lat", "lng","all_area","build_area","virescence_percent","cubage_percent","car_site_count","finish_building_date","estate_type2","household_count","status","c_date","m_date","name_cat","street","street_number"]) - def ccbMaps = CcbCommonUtils.findCcbDistrict(cityCodeDataMap.get(city)) +// def ccbMaps = CcbCommonUtils.findCcbDistrict(cityCodeDataMap.get(city)) //Èںϵ¼ÊýʱʹÓà + def ccbMaps = CcbCommonUtils.findPgCcbDistrict(cityCodeDataMap.get(city)) //¹ÀÖµµ¼ÊýʱʹÓà def rets = createCityDatas(cityCodeDataMap, distCodeMap, dists) rets = addDeleteDist(dists, ccbMaps, rets) rows.addAll(rets) @@ -71,8 +75,16 @@ class BigdataCommunityBatch extends BaseBatch{ allDatas << headers allDatas.addAll(rows) FileUtils.batchCreateFile(rows, fileName,headers, "utf-8", false); - println "txt Éú³É" - // ExcelUtils.write("d:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\excel\\bigdata_community.xlsx", allDatas, "Êý¾Ý") + println "txt Éú³É->µ¼Oracle" + + + delPgData() + saveToPgSql(rows) + +// ExcelUtils.write("d:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\excel\\bigdata_community.xlsx", allDatas, "Êý¾Ý") +// def datas = readTxt("d:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\BIGDATA_COMMUNITY_GJ.dat") +// delPgData() +// saveToPgSql2(datas) } def addDeleteDist(dists, ccbMaps, rets){ @@ -169,31 +181,39 @@ class BigdataCommunityBatch extends BaseBatch{ ret << CcbCodeUtils.parseBuildYear(dist.finish_building_date) ret << CcbCodeUtils.parseHouseUse(dist.estate_type2) ret << dist.household_count - ret << DateUtils.formatDateByPattern(new Date(),"yyyyMMdd") + ret << DateUtils.formatDateByPattern(new Date(),"yyyyMMdd").toInteger() ret << dist.status ret << DateUtils.formatDateByPattern(dist.m_date, "yyyy-MM-dd HH:mm:ss") ret << "pa101" ret << "" if(dist.address){ - def jsonObj = null - if(dist.address){ - jsonObj = FangjiaClientUtils.addressStructure(dist.city, dist.address) - } - if(jsonObj && jsonObj.result && jsonObj.result.street){ - if(jsonObj.result.street){ - ret << jsonObj.result.street - }else{ - ret << "" - } - - if(jsonObj.result.streetNumber){ - ret << jsonObj.result.streetNumber + if(dist.street){ + ret << dist.street + if(dist.street_number){ + ret << dist.street_number }else{ ret << "" } }else{ ret << "" ret << "" +// def jsonObj = FangjiaClientUtils.addressStructure(dist.city, dist.address) +// if(jsonObj && jsonObj.result && jsonObj.result.street){ +// if(jsonObj.result.street){ +// ret << jsonObj.result.street +// }else{ +// ret << "" +// } +// +// if(jsonObj.result.streetNumber){ +// ret << jsonObj.result.streetNumber +// }else{ +// ret << "" +// } +// }else{ +// ret << "" +// ret << "" +// } } }else{ ret << "" @@ -214,4 +234,99 @@ class BigdataCommunityBatch extends BaseBatch{ } return ret; } + + def delPgData(){ + sqlInstance.execute("delete from base.t0831_bigdata_community_gj_h") + println "base.t0831_bigdata_community_gj_h Êý¾ÝÒÑɾ³ý" + } + + def saveToPgSql(rows){ + for(def r : rows) { + for (def i = 0; i < r.size(); i++) { + if("" == r[i]){ + r[i] = null + } + } + r << null + r << DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-28" + r << null + r << '2999-12-31' + r << null + r << null + r << null + } + + println "start: "+new Date() + def sql = "insert into base.t0831_bigdata_community_gj_h values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)" + + sqlInstance.withBatch(50000, sql){ ps-> + for(def r : rows) { + try{ + ps.addBatch(r[0], r[1], r[2], r[3], r[4], r[5], r[6], r[7], r[8], r[9], r[10], r[11], r[12], r[13], r[14], r[15], r[16], r[17], r[18], r[19], r[20], + r[21], r[22], r[23], r[24], r[25], r[26], r[27], r[28], r[29], r[30], r[31], r[32], r[33], r[34], r[35], r[36], r[37], r[38]) + ps.toString() + }catch(Exception e){ + e.printStackTrace() + } + } + } + + println "end: "+new Date() + } + + def saveToPgSql2(rows){ + def newRows = [] + for(def r : rows) { + def newR = [] + for (def i = 0; i < r.size(); i++) { + if("" == r[i]){ +// r[i] = null + newR << null + }else{ + newR << r[i] + } + } + newR << null + newR << DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-28" + newR << null + newR << '2999-12-31' + newR << null + newR << null + newR << null + + newRows << newR + } + + println "start: "+new Date() + def sql = "insert into base.t0831_bigdata_community_gj_h values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)" + + def index = 0 + sqlInstance.withBatch(10000, sql){ ps-> + for(def r : newRows) { + index++ + try{ + ps.addBatch(r[0], r[1], r[2], r[3], r[4], r[5], r[6], r[7], r[8], r[9], r[10], r[11], r[12], r[13], r[14], r[15], r[16], r[17], r[18], r[19], r[20], + r[21], r[22], r[23], r[24], r[25], r[26], r[27], r[28], r[29], r[30], r[31], r[32], r[33], r[34], r[35], r[36], r[37], r[38]) + index + }catch(Exception e){ + e.printStackTrace() + } + } + } + + println "end: "+new Date() + } + + + def readTxt(def fileName){ + File file = new File(fileName); + def rows = []; + + file.eachLine{ + def row = it.split("\\|@\\|") + rows << row + } + return rows; + } + } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataDealBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataDealBatch.groovy index 789603d29..6854ae591 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataDealBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataDealBatch.groovy @@ -33,8 +33,8 @@ import java.util.regex.Pattern @BatchOwner(Watcher.GaoJuan) class BigdataDealBatch extends BaseBatch{ -// def startDate = 202206 -// def endDate = 202208 + def startDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -3, "yyyyMM")); + def endDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); def curDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMMdd"), -1, "yyyyMMdd")); public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(30) @@ -50,6 +50,9 @@ class BigdataDealBatch extends BaseBatch{ def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") + def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse?stringtype=unspecified", + "postgres", "postgres", "org.postgresql.Driver") + static main(args) { runBatch(new BigdataDealBatch(), args); } @@ -58,11 +61,11 @@ class BigdataDealBatch extends BaseBatch{ public void process(Object args) { //def weekend = DateUtils.parseFromTightByPattern("2021-07-25","yyyy-MM-dd")//DateUtils.getFirstDayOfWeek(new Date()) // def citys = CcbCommonUtils.citys; - def citys = ["ÉϺ£"]//CcbCommonUtils.getRunningCitys(args) + def citys = CcbCommonUtils.getRunningCitys(args) if(args && args.size()>=2){ curDate = args[1].toString().toInteger() } - + println "curDate:"+curDate // for(def city : citys){ //// if(!ccbCitys.contains(city)){ // addDealPriceMatch(city); @@ -85,15 +88,17 @@ class BigdataDealBatch extends BaseBatch{ println city +" "+youdaDatas.size() } - def trades = getCityData(city, statMap, ppeDists) - def rets = createData(trades, cityCodeDataMap, distCodeMap, "other") - rows.addAll(rets) - println "¡¾${index}¡¿"+city +" ³É½»¹²£º"+rets.size() + if(trades){ + def rets = createData(trades, cityCodeDataMap, distCodeMap, "other") + rows.addAll(rets) + println "¡¾${index}¡¿"+city +" ³É½»¹²£º"+rets.size() + + def cityDatas = [] + cityDatas << headers + cityDatas.addAll(rows) + } - def cityDatas = [] - cityDatas << headers - cityDatas.addAll(rows) } def fileName = "/home/goojia/ccb/BIGDATA_DEAL_GJ.dat" @@ -101,8 +106,10 @@ class BigdataDealBatch extends BaseBatch{ fileName = "d:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\BIGDATA_DEAL_GJ.dat" } - FileUtils.batchCreateFile(rows, fileName,headers, "utf-8", true); + FileUtils.batchCreateFile(rows, fileName,headers, "utf-8", false); println "txt Éú³É " + rows.size() + + saveToPgSql(rows) } def createData(def rets, cityCodeDatas, distCodeMap, source){ @@ -111,8 +118,10 @@ class BigdataDealBatch extends BaseBatch{ final CountDownLatch latch = new CountDownLatch(rets.size()) // def lianjiaPriceMap = findThirdPartyPrice("ÉϺ£") - def startDate = DateUtils.parseFromTightByPattern(DateUtils.addMonth(new Date(),-2),'yyyy-MM-dd') - def lianjiaPriceMap = getDistrictStatByCity("ÉϺ£", startDate) +// def startDate = DateUtils.parseFromTightByPattern(DateUtils.addMonth(new Date(),-2),'yyyy-MM-dd') +// def lianjiaPriceMap = getDistrictStatByCity("ÉϺ£", startDate) + + def ccbPriceMap = getCommunityPrices("ÉϺ£") for(def i=0;i + for(def r : rows) { + ps.addBatch(r[0], r[1], r[2], r[3], r[4], r[5], r[6], r[7], r[8], r[9], r[10], r[11], r[12], r[13], r[14], r[15], r[16], r[17], r[18], r[19], r[20], + r[21], r[22], r[23], r[24], r[25], r[26], r[27], r[28], r[29], r[30], r[31], r[32], r[33], r[34], r[35], r[36], r[37], r[38], r[39], + r[40], r[41], r[42], r[43], r[44], r[45], r[46], r[47], r[48], r[49],r[50], r[51], r[52], r[53], r[54], r[55], r[56], r[57], r[58], r[59], + r[60], r[61], r[62], r[63], r[64], r[65], r[66], r[67], r[68], r[69],r[70], r[71]) + } + } + + println "end: "+new Date() + } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataForsaleBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataForsaleBatch.groovy index 5b0edbae1..f4e661538 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataForsaleBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/BigdataForsaleBatch.groovy @@ -10,6 +10,7 @@ import com.fangjia.script.util.DateUtils import com.fangjia.script.util.ElasticUtils import com.fangjia.script.util.ExcelUtils import com.fangjia.script.util.FangJiaAreaMapUtils +import com.google.common.hash.* import com.mongodb.BasicDBObject import com.mongodb.DBObject import groovy.sql.Sql @@ -20,7 +21,9 @@ import org.elasticsearch.index.query.QueryBuilder import org.elasticsearch.index.query.QueryBuilders import org.elasticsearch.xpack.sql.jdbc.EsDataSource +import java.nio.charset.StandardCharsets import java.util.concurrent.ConcurrentHashMap +import java.util.concurrent.CopyOnWriteArrayList import java.util.concurrent.CountDownLatch import java.util.concurrent.ExecutorService import java.util.concurrent.Executors @@ -57,27 +60,38 @@ class BigdataForsaleBatch extends BaseBatch{ public static final String[] TAGS = ["¶À¶°", "ÁªÅÅ", "µþ¼Ó", "˫ƴ", "»¨Ô°Ãæ»ý", "Ó¾³Ø", "±ðÊû", "´ø»¨Ô°", "Ñó·¿", "µþÆ´", "¶ÀÔº", "ÁªÌå", "΢Êû", "´óƽÊû"]; public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(60) + public static ExecutorService fixedThreadPool2 = Executors.newFixedThreadPool(200) + + def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") + def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse?stringtype=unspecified", + "postgres", "postgres", "org.postgresql.Driver") + static main(args) { runBatch(new BigdataForsaleBatch(), args); } @Override public void process(Object args) { + //Ŀǰ²éѯ¿âÖÐÊÇ·ñÒÑ´æÔÚ£¬ÓõÄÊÇOracle def index = 0 def citys = CcbCommonUtils.getRunningCitys(args) - statCity(citys) + def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() + + + def houseIdsfilter = findAllHouseIdsByCity() + for(def city : citys){ index++ // def distIds = getDistrictIds(cityCodeDataMap.get(city)) + def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) def districts = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city", "region", "name", "lng","estate_type2","name_cat","address", "alias", "finish_building_date", "house_property", "property_life", "build_type", "build_structure"]); - exportSellCSV(index, city, cityCodeDataMap, distCodeMap, districts, 20220918, 20221019); -// exportSellCSV(index, city, cityCodeDataMap, distCodeMap, districts, 20211001, 20221011); -// exportSellCSV(index, city, cityCodeDataMap, distCodeMap, districts, 20210801, 20210831); +// exportSellCSV(index, city, cityCodeDataMap, distCodeMap, districts, 20230118, 20230219); + exportSellCSV(index, city, cityCodeDataMap, distCodeMap, districts, 20230418, 20230519, houseIdsfilter); //²âÊÔͨ¹ýÆ¥Åä½Ó¿ÚÅ䷿ԴЧ¹û // exportSellCSV(index, city, cityCodeDataMap, distCodeMap, districts, 20201201, 20211118) } @@ -100,12 +114,41 @@ class BigdataForsaleBatch extends BaseBatch{ } } - def exportSellCSV(index,city, cityCodeDataMap, distCodeMap, districts, startDate, endDate){ + def exportSellCSV(index,city, cityCodeDataMap, distCodeMap, districts, startDate, endDate, houseIdsfilter){ + def retMap = findAllCommHouse(index,city, cityCodeDataMap, distCodeMap, districts, startDate, endDate, houseIdsfilter) + println city + "(Ô­)·¿Ô´×ÜÁ¿£º"+retMap.size() + + def allDatas = retMap.values() +// // allDatas = repeatHouseId(allDatas) +// println city + "(ÐÂ)·¿Ô´×ÜÁ¿£º"+allDatas.size() + + + def fileName = "/home/goojia/ccb/BIGDATA_FORSALE_GJ.dat" + if(CommonDatautils.isWindow()){ + fileName = "d:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\BIGDATA_FORSALE_GJ.dat" + } + + + // def allDatas = createSellDatas(city, retMap.values()); + + def headers = [] +// if(index == 1){ +// headers = ["³ÇÊÐID","³öÊÛID","¹ÒÅÆ·¿ÎÝID","³ÇÊÐÃû³Æ","ÐÐÕþÇøID","ÐÐÕþÇøÃû³Æ","Ð¡ÇøID","Ð¡ÇøÃû³Æ","Â¥¶°ID","Â¥¶°±àºÅ","Â¥¶°Ãû³Æ","µ¥ÔªID","µ¥Ôª±àºÅ","µ¥ÔªÃû³Æ","»§ID","ÏêϸµØÖ·","½¨ÖþÄê´ú","ȨÊô","ȨÊôÄêÏÞ","µ¥¼Û","×ܼÛ","³öÊÛ¸¶¿î·½Ê½","ËùÔÚÂ¥²ã","×ÜÂ¥²ã","½¨ÖþÀàÐÍ","ÊÒÄڽṹ","½¨Öþ½á¹¹","½¨ÖþÃæ»ý","Ì×ÄÚÃæ»ý","»§ÐÍ","ÊÒ","Ìü","³ø","ÎÀ","³¯Ïò","×°ÐÞÇé¿ö","ÊÇ·ñÓеçÌÝ","¼¸Ìݼ¸»§","·¢²¼Ê±¼ä","µ½ÆÚʱ¼ä","ÊÇ·ñÊ×·¢","·¿Ô´Êý¾ÝÀ´Ô´","Öн鹫˾ID","Öн鹫˾Ãû³Æ","·¢²¼ÈË","·¢²¼È˵绰","ÃèÊöÐÅÏ¢","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾","¸½¼ÓÐÅÏ¢"] +// } + FileUtils.batchCreateFile(allDatas, fileName, headers, "utf-8", true); + println "txtÎļþÉú³É->ÊÖ¶¯µ¼Èëµ½Oracle " + + saveToPgSql(allDatas) + } + + def findAllCommHouse(index,city, cityCodeDataMap, distCodeMap, districts, startDate, endDate, houseIdsfilter){ def totalCount = new AtomicLong() final CountDownLatch latch = new CountDownLatch(districts.size()) println city +" Ð¡ÇøÁ¿£º"+districts.size() + + def retMap = new ConcurrentHashMap() for(def i=0;i1000){ + continue + } + + if(seawater.avg_price && seawater.avg_price<10){ + continue + } + + } + rowMap.houseId = seawater.id + rowMap.city = CcbCommonUtils.getCcbCity(city) + //rowMap.region =seawater.region + //rowMap.address = seawater.address + + + rowMap.area = seawater.area + rowMap.total_price = seawater.total_price + rowMap.avg_price = seawater.avg_price + rowMap.height = seawater.height=="null"?null:seawater.height + if(rowMap.height && rowMap.height<1){ + rowMap.height = null + } + rowMap.floor = floor=="null"?null:floor + rowMap.room = seawater.room=="null"?null:seawater.room + rowMap.hall = seawater.hall=="null"?null:seawater.hall + rowMap.toilet = seawater.toilet=="null"?null:seawater.toilet + if(CcbCommonUtils.rootMap.get(seawater.root)){ + rowMap.root = CcbCommonUtils.rootMap.get(seawater.root) + }else{ + rowMap.root = "99" + } + + def direction = parseDirection(seawater.direction) + rowMap.direction = direction=="null"?null:direction + + def fitment = parseFitment(seawater.fitment) + rowMap.fitment = fitment=="null"?null:fitment + + if(seawater.p_date instanceof String){ + seawater.p_date = seawater.p_date.toInteger() + } + if(seawater.p_date<=20200101){ + //seawater.p_date.toString().replace("2019","2020")// + rowMap.p_date = DateUtils.getRandomDate("2020-01-01", "2020-07-31") + rowMap.c_date = rowMap.p_date + rowMap.m_date = rowMap.p_date + }else{ + rowMap.p_date = DateUtils.formatDateByPattern(DateUtils.parseFromTightYYYYMMDD2(seawater.p_date.toString()), "yyyy-MM-dd HH:mm:ss") + rowMap.c_date = DateUtils.getConverDate(seawater.m_date) + rowMap.m_date = DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-18 10:00:00"//DateUtils.getConverDate(seawater.m_date) + } + + rets << rowMap + +// if(houseIds.contains(seawater.id)){ +// println seawater.id +" ÒÑ´æÔÚ" +// }else{ +// rets << rowMap +// } + +// def count = isExistFromHouse(seawater.id) +// if(count){ +// println seawater.id +" ÒÑ´æÔÚ" +// }else{ +// rets << rowMap +// } + + } + } + + println name +" "+houses.size()+" last:"+rets.size() + return rets; + } + + + def findHousesByMdate(def city, def region, def cat, def startDate, def endDate, def name, def alias, def estate_type2, rets1){ + def date = DateUtils.addMonth(endDate.toString(), -3, "yyyyMMdd") + def startMdate = DateUtils.parseFromTightByPattern(date,"yyyyMMdd") + def endMdate = DateUtils.parseFromTightByPattern(endDate.toString(), "yyyyMMdd") + + QueryBuilder date_range = QueryBuilders.rangeQuery("p_date").from(date.toInteger()).to(endDate).includeLower(false).includeUpper(false); + QueryBuilder area_range = QueryBuilders.rangeQuery("area").from(20).to(500).includeLower(true).includeUpper(false); + + + QueryBuilder date_range_mdate = QueryBuilders.rangeQuery("m_date").from(startMdate.getTime()).to(endMdate.getTime()).includeLower(true).includeUpper(false); + + QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("city", city)).must(QueryBuilders.termQuery("region", region)).must(QueryBuilders.termQuery("cat", cat)) + .must(date_range).must(area_range).must(date_range_mdate) + + if(!alias){ + alias = [] + } + if(!alias.contains(name)){ + alias.add(name) + } + + + if(name.contains("ÅªÐ¡Çø")){ + def newName = name.replace("ÅªÐ¡Çø","Ū") + if(!alias.contains(newName)){ + alias << newName + } + } + + if(alias && alias.size()>0){ + BoolQueryBuilder inBuilder = QueryBuilders.boolQuery(); + for(def s : alias){ + inBuilder.should(QueryBuilders.matchQuery("district_name", s)); + } + queryBuilder.must(inBuilder) + } + + def hosts = ["192.168.0.206","192.168.0.211","192.168.0.212","192.168.0.213","192.168.0.214","192.168.0.215"] + def index = new Random().nextInt(6); + + def rets = [] + def houses = ElasticUtils.executeSimpleQuery(hosts[index], "seawater-20*", queryBuilder); + + if(houses){ + + def ids = new HashSet() + for(def h : rets1){ + ids << h.houseId + } + for (int k=0;k60){ + continue; + } + +// if(!seawater.room){ +// continue; +// } + if(!seawater.room){ + seawater.room = null + } + + if(seawater.room){ + if(seawater.room>=11 || seawater.room<1){ + continue; + } + } + + if(!seawater.hall){ + seawater.hall = null + } + if(seawater.hall && (seawater.hall>=5 || seawater.hall<1)){ + continue; + } + if(!seawater.toilet){ + seawater.toilet = null + } + if(seawater.toilet && (seawater.toilet>=5 || seawater.toilet<1)){ + continue; + } + + + def floor = parseFloor(seawater.floor_info) + if(seawater.height && floor && floor.isNumber()){ + if(floor.toInteger()>seawater.height){ + floor = null + seawater.height = null + } + + } + + if(!floor){ + seawater.floor = null + } + if(floor && floor.toInteger()<1){ + floor = null + } + def rowMap = [:]; if(cat == "rent"){ rowMap.rent_type = seawater.rent_type @@ -584,8 +887,6 @@ class BigdataForsaleBatch extends BaseBatch{ def fitment = parseFitment(seawater.fitment) rowMap.fitment = fitment=="null"?null:fitment - - if(seawater.p_date instanceof String){ seawater.p_date = seawater.p_date.toInteger() } @@ -597,10 +898,23 @@ class BigdataForsaleBatch extends BaseBatch{ }else{ rowMap.p_date = DateUtils.formatDateByPattern(DateUtils.parseFromTightYYYYMMDD2(seawater.p_date.toString()), "yyyy-MM-dd HH:mm:ss") rowMap.c_date = DateUtils.getConverDate(seawater.m_date) - rowMap.m_date = DateUtils.getConverDate(seawater.m_date) + rowMap.m_date = DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-18 10:00:00"//DateUtils.getConverDate(seawater.m_date) } rets << rowMap + +// if(houseIds.contains(seawater.id)){ +// println seawater.id +" ÒÑ´æÔÚ" +// }else{ +// rets << rowMap +// } + +// def count = isExistFromHouse(seawater.id) +// if(count){ +// println seawater.id +" ÒÑ´æÔÚ" +// }else{ +// rets << rowMap +// } } } @@ -756,12 +1070,6 @@ class BigdataForsaleBatch extends BaseBatch{ } - /* - * Éú³ÉÒ»¸öÓò»Öظ´µÄID - */ - def GenNonDuplicateID(randomLength){ - return Number(Math.random().toString().substr(3,randomLength) + Date.now()).toString(36) - } @@ -784,14 +1092,71 @@ class BigdataForsaleBatch extends BaseBatch{ println ids.size() } - def getDistrictIds(def cityid){ - def sql = "SELECT commid FROM bigdata_forsale WHERE cityid = '"+cityid+"'"; + def getAllHouseIds(def commid, def cityCode){ + def sql = "SELECT FORSALEID FROM bigdata_forsale_gj WHERE cityid='"+cityCode+"' and commid = '"+commid+"'"; - def distIds = new HashSet() + def houseIds = new HashSet() sqlInstance.eachRow(sql,{it-> - distIds << it.commid + houseIds << it.FORSALEID }); - return distIds; + return houseIds; + } + + def findAllHouseIdsByCity(){ + // ´´½¨²¼Â¡¹ýÂËÆ÷¶ÔÏó + BloomFilter filter = BloomFilter.create(Funnels.stringFunnel(StandardCharsets.UTF_8), 200000000, 0.000001); +// def houseIds = new HashSet() + pgsqlInstance.eachRow("SELECT gujia_sell_id FROM base.t0831_bigdata_forsale_gj_h",{it-> + filter.put(it.gujia_sell_id) + }); + + pgsqlInstance.eachRow("SELECT gujia_sell_id FROM base.t0831_bigdata_forsale_gj_h_2021",{it-> + filter.put(it.gujia_sell_id) + }); + return filter; + } + + + def isExistFromHouse(def houseId){ + def sql = "SELECT count(FORSALEID) as count FROM bigdata_forsale_gj WHERE FORSALEID = '"+houseId+"'"; + + def count = null + sqlInstance.eachRow(sql,{it-> + count = it.count + }); + return count; + } + + + def saveToPgSql(rows){ + for(def r : rows) { + for (def i = 0; i < r.size(); i++) { + if("" == r[i]){ + r[i] = null + } + } + r << null + r << DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-28" + r << null + r << '2999-12-31' + r << null + r << null + r << null + } + + println "start: "+new Date() + def sql = "insert into base.t0831_bigdata_forsale_gj_h values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)" + + pgsqlInstance.withBatch(20000, sql){ ps-> + for(def r : rows) { + ps.addBatch(r[0], r[1], r[2], r[3], r[4], r[5], r[6], r[7], r[8], r[9], r[10], r[11], r[12], r[13], r[14], r[15], r[16], r[17], r[18], r[19], r[20], + r[21], r[22], r[23], r[24], r[25], r[26], r[27], r[28], r[29], r[30], r[31], r[32], r[33], r[34], r[35], r[36], r[37], r[38], r[39], r[40], + r[41], r[42], r[43], r[44], r[45], r[46], r[47], r[48], r[49], r[50], r[51], r[52], r[53], r[54], r[55], r[56], r[57], r[58]) + ps.toString() + } + } + + println "end: "+new Date() } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbCommonUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbCommonUtils.groovy index 46aa81fac..465eac28c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbCommonUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbCommonUtils.groovy @@ -16,7 +16,8 @@ import groovy.sql.Sql class CcbCommonUtils { // - public static def citys_all = [ "³¤´º","ÉϺ£","ÑïÖÝ","±±¾©","ÖØÇì","Ìì½ò","³É¶¼","ÉòÑô","´óÁ¬","°²Çì","Î÷Äþ","ÈÕÕÕ","Î人","Î÷°²","ËÕÖÝ","¹ãÖÝ","ÄϾ©","Çൺ","¼ÃÄÏ","Äþ²¨","³¤É³","ʯ¼Òׯ","·ðɽ","¼ÎÐË","Òø´¨","ÄÏͨ","ÀÈ·»","ÖÐɽ","Ö£ÖÝ","¹þ¶û±õ","ÑĮ̀","ÐìÖÝ","ÉÜÐË","ÏÃÃÅ","À¥Ã÷","Äϲý","¹óÑô","Ö麣","¶«Ý¸","Õò½­","ÂåÑô","ÎÂÖÝ","À¼ÖÝ","¸£ÖÝ","»ÝÖÝ","ºôºÍºÆÌØ","³£ÖÝ","ÌÆÉ½","»´°²","ºþÖÝ","¾Å½­","̫ԭ","±±º£","ÖêÖÞ","×Ͳ©","ÑγÇ","ÎÚ³ľÆë","º£¿Ú","ÄÏÄþ","³£µÂ","̨ÖÝ","½ð»ª","¼ªÁÖ","ÔÀÑô","ÁøÖÝ","ÇåÔ¶","Õ¿½­","ÕżҿÚ","±£¶¨","ÉîÛÚ","º¼ÖÝ","ºÏ·Ê","ÎÞÎý","ȪÖÝ","×ñÒå","ÕØÇì","ÕÄÖÝ","Ò˲ý","Îߺþ","Ì©ÖÝ","ÉÇÍ·","ÈýÑÇ","ÇØ»Êµº","Âí°°É½","Á¬ÔƸÛ","²×ÖÝ","À­Èø","½õÖÝ","´óͬ","ÎIJý","±£Í¤","ÁêË®","Ϋ·»","ÁÙÒÊ","ºªµ¦","¼ÃÄþ","Íþº£","ÃàÑô","÷ÖÝ","ƽ¶¥É½","½­ÃÅ","¸ÓÖÝ","Ì©°²","ÏåÑô","ÄÏÑô","¹ðÁÖ","ÁijÇ","ÁÙ·Ú","µÂÖÝ","ÉÌÇð","ºâÑô","ËÞǨ","°üÍ·","μÄÏ","ÏÌÑô","Ðí²ý","±õÖÝ","ÐĮ̈","Äϳä","°²Ñô","ÐÂÏç","Ôæ×¯","³üÖÝ","ÁúÑÒ","±¦¼¦","ÐÅÑô","Ô˳Ç","ºâË®","¶«Óª","½úÖÐ","Т¸Ð","³¤ÖÎ","¸·Ñô","ÉØ¹Ø","ºÊÔó","µÂÑô","ÄþµÂ","¾£ÖÝ","ÀÖɽ","פÂíµê","ÄÏÆ½","ººÖÐ","ÓÜÁÖ","ÒË´º","°°É½","¿ª·â","ÖÜ¿Ú","Ë绯","ÏæÌ¶","»Æ¸Ô","³ÐµÂ","½¹×÷","ĵµ¤½­","ÆÎÌï","ÉÏÈÄ","üɽ","ÆëÆë¹þ¶û","³»ÖÝ","Óª¿Ú","°ö²º","´óÇì","³à·å","ºÓÔ´","ÂÀÁº","ËìÄþ","äðºÓ","ÈýÃ÷","ïÃû","å§Ñô","Çú¾¸","ƽÁ¹","¶õ¶û¶à˹","Ê®Ñß","¼ª°²","»ÆÊ¯","¼Ñľ˹","ÈýÃÅÏ¿","½ÒÑô","ÐÃÖÝ","ͨÁÉ","ãòÖÝ","Áù°²","³±ÖÝ","áéÖÝ","»´ÄÏ","¾£ÃÅ","ÓÀÖÝ","ºôÂ×±´¶û","ºù«µº","µ¤¶«","ÑÓ±ß","Ðû³Ç","Ò˱ö","ÇìÑô","½ú³Ç","Ñô½­","ËÞÖÝ","ÑÓ°²","ÏÌÄþ","»³»¯","»ÆÉ½","ÖÛɽ","ÉÇβ","Å̽õ","³¯Ñô","ÀöË®","¸§ÖÝ","ÌúÁë","ºìºÓ","¤ÄÏ","¹ã°²","¸§Ë³","×Ô¹±","´ïÖÝ","ÓñÁÖ","ÓñϪ","°×Òø","ÙñÖÝ","ÉÛÑô","¹ãÔª","²ý¼ª","ÒæÑô","ÕÅÒ´","¦µ×","ÑôȪ","ÌìË®","ËæÖÝ","Ë·ÖÝ","´óÀí","ͨ»¯","³þÐÛ","°ÍÑåÄ×¶û","ÎÚÀ¼²ì²¼","ÐÂÓà","¾°µÂÕò","ËÉÔ­","ÁÉÑô","¸·ÐÂ","¾ÆÈª","Ç­ÄÏ","»´±±","ËÄÆ½","ÎàÖÝ","Ç­¶«ÄÏ","°ÍÖÐ","º×±Ú","¼¦Î÷","ÄÚ½­","ÇÕÖÝ","³ØÖÝ","ÏÉÌÒ","¶÷Ê©","±¾Ïª","×ÊÑô","ÁùÅÌË®","°ÙÉ«","°×³Ç","ÁÙÏÄ","ÒÁÀç","¹ó¸Û","°×ɽ","˫Ѽɽ","ÎâÖÒ","¶õÖÝ","Àö½­","°²¿µ","±Ï½Ú","ÔÆ¸¡","°ÍÒô¹ùÀã","°²Ë³","°¢¿ËËÕ","ºÚºÓ","Í­Áê","ÑŰ²","ʯ×ìɽ","ƼÏç","º×¸Ú","ÎýÁÖ¹ùÀÕÃË","Í­ÈÊ","·À³Ç¸Û","¿¦Ê²","Ð˰²ÃË","ºÓ³Ø","Í­´¨","ÆÕ¶ý","±£É½","Á¹É½ÖÝ","ӥ̶","¶¨Î÷","ÒÁ´º","ÖÐÎÀ","Ç­Î÷ÄÏ","ÉÌÂå","ÎÚº£","ÎäÍþ","º£Î÷ÖÝ","À´±ö","ÕÑͨ","ÏæÎ÷","¹þÃÜ","Õżҽç","Î÷Ë«°æÄÉÖÝ","Æß̨ºÓ","¹ÌÔ­","ÅÊÖ¦»¨","µÂºêÖÝ","³ç×ó","ÁÉÔ´","¼ÎÓø¹Ø","¿ËÀ­ÂêÒÀ","ÁÙ²×","DZ½­","ºØÖÝ","ÌìÃÅ","º£¶«","Ëþ³Ç","ÙÙÖÝ","½ð²ý","²©¶ûËþÀ­","ͳ·¬","´óÐ˰²Áë","°¢ÀÕÌ©","ºÍÌï","µÏÇìÖÝ","ÈÕ¿¦Ôò","ÁÖÖ¥","°¢°ÓÖÝ","°¢À­ÉÆÃË","°¢Àï","²ý¶¼","¸ÊÄÏ","¸Ê×ÎÖÝ","¹ûÂåÖÝ","º£±±ÖÝ","º£ÄÏÖÝ","»ÆÄÏÖÝ","¿Ë×ÎÀÕËÕ","ÄÇÇú","Å­½­ÖÝ","Èýɳ","ɽÄÏ","ÉñÅ©¼Ü","ÎÄɽÖÝ","ÓñÊ÷ÖÝ"] +// public static def citys_all = [ "ÉϺ£","³¤´º","ÑïÖÝ","±±¾©","ÖØÇì","Ìì½ò","³É¶¼","ÉòÑô","´óÁ¬","°²Çì","Î÷Äþ","ÈÕÕÕ","Î人","Î÷°²","ËÕÖÝ","¹ãÖÝ","ÄϾ©","Çൺ","¼ÃÄÏ","Äþ²¨","³¤É³","ʯ¼Òׯ","·ðɽ","¼ÎÐË","Òø´¨","ÄÏͨ","ÀÈ·»","ÖÐɽ","Ö£ÖÝ","¹þ¶û±õ","ÑĮ̀","ÐìÖÝ","ÉÜÐË","ÏÃÃÅ","À¥Ã÷","Äϲý","¹óÑô","Ö麣","¶«Ý¸","Õò½­","ÂåÑô","ÎÂÖÝ","À¼ÖÝ","¸£ÖÝ","»ÝÖÝ","ºôºÍºÆÌØ","³£ÖÝ","ÌÆÉ½","»´°²","ºþÖÝ","¾Å½­","̫ԭ","±±º£","ÖêÖÞ","×Ͳ©","ÑγÇ","ÎÚ³ľÆë","º£¿Ú","ÄÏÄþ","³£µÂ","̨ÖÝ","½ð»ª","¼ªÁÖ","ÔÀÑô","ÁøÖÝ","ÇåÔ¶","Õ¿½­","ÕżҿÚ","±£¶¨","ÉîÛÚ","º¼ÖÝ","ºÏ·Ê","ÎÞÎý","ȪÖÝ","×ñÒå","ÕØÇì","ÕÄÖÝ","Ò˲ý","Îߺþ","Ì©ÖÝ","ÉÇÍ·","ÈýÑÇ","ÇØ»Êµº","Âí°°É½","Á¬ÔƸÛ","²×ÖÝ","À­Èø","½õÖÝ","´óͬ","ÎIJý","±£Í¤","ÁêË®","Ϋ·»","ÁÙÒÊ","ºªµ¦","¼ÃÄþ","Íþº£","ÃàÑô","÷ÖÝ","ƽ¶¥É½","½­ÃÅ","¸ÓÖÝ","Ì©°²","ÏåÑô","ÄÏÑô","¹ðÁÖ","ÁijÇ","ÁÙ·Ú","µÂÖÝ","ÉÌÇð","ºâÑô","ËÞǨ","°üÍ·","μÄÏ","ÏÌÑô","Ðí²ý","±õÖÝ","ÐĮ̈","Äϳä","°²Ñô","ÐÂÏç","Ôæ×¯","³üÖÝ","ÁúÑÒ","±¦¼¦","ÐÅÑô","Ô˳Ç","ºâË®","¶«Óª","½úÖÐ","Т¸Ð","³¤ÖÎ","¸·Ñô","ÉØ¹Ø","ºÊÔó","µÂÑô","ÄþµÂ","¾£ÖÝ","ÀÖɽ","פÂíµê","ÄÏÆ½","ººÖÐ","ÓÜÁÖ","ÒË´º","°°É½","¿ª·â","ÖÜ¿Ú","Ë绯","ÏæÌ¶","»Æ¸Ô","³ÐµÂ","½¹×÷","ĵµ¤½­","ÆÎÌï","ÉÏÈÄ","üɽ","ÆëÆë¹þ¶û","³»ÖÝ","Óª¿Ú","°ö²º","´óÇì","³à·å","ºÓÔ´","ÂÀÁº","ËìÄþ","äðºÓ","ÈýÃ÷","ïÃû","å§Ñô","Çú¾¸","ƽÁ¹","¶õ¶û¶à˹","Ê®Ñß","¼ª°²","»ÆÊ¯","¼Ñľ˹","ÈýÃÅÏ¿","½ÒÑô","ÐÃÖÝ","ͨÁÉ","ãòÖÝ","Áù°²","³±ÖÝ","áéÖÝ","»´ÄÏ","¾£ÃÅ","ÓÀÖÝ","ºôÂ×±´¶û","ºù«µº","µ¤¶«","ÑÓ±ß","Ðû³Ç","Ò˱ö","ÇìÑô","½ú³Ç","Ñô½­","ËÞÖÝ","ÑÓ°²","ÏÌÄþ","»³»¯","»ÆÉ½","ÖÛɽ","ÉÇβ","Å̽õ","³¯Ñô","ÀöË®","¸§ÖÝ","ÌúÁë","ºìºÓ","¤ÄÏ","¹ã°²","¸§Ë³","×Ô¹±","´ïÖÝ","ÓñÁÖ","ÓñϪ","°×Òø","ÙñÖÝ","ÉÛÑô","¹ãÔª","²ý¼ª","ÒæÑô","ÕÅÒ´","¦µ×","ÑôȪ","ÌìË®","ËæÖÝ","Ë·ÖÝ","´óÀí","ͨ»¯","³þÐÛ","°ÍÑåÄ×¶û","ÎÚÀ¼²ì²¼","ÐÂÓà","¾°µÂÕò","ËÉÔ­","ÁÉÑô","¸·ÐÂ","¾ÆÈª","Ç­ÄÏ","»´±±","ËÄÆ½","ÎàÖÝ","Ç­¶«ÄÏ","°ÍÖÐ","º×±Ú","¼¦Î÷","ÄÚ½­","ÇÕÖÝ","³ØÖÝ","ÏÉÌÒ","¶÷Ê©","±¾Ïª","×ÊÑô","ÁùÅÌË®","°ÙÉ«","°×³Ç","ÁÙÏÄ","ÒÁÀç","¹ó¸Û","°×ɽ","˫Ѽɽ","ÎâÖÒ","¶õÖÝ","Àö½­","°²¿µ","±Ï½Ú","ÔÆ¸¡","°ÍÒô¹ùÀã","°²Ë³","°¢¿ËËÕ","ºÚºÓ","Í­Áê","ÑŰ²","ʯ×ìɽ","ƼÏç","º×¸Ú","ÎýÁÖ¹ùÀÕÃË","Í­ÈÊ","·À³Ç¸Û","¿¦Ê²","Ð˰²ÃË","ºÓ³Ø","Í­´¨","ÆÕ¶ý","±£É½","Á¹É½ÖÝ","ӥ̶","¶¨Î÷","ÒÁ´º","ÖÐÎÀ","Ç­Î÷ÄÏ","ÉÌÂå","ÎÚº£","ÎäÍþ","º£Î÷ÖÝ","À´±ö","ÕÑͨ","ÏæÎ÷","¹þÃÜ","Õżҽç","Î÷Ë«°æÄÉÖÝ","Æß̨ºÓ","¹ÌÔ­","ÅÊÖ¦»¨","µÂºêÖÝ","³ç×ó","ÁÉÔ´","¼ÎÓø¹Ø","¿ËÀ­ÂêÒÀ","ÁÙ²×","DZ½­","ºØÖÝ","ÌìÃÅ","º£¶«","Ëþ³Ç","ÙÙÖÝ","½ð²ý","²©¶ûËþÀ­","ͳ·¬","´óÐ˰²Áë","°¢ÀÕÌ©","ºÍÌï","µÏÇìÖÝ","ÈÕ¿¦Ôò","ÁÖÖ¥","°¢°ÓÖÝ","°¢À­ÉÆÃË","°¢Àï","²ý¶¼","¸ÊÄÏ","¸Ê×ÎÖÝ","¹ûÂåÖÝ","º£±±ÖÝ","º£ÄÏÖÝ","»ÆÄÏÖÝ","¿Ë×ÎÀÕËÕ","ÄÇÇú","Å­½­ÖÝ","Èýɳ","ɽÄÏ","ÉñÅ©¼Ü","ÎÄɽÖÝ","ÓñÊ÷ÖÝ"] + public static def citys_all = [ "ÉϺ£","³¤´º","ÑïÖÝ","±±¾©","ÖØÇì","Ìì½ò","³É¶¼","ÉòÑô","´óÁ¬","°²Çì","Î÷Äþ","ÈÕÕÕ","Î人","Î÷°²","ËÕÖÝ","¹ãÖÝ","ÄϾ©","Çൺ","¼ÃÄÏ","Äþ²¨","³¤É³","ʯ¼Òׯ","·ðɽ","¼ÎÐË","Òø´¨","ÄÏͨ","ÀÈ·»","ÖÐɽ","Ö£ÖÝ","¹þ¶û±õ","ÑĮ̀","ÐìÖÝ","ÉÜÐË","ÏÃÃÅ","À¥Ã÷","Äϲý","¹óÑô","Ö麣","¶«Ý¸","Õò½­","ÂåÑô","ÎÂÖÝ","À¼ÖÝ","¸£ÖÝ","»ÝÖÝ","ºôºÍºÆÌØ","³£ÖÝ","ÌÆÉ½","»´°²","ºþÖÝ","¾Å½­","̫ԭ","±±º£","ÖêÖÞ","×Ͳ©","ÑγÇ","ÎÚ³ľÆë","º£¿Ú","ÄÏÄþ","³£µÂ","̨ÖÝ","½ð»ª","¼ªÁÖ","ÔÀÑô","ÁøÖÝ","ÇåÔ¶","Õ¿½­","ÕżҿÚ","±£¶¨","ÉîÛÚ","º¼ÖÝ","ºÏ·Ê","ÎÞÎý","ȪÖÝ","×ñÒå","ÕØÇì","ÕÄÖÝ","Ò˲ý","Îߺþ","Ì©ÖÝ","ÉÇÍ·","ÈýÑÇ","ÇØ»Êµº","Âí°°É½","Á¬ÔƸÛ","²×ÖÝ","À­Èø","½õÖÝ","´óͬ","ÎIJý","±£Í¤","ÁêË®","Ϋ·»","ÁÙÒÊ","ºªµ¦","¼ÃÄþ","Íþº£","ÃàÑô","÷ÖÝ","ƽ¶¥É½","½­ÃÅ","¸ÓÖÝ","Ì©°²","ÏåÑô","ÄÏÑô","¹ðÁÖ","ÁijÇ","ÁÙ·Ú","µÂÖÝ","ÉÌÇð","ºâÑô","ËÞǨ","°üÍ·","μÄÏ","ÏÌÑô","Ðí²ý","±õÖÝ","ÐĮ̈","Äϳä","°²Ñô","ÐÂÏç","Ôæ×¯","³üÖÝ","ÁúÑÒ","±¦¼¦","ÐÅÑô","Ô˳Ç","ºâË®","¶«Óª","½úÖÐ","Т¸Ð","³¤ÖÎ","¸·Ñô","ÉØ¹Ø","ºÊÔó","µÂÑô","ÄþµÂ","¾£ÖÝ","ÀÖɽ","פÂíµê","ÄÏÆ½","ººÖÐ","ÓÜÁÖ","ÒË´º","°°É½","¿ª·â","ÖÜ¿Ú","Ë绯","ÏæÌ¶","»Æ¸Ô","³ÐµÂ","½¹×÷","ĵµ¤½­","ÆÎÌï","ÉÏÈÄ","üɽ","ÆëÆë¹þ¶û","³»ÖÝ","Óª¿Ú","°ö²º","´óÇì","³à·å","ºÓÔ´","ÂÀÁº","ËìÄþ","äðºÓ","ÈýÃ÷","ïÃû","å§Ñô","Çú¾¸","ƽÁ¹","¶õ¶û¶à˹","Ê®Ñß","¼ª°²","»ÆÊ¯","¼Ñľ˹","ÈýÃÅÏ¿","½ÒÑô","ÐÃÖÝ","ͨÁÉ","ãòÖÝ","Áù°²","³±ÖÝ","áéÖÝ","»´ÄÏ","¾£ÃÅ","ÓÀÖÝ","ºôÂ×±´¶û","ºù«µº","µ¤¶«","ÑÓ±ß","Ðû³Ç","Ò˱ö","ÇìÑô","½ú³Ç","Ñô½­","ËÞÖÝ","ÑÓ°²","ÏÌÄþ","»³»¯","»ÆÉ½","ÖÛɽ","ÉÇβ","Å̽õ","³¯Ñô","ÀöË®","¸§ÖÝ","ÌúÁë","ºìºÓ","¤ÄÏ","¹ã°²","¸§Ë³","×Ô¹±","´ïÖÝ","ÓñÁÖ","ÓñϪ","°×Òø","ÙñÖÝ","ÉÛÑô","¹ãÔª","²ý¼ª","ÒæÑô","ÕÅÒ´","¦µ×","ÑôȪ","ÌìË®","ËæÖÝ","Ë·ÖÝ","´óÀí","ͨ»¯","³þÐÛ","°ÍÑåÄ×¶û","ÎÚÀ¼²ì²¼","ÐÂÓà","¾°µÂÕò","ËÉÔ­","ÁÉÑô","¸·ÐÂ","¾ÆÈª","Ç­ÄÏ","»´±±","ËÄÆ½","ÎàÖÝ","Ç­¶«ÄÏ","°ÍÖÐ","º×±Ú","¼¦Î÷","ÄÚ½­","ÇÕÖÝ","³ØÖÝ","ÏÉÌÒ","¶÷Ê©","±¾Ïª","×ÊÑô","ÁùÅÌË®","°ÙÉ«","°×³Ç","ÁÙÏÄ","ÒÁÀç","¹ó¸Û","°×ɽ","˫Ѽɽ","ÎâÖÒ","¶õÖÝ","Àö½­","°²¿µ","±Ï½Ú","ÔÆ¸¡","°ÍÒô¹ùÀã","°²Ë³","°¢¿ËËÕ","ºÚºÓ","Í­Áê","ÑŰ²","ʯ×ìɽ","ƼÏç","º×¸Ú","ÎýÁÖ¹ùÀÕÃË","Í­ÈÊ","·À³Ç¸Û","¿¦Ê²","Ð˰²ÃË","ºÓ³Ø","Í­´¨","ÆÕ¶ý","±£É½","Á¹É½ÖÝ","ӥ̶","¶¨Î÷","ÒÁ´º","ÖÐÎÀ","Ç­Î÷ÄÏ","ÉÌÂå","ÎÚº£","ÎäÍþ","º£Î÷ÖÝ","À´±ö","ÕÑͨ","ÏæÎ÷","¹þÃÜ","Õżҽç","Î÷Ë«°æÄÉÖÝ","Æß̨ºÓ","¹ÌÔ­","ÅÊÖ¦»¨","µÂºêÖÝ","³ç×ó","ÁÉÔ´","¼ÎÓø¹Ø","¿ËÀ­ÂêÒÀ","ÁÙ²×","DZ½­","ºØÖÝ","ÌìÃÅ","º£¶«","Ëþ³Ç","ÙÙÖÝ","½ð²ý","²©¶ûËþÀ­","ͳ·¬","´óÐ˰²Áë","°¢ÀÕÌ©","ºÍÌï","µÏÇìÖÝ","ÈÕ¿¦Ôò","ÁÖÖ¥"] public static def citys_92 = [ "ÉϺ£","ÑïÖÝ","±±¾©","ÖØÇì","Ìì½ò","³É¶¼","ÉòÑô","´óÁ¬","°²Çì","Î÷Äþ","ÈÕÕÕ","³¤´º","Î人","Î÷°²","ËÕÖÝ","¹ãÖÝ","ÄϾ©","Çൺ","¼ÃÄÏ","Äþ²¨","³¤É³","ʯ¼Òׯ","·ðɽ","¼ÎÐË","Òø´¨","ÄÏͨ","ÀÈ·»","ÖÐɽ","Ö£ÖÝ","¹þ¶û±õ","ÑĮ̀","ÐìÖÝ","ÉÜÐË","ÏÃÃÅ","À¥Ã÷","Äϲý","¹óÑô","Ö麣","¶«Ý¸","Õò½­","ÂåÑô","ÎÂÖÝ","À¼ÖÝ","¸£ÖÝ","»ÝÖÝ","ºôºÍºÆÌØ","³£ÖÝ","ÌÆÉ½","»´°²","ºþÖÝ","¾Å½­","̫ԭ","±±º£","ÖêÖÞ","×Ͳ©","ÑγÇ","ÎÚ³ľÆë","º£¿Ú","ÄÏÄþ","³£µÂ","̨ÖÝ","½ð»ª","¼ªÁÖ","ÔÀÑô","ÁøÖÝ","ÇåÔ¶","Õ¿½­","ÕżҿÚ","±£¶¨","ÉîÛÚ","º¼ÖÝ","ºÏ·Ê","ÎÞÎý","ȪÖÝ","×ñÒå","ÕØÇì","ÕÄÖÝ","Ò˲ý","Îߺþ","Ì©ÖÝ","ÉÇÍ·","ÈýÑÇ","ÇØ»Êµº","Âí°°É½","Á¬ÔƸÛ","²×ÖÝ","À­Èø","½õÖÝ","´óͬ","ÎIJý","±£Í¤","ÁêË®"] public static def citys_252 = ["Ϋ·»","ÁÙÒÊ","ºªµ¦","¼ÃÄþ","Íþº£","ÃàÑô","÷ÖÝ","ƽ¶¥É½","½­ÃÅ","¸ÓÖÝ","Ì©°²","ÏåÑô","ÄÏÑô","¹ðÁÖ","ÁijÇ","ÁÙ·Ú","µÂÖÝ","ÉÌÇð","ºâÑô","ËÞǨ","°üÍ·","μÄÏ","ÏÌÑô","Ðí²ý","±õÖÝ","ÐĮ̈","Äϳä","°²Ñô","ÐÂÏç","Ôæ×¯","³üÖÝ","ÁúÑÒ","±¦¼¦","ÐÅÑô","Ô˳Ç","ºâË®","¶«Óª","½úÖÐ","Т¸Ð","³¤ÖÎ","¸·Ñô","ÉØ¹Ø","ºÊÔó","µÂÑô","ÄþµÂ","¾£ÖÝ","ÀÖɽ","פÂíµê","ÄÏÆ½","ººÖÐ","ÓÜÁÖ","ÒË´º","°°É½","¿ª·â","ÖÜ¿Ú","Ë绯","ÏæÌ¶","»Æ¸Ô","³ÐµÂ","½¹×÷","ĵµ¤½­","ÆÎÌï","ÉÏÈÄ","üɽ","ÆëÆë¹þ¶û","³»ÖÝ","Óª¿Ú","°ö²º","´óÇì","³à·å","ºÓÔ´","ÂÀÁº","ËìÄþ","äðºÓ","ÈýÃ÷","ïÃû","å§Ñô","Çú¾¸","ƽÁ¹","¶õ¶û¶à˹","Ê®Ñß","¼ª°²","»ÆÊ¯","¼Ñľ˹","ÈýÃÅÏ¿","½ÒÑô","ÐÃÖÝ","ͨÁÉ","ãòÖÝ","Áù°²","³±ÖÝ","áéÖÝ","»´ÄÏ","¾£ÃÅ","ÓÀÖÝ","ºôÂ×±´¶û","ºù«µº","µ¤¶«","ÑÓ±ß","Ðû³Ç","Ò˱ö","ÇìÑô","½ú³Ç","Ñô½­","ËÞÖÝ","ÑÓ°²","ÏÌÄþ","»³»¯","»ÆÉ½","ÖÛɽ","ÉÇβ","Å̽õ","³¯Ñô","ÀöË®","¸§ÖÝ","ÌúÁë","ºìºÓ","¤ÄÏ","¹ã°²","¸§Ë³","×Ô¹±","´ïÖÝ","ÓñÁÖ","ÓñϪ","°×Òø","ÙñÖÝ","ÉÛÑô","¹ãÔª","²ý¼ª","ÒæÑô","ÕÅÒ´","¦µ×","ÑôȪ","ÌìË®","ËæÖÝ","Ë·ÖÝ","´óÀí","ͨ»¯","³þÐÛ","°ÍÑåÄ×¶û","ÎÚÀ¼²ì²¼","ÐÂÓà","¾°µÂÕò","ËÉÔ­","ÁÉÑô","¸·ÐÂ","¾ÆÈª","Ç­ÄÏ","»´±±","ËÄÆ½","ÎàÖÝ","Ç­¶«ÄÏ","°ÍÖÐ","º×±Ú","¼¦Î÷","ÄÚ½­","ÇÕÖÝ","³ØÖÝ","ÏÉÌÒ","¶÷Ê©","±¾Ïª","×ÊÑô","ÁùÅÌË®","°ÙÉ«","°×³Ç","ÁÙÏÄ","ÒÁÀç","¹ó¸Û","°×ɽ","˫Ѽɽ","ÎâÖÒ","¶õÖÝ","Àö½­","°²¿µ","±Ï½Ú","ÔÆ¸¡","°ÍÒô¹ùÀã","°²Ë³","°¢¿ËËÕ","ºÚºÓ","Í­Áê","ÑŰ²","ʯ×ìɽ","ƼÏç","º×¸Ú","ÎýÁÖ¹ùÀÕÃË","Í­ÈÊ","·À³Ç¸Û","¿¦Ê²","Ð˰²ÃË","ºÓ³Ø","Í­´¨","ÆÕ¶ý","±£É½","Á¹É½ÖÝ","ӥ̶","¶¨Î÷","ÒÁ´º","ÖÐÎÀ","Ç­Î÷ÄÏ","ÉÌÂå","ÎÚº£","ÎäÍþ","º£Î÷ÖÝ","À´±ö","ÕÑͨ","ÏæÎ÷","¹þÃÜ","Õżҽç","Î÷Ë«°æÄÉÖÝ","Æß̨ºÓ","¹ÌÔ­","ÅÊÖ¦»¨","µÂºêÖÝ","³ç×ó","ÁÉÔ´","¼ÎÓø¹Ø","¿ËÀ­ÂêÒÀ","ÁÙ²×","DZ½­","ºØÖÝ","ÌìÃÅ","º£¶«","Ëþ³Ç","ÙÙÖÝ","½ð²ý","²©¶ûËþÀ­","ͳ·¬","´óÐ˰²Áë","°¢ÀÕÌ©","ºÍÌï","µÏÇìÖÝ","ÈÕ¿¦Ôò","ÁÖÖ¥","°¢°ÓÖÝ","°¢À­ÉÆÃË","°¢Àï","²ý¶¼","¸ÊÄÏ","¸Ê×ÎÖÝ","¹ûÂåÖÝ","º£±±ÖÝ","º£ÄÏÖÝ","»ÆÄÏÖÝ","¿Ë×ÎÀÕËÕ","ÄÇÇú","Å­½­ÖÝ","Èýɳ","ɽÄÏ","ÉñÅ©¼Ü","ÎÄɽÖÝ","ÓñÊ÷ÖÝ"] @@ -42,8 +43,10 @@ class CcbCommonUtils { public static DSCollection dataStoreConnection = null; - public static def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", - "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") + public static def sqlInstance = null + + public static def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse", + "postgres", "postgres", "org.postgresql.Driver") public static def getRunningCitys(def args){ @@ -53,13 +56,21 @@ class CcbCommonUtils { def countStr = args[0] if(countStr=="344"){ citys = CcbCommonUtils.citys_all + sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", + "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") }else if(countStr=="92"){ citys = CcbCommonUtils.citys_92 + sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", + "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") }else if(countStr=="252"){ citys = CcbCommonUtils.citys_252 + sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", + "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") } }else{ - citys = CcbCommonUtils.citys_92 + citys = CcbCommonUtils.citys_all + sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", + "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") } println "ÔËÐгÇÊÐÊýÁ¿£º"+citys.size() return citys; @@ -116,12 +127,12 @@ class CcbCommonUtils { def q = new BasicDBObject() q.put("city", city) q.put('guiding_date', new BasicDBObject('$gte', DateUtils.parseFromTightYYYYMMDD(date)).append('$lt', DateUtils.parseFromTightYYYYMMDD(endDate))); - def dbcursor = GUIDING_PRICE_COLL.find(q) + def dbcursor = GUIDING_PRICE_COLL.find(q).sort(new BasicDBObject("guiding_date",-1)) def rets = [] def sets = new HashSet() for(def d : dbcursor){ def guiding_date = DateUtils.formatDateByPattern(d.guiding_date, 'yyyy-MM-dd') - def key = d.city +"##"+d.region+"##"+d.name+"##" + guiding_date + def key = d.city +"##"+d.region+"##"+d.name if(!sets.contains(key)){ rets << d sets << key @@ -135,7 +146,9 @@ class CcbCommonUtils { public static def findGuidePrice(city, startDate, endDate){ def q = new BasicDBObject() q.put("city", city) - q.put('c_date', new BasicDBObject('$gte', DateUtils.parseFromTightYYYYMMDD(startDate)).append('$lt', DateUtils.parseFromTightYYYYMMDD(endDate))); + if(startDate && endDate){ + q.put('c_date', new BasicDBObject('$gte', DateUtils.parseFromTightYYYYMMDD(startDate)).append('$lt', DateUtils.parseFromTightYYYYMMDD(endDate))); + } def dbcursor = DISTRICT_GUIDE_PRICE_COLL.find(q) def rets = [] for(def d : dbcursor){ @@ -205,6 +218,7 @@ class CcbCommonUtils { q.put("avg_price", new BasicDBObject('$gt', 0)) q.put("trade_date", new BasicDBObject('$gte', startDate).append('$lte',endDate)) q.put("match_id", dist._id.toString()) + q.put("type", new BasicDBObject('$ne','³µÎ»')) def dbcursor = DEAL_PRICE_COLL.find(q) def total = dbcursor.count() def rets = new HashSet() @@ -417,7 +431,47 @@ class CcbCommonUtils { q.put("visible",0) q.put("cat", cat); q.put("city", city); -// q.put("name","ÔÆÉ½ÉгÇ") +// q.put("c_date", new BasicDBObject('$lt', DateUtils.parseFromTightYYYYMMDD("2023-05-01")))//Òò5ÔÂ1ÈÕÐÂÔö¹ý¶à£¬ËùÒÔÔÝÇÒÏÈÈ¥µô ´ËÅúÊý¾Ý¸ÄΪname_cat=13 +// q.put("name","½ðµØçôÍå") +// q.put("name_cat", 0); +// q.put("estate_type2", new BasicDBObject('$in', ["ÆÕͨסլ","ÉÌס"])) + + DBObject keys = new BasicDBObject(); + if(fields){ + for(def field : fields){ + keys.put(field, 1); + } + } +// def dbsour = getDataStoreConnection().find(q, keys).batchSize(2000) + def dbsour = DBUtils.seaweed.find(q,keys).batchSize(2000) + println "[${city}] ԭʼ:"+dbsour.count() + def rets = [] + + def ids = [] + for(def d : dbsour){ + if(d.name_cat == 0 && d.lng && ["ÆÕͨסլ","ÉÌס"].contains(d.estate_type2) && !d.name.contains("Ñó·¿") && !d.name.contains("¹«·¿")){ + if(d.address){ + d.address = d.address.replaceAll("\r|\n|\\s", ""); + } + if(!ids.contains(d._id.toString())){ + ids << d._id.toString() + rets << d + } + } + } + println "[${city}] Ð¡ÇøÁ¿£º"+rets.size() + return rets; + } + + + public static def findAllDistrictByCityAndRegion(def city, def region, def cat, def fields){ + + DBObject q = new BasicDBObject(); + q.put("visible",0) + q.put("cat", cat); + q.put("city", city); + q.put("region", region) +// q.put("name","Ãù´äÀ¶Íå") // q.put("name_cat", 0); // q.put("estate_type2", new BasicDBObject('$in', ["ÆÕͨסլ","ÉÌס"])) @@ -443,6 +497,7 @@ class CcbCommonUtils { return rets; } + public static def findDistrict(String city, String region, String name, String cat){ DBObject q = new BasicDBObject(); @@ -512,13 +567,57 @@ class CcbCommonUtils { } + public static def findPgCcbDistrict(cityid){ + def sql = "select * from base.t0831_bigdata_community_gj_h where urbn_id='${cityid}'"; + def map = [:] + pgsqlInstance.eachRow(sql,{r-> + def data = [] + data << r.urbn_id + data << r.gujia_admndiv_id + data << r.gujia_comm_id + data << r.gujia_admndiv_nm + data << r.comm_nm + data << r.gujia_dtl_adr + data << r.gujia_bds_ltt + data << r.gujia_bds_lgt + data << r.gujiabdsocpoldtotarea + data << r.gujiabds_bld_tot_area + data << r.gujia_bds_grnrate + data << r.gujia_bds_vol_rate + data << r.gujia_bds_park_num + data << r.gujia_bds_bld_yr_rc + data << r.gujia_bds_hs_use_val + data << r.totunits + data << r.gujia_bds_data_tm_val + data << r.gujiabds_udt_flag_val + data << r.data_udt_tm + data << r.gujia_comm_tp_val + data << r.gujia_comm_fmnm + data << r.gujia_str + data << r.gujia_hsno + data << r.gujiawthr_new_pan_ind + data << r.gujia_comm_intd + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.gujia_src_co + data << r.gujia_vlgtwn_str_mng + data << r.gujia_lgc_admndiv_cd + data << r.gujia_lgc_adiv + data << r.gujia_bds_bds_st + map.put(r.gujia_comm_id, data) + }); + return map + } - public static def findTradesByMonth(city, startDate, endDate){ + + + public static def findTradesByMonth(city, startDate){ def q = new BasicDBObject() q.put("city", city) - q.put("trade_date", new BasicDBObject('$gte', startDate).append('$lte',endDate)) + q.put("trade_date", new BasicDBObject('$gte', startDate)) q.put("match_id", new BasicDBObject('$exists', false)) +// q.put("district_name","¹úóÌìÇÙÍå") def dbcursor = DEAL_PRICE_COLL.find(q) def total = dbcursor.count() def rets = new HashSet() @@ -562,4 +661,22 @@ class CcbCommonUtils { return maxSeqno } + public static def deleteGuidedPrice(def dealdate){ + def sql = "delete from guided_price_gj where dealdate=to_date('${dealdate}','yyyy-mm-dd')" + sqlInstance.executeUpdate(sql) + + + def sql2 = "delete from base.t0831_guided_price_gj_h where gujia_drc_dt='${dealdate}'" + pgsqlInstance.executeUpdate(sql2) + } + + + public static def findDistGovPrice(def city){ + def ids = [] + pgsqlInstance.eachRow("SELECT gujia_bds_id from base.t0831_community_guide_price_gj_h where urbn_nm='${city}'",{it-> + ids << it.gujia_bds_id + }); + return ids; + } + } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpTestUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpTestUtils.groovy index 2a9ad549f..00ed6bf6e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpTestUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/CcbFtpTestUtils.groovy @@ -7,13 +7,13 @@ import org.apache.commons.codec.digest.DigestUtils class CcbFtpTestUtils { - static def ftpServer = "192.168.0.86" + static def ftpServer = "192.168.0.45"//45 static def ftpPort = 17495 static def ftpUser = "ccb" static def ftpPassword = "ccb!@#" static def ftpPath = "/home/ccb_evaluation/output/" - static def ftpPath_rh = "/home/ccb_rh/output/" + static def ftpPath_rh = "/home/ccb_ronghe/output/" static SFTP sftp = new SFTP(); static ChannelSftp sftpChannel = sftp.connect(ftpServer, ftpPort, ftpUser, ftpPassword); @@ -70,16 +70,26 @@ class CcbFtpTestUtils { } - static def listFileNames(month){ + static def listFileNames(type, month){ //ÉÏ´«µ½ftp sftpChannel = reConnect(); - Vector files = sftp.listFiles(ftpPath+ month+"/", sftpChannel); + Vector files = null; + if(type && type=="rh"){ + files = sftp.listFiles(ftpPath_rh+ month+"/", sftpChannel); + }else{ + files = sftp.listFiles(ftpPath+ month+"/", sftpChannel); + } return files } - static def getFileLength(String path, String month){ + static def getFileLength(String type, String path, String month){ sftpChannel = reConnect(); - def size = sftp.getFileSize(ftpPath+ month+"/"+path, sftpChannel) + def size = 0; + if(type && type=="rh"){ + size = sftp.getFileSize(ftpPath_rh+ month+"/"+path, sftpChannel) + }else{ + size = sftp.getFileSize(ftpPath+ month+"/"+path, sftpChannel) + } return size } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DealAndThirdPriceDataProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DealAndThirdPriceDataProcess.groovy index a96478424..cdad2a607 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DealAndThirdPriceDataProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/DealAndThirdPriceDataProcess.groovy @@ -21,12 +21,16 @@ class DealPriceDataProcess { def sqlInstance236 = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") + def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse?stringtype=unspecified", + "postgres", "postgres", "org.postgresql.Driver") + static main(args) { def task = new DealPriceDataProcess() // task.process()//Ô˵±³É½»peÖµ²»ºÃʱÐУ¬À­Éý³É½»¼Û¸ñ¼°É¾³ýpeÌ«´óÊý¾Ý // task.addLianJiaPrice(); task.deleteThirdPartyData() // task.delDealByPe() +// task.delDealData() } def delDealByPe(){ @@ -370,20 +374,37 @@ class DealPriceDataProcess { def deleteThirdPartyData(){ - def citys = CcbCommonUtils.citys_92 - def month = 202209 + def citys = CcbCommonUtils.citys_all + def month = 202303 def rows = [] def cityCodeDatas = CcbCommonUtils.findCityCodeValue() + def set = new HashSet() for(def city : citys) { - def rets = findPeGteThirdParty(city, 202210) + def rets = findPeGteThirdParty2(city, 202304) def total = 0 println city +" "+rets.size() + if(rets){ + set.add(city) + } for(def m : rets){ def cityId = cityCodeDatas.get(city) - def sql = "delete from BIGDATA_THIRD_PARTY_PRICE_GJ where cityid='${cityId}' and commid='${m.commid}' and price_date=${month} and community_price=${m.price}" - sqlInstance236.executeUpdate(sql) +// def sql = "delete from BIGDATA_THIRD_PARTY_PRICE_GJ where cityid='${cityId}' and commid='${m.commid}' and price_date=${month} and community_price=${m.price}" +// sqlInstance236.executeUpdate(sql) + + def sql = "delete from base.t0831_bigdata_third_party_price_gj_h where urbn_id='${cityId}' and gujia_bds_id='${m.commid}' and gujiabds_avprc_dt_val=${month} and gujia_bds_comm_avprc=${m.price}" + pgsqlInstance.executeUpdate(sql) + } } + println set.toString() + } + + def findThirdCount(sqlInstance236, sql){ + def count = 0 + sqlInstance236.eachRow(sql,{r-> + count = r.count() + }); + return count } def findPeGteThirdParty(cityName, yearmonth){ @@ -398,4 +419,38 @@ class DealPriceDataProcess { return rets } + def findPeGteThirdParty2(cityName, yearmonth){ + def sql = "SELECT gujia_comm_id,gujiabds_to_mkprc_mny from t_app_p9pha_plda.avm_evaluation_item_gj_h where gujiabds_clc_yrmo_val=${yearmonth} and gujia_data_tp='µÚÈý·½' and urbn_nm='${cityName}' and gujia_mns_rto>25" + def rets = [] + pgsqlInstance.eachRow(sql,{r-> + def map = [:] + map.commid = r.gujia_comm_id + map.price = r.gujiabds_to_mkprc_mny + rets << map + }); + return rets + } + + + def delDealData(){ + ExcelUtils.modify("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\³É½»\\º¼Öݳɽ»É¾³ý12-23.xlsx", { d -> + if(d['A']){ + def count = delDealDataByid(d['A'],d['K'].toString().toDouble(), d['H'].toString().toDouble().toInteger()) + println d['B']+" "+count + } + }) + } + + def delDealDataByid(commid, area, price){ + def sql = "select count(*) as count from bigdata_deal_gj where commid='${commid}' and buildarea=${area} and DEALUNITPRICE=${price} " + + "and dealdate>=TO_DATE('2022-11-01','yyyy-MM-dd')" +// sqlInstance236.executeUpdate(sql) + def count = 0 + sqlInstance236.eachRow(sql,{r-> + count = r.count + }); + return count + } + + } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleAllDataTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleAllDataTest.groovy new file mode 100644 index 000000000..4df84ea86 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleAllDataTest.groovy @@ -0,0 +1,1201 @@ +package com.fangjia.script.ccbevaluation + +import com.fangjia.core.RegionData +import com.fangjia.script.ccbevaluation.ronghe.SSHHelper +import com.fangjia.script.ccbevaluation.ronghe.SSHHelperTest +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.gj.ccb.FileUtils +import com.fangjia.script.util.DateUtils +import com.fangjia.script.util.ExcelUtils +import com.jcraft.jsch.ChannelSftp +import groovy.sql.Sql +import org.apache.commons.codec.digest.DigestUtils + +import java.sql.ResultSet + +//¹ÀÖµ ÐÂ°æ µ¼³öËùÓÐÊý¾Ý +class ExportOracleAllDataTest { + + def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", + "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") + + def cityCodeMap = CcbCommonUtils.findCityCodeValue() + def citys = null + def curDate = "20220128"//DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; + + static main(args) { + def task = new ExportOracleAllDataTest() + task.run(args) + +// citys = CcbCommonUtils.citys_252 +// def rows = [] +// for(def c : citys){ +// def dists = CommonDatautils.findAllDistrictByCity(c, "district", ["city","region", "name"]) +// rows << [c, dists.size()] +// } +// ExcelUtils.write("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\252³ÇÐ¡ÇøÁ¿Í³¼Æ.xlsx", rows, "ÊýÁ¿") + } + + def run(args) { + + citys = CcbCommonUtils.getRunningCitys(args)//["Ϋ·»","¼ÃÄþ","Íþº£","ÁÙÒÊ","ÃàÑô","¤ÄÏ","Ëþ³Ç","°¢ÀÕÌ©","µÏÇìÖÝ","ÈÕ¿¦Ôò"] //CcbCommonUtils.getRunningCitys(args) + def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), 0, "yyyyMM")); + def lastMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); + def lastMonthStr = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -1, "yyyy-MM") + def new_dists = [] + +// exportBigdataForsale(new_dists) //2022-07-19 +// +// //²»»á±ä 10.25 +// exportEvaluationRateData() +// exportBigdataPoiData()// +// exportBigdataDistrictData()// +// +// exportGuidedPrice()//ËæÈ˹¤¸Ä±ä// +// exportCommunityGuidedPrice(lastMonth.toString()+"28")//ËæÕþ²ß// +// +// //´¦ÀíÐ¡ÇøÇé¿ö +// exportBigdataCommunity()// +// exportCommunityStaging()//ûcityid +// exportCommunityBuileType()// +// +// exportThirdPartyPrice2(new_dists)// +// exportBigdataDeal( new_dists) //2022-07-01 +//// +//// //µÚÈý·½ÍøÕ¾È¨Öرí +// exportWebsiteRate(); +//// +//// //¼ÆËã½á¹ûÏà¹Ø +// exportAvmEvaluationGJNB()// +// exportAVMEvaluationItemGJNB()// +// +// exportCityPrice()// +// exportRegionPrice()// + + + exportCommunityBasePrice()// + +// exportCommunityPdescribeGj()// +// exportCommCaseDetailGj()// + +// // okÎļþ + exportInOk() + SSHHelperTest jschCommand = new SSHHelperTest(); + System.out.println(jschCommand.executeCommand("sh /home/ccb_evaluation/output/eval_package.sh ${curDate}")); + + } + + + def exportEvaluationRateData() { + def sql = "select ID,RATE_TYPE,RATE,RANK,CITY,REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from evaluate_rate_gj"; + def allRows = [] + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.ID + data << r.RATE_TYPE + data << r.RATE + data << r.RANK + data << r.CITY + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + + def fileName = "/ccb_evaluation/MODEL_000000_000000_EVALUATE_RATE_GJ_ALL_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_EVALUATE_RATE_GJ_ALL_${curDate}_0001.dat" + } + def headers = []//["ϵÊýID","ϵÊýÀàÐÍ","ϵÊý","ÅÅÐò","³ÇÊÐ","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾"] + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + println "Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println "ÉÏ´«FtpÍê³É......" + } + + + def exportWebsiteRate(){ + def sql = "select DATA_SOURCE_ID,DATA_SOURCE,DATA_SOURCE_MAP,WEIGHT,TYPE,SOURCECODE,CITYID,CITYNAME,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME from WEBSITE_CONFIG_GJ"; + def allRows = [] + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.DATA_SOURCE_ID + data << r.DATA_SOURCE + data << r.DATA_SOURCE_MAP + data << r.WEIGHT + data << r.TYPE + data << r.SOURCECODE + data << r.CITYID + data << r.CITYNAME + data << r.CREATETIME + data << r.UPDATETIME + allRows << data + }); + + def fileName = "/ccb_evaluation/MODEL_000000_000000_WEBSITE_CONFIG_GJ_ALL_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_WEBSITE_CONFIG_GJ_ALL_${curDate}_0001.dat" + } + def headers = []//["ϵÊýID","ϵÊýÀàÐÍ","ϵÊý","ÅÅÐò","³ÇÊÐ","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾"] + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + println "Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println "ÉÏ´«FtpÍê³É......" + } + + + def exportBigdataPoiData() { + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select CITYID, DISTID, ID, POI_NAME, TYPE, TYPE_CODE, LATITUDE, LONGITUDE, REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, SOURCECODE from bigdata_poi_gj where CITYID='${cityCode}'"; + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.CITYID + data << r.DISTID + data << r.ID + data << r.POI_NAME + data << r.TYPE + data << r.TYPE_CODE + data << r.LATITUDE + data << r.LONGITUDE + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + } + def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_POI_GJ_ALL_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_POI_GJ_ALL_${curDate}_0001.dat" + } + def headers = []//["³ÇÊÐID","ÐÐÕþÇøID","ID","PoiÃû³Æ","ÀàÐÍ","ÀàÐͱàÂë","γ¶È","¾­¶È","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾"] + + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + println "BIGDATA_POI_GJ Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println "BIGDATA_POI_GJ ÉÏ´«FtpÍê³É......" + } + + def exportCommunityStaging() { + + def allRows = [] + def sql = "select ID,COMMID,MASTER_COMMID,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from community_staging_gj"; + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.ID + data << r.COMMID + data << r.MASTER_COMMID + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + def fileName = "/ccb_evaluation/MODEL_000000_000000_COMMUNITY_STAGING_GJ_ALL_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_STAGING_GJ_ALL_${curDate}_0001.dat" + } + def headers = []//["·ÖÆÚID","Ð¡ÇøID","Ð¡ÇøÖ÷ÆÚID","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾"] + + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + println "COMMUNITY_STAGING_GJ Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println "COMMUNITY_STAGING_GJ ÉÏ´«FtpÍê³É......" + } + + def exportCommunityBuileType() { +// def citys = [ "ÉϺ£","ÑïÖÝ","±±¾©","ÖØÇì","Ìì½ò","³É¶¼","ÉòÑô","´óÁ¬","°²Çì","Î÷Äþ","ÈÕÕÕ","³¤´º","Î人","Î÷°²","ËÕÖÝ","¹ãÖÝ","ÄϾ©","Çൺ","¼ÃÄÏ","Äþ²¨","³¤É³","ʯ¼Òׯ","·ðɽ","¼ÎÐË","Òø´¨","ÄÏͨ","ÀÈ·»","ÖÐɽ","Ö£ÖÝ","¹þ¶û±õ","ÑĮ̀","ÐìÖÝ","ÉÜÐË","ÏÃÃÅ","À¥Ã÷","Äϲý","¹óÑô","Ö麣","¶«Ý¸","Õò½­","ÂåÑô","ÎÂÖÝ","À¼ÖÝ","¸£ÖÝ","»ÝÖÝ","ºôºÍºÆÌØ","³£ÖÝ","ÌÆÉ½","»´°²","ºþÖÝ","¾Å½­","̫ԭ","±±º£","ÖêÖÞ","×Ͳ©","ÑγÇ","ÎÚ³ľÆë","º£¿Ú","ÄÏÄþ","³£µÂ","̨ÖÝ","½ð»ª","¼ªÁÖ","ÔÀÑô","ÁøÖÝ","ÇåÔ¶","Õ¿½­","ÕżҿÚ","±£¶¨","ÉîÛÚ","º¼ÖÝ","ºÏ·Ê","ÎÞÎý","ȪÖÝ","×ñÒå","ÕØÇì","ÕÄÖÝ","Ò˲ý","Îߺþ","Ì©ÖÝ","ÉÇÍ·","ÈýÑÇ","ÇØ»Êµº","Âí°°É½","Á¬ÔƸÛ","²×ÖÝ","À­Èø","½õÖÝ","´óͬ","ÎIJý","±£Í¤","ÁêË®"] +// def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select CITYID, COMMID, BUILDTYPE, REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE, WORKDATE from bigdata_commbuildtype_gj where CITYID='${cityCode}'"; + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.CITYID + data << r.COMMID + data << r.BUILDTYPE + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + data << r.WORKDATE + allRows << data + }); + } + + def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_COMMBUILDTYPE_GJ_ALL_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMBUILDTYPE_GJ_ALL_${curDate}_0001.dat" + } + def headers = []//["³ÇÊÐID","Ð¡ÇøID"," ½¨ÖþÀàÐÍ","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾","Êý¾Ýʱ¼ä"] + + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + println "BIGDATA_COMMBUILDTYPE_GJ Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println "BIGDATA_COMMBUILDTYPE_GJ ÉÏ´«FtpÍê³É......" + } + + def exportBigdataDistrictData() { + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select DISTID, DISTNAME, DISTSPELL, CITYID, DISTCODE, SEQ, DISTTYPE, REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME ,SOURCECODE, LJXZQH, LJXZQHDM, XZQHDM, WORKDATE from bigdata_district_gj where CITYID='${cityCode}'"; + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.DISTID + data << r.DISTNAME + data << r.DISTSPELL + data << r.CITYID + data << r.DISTCODE + data << r.SEQ + data << r.DISTTYPE + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + data << r.LJXZQH + data << r.LJXZQHDM + data << r.XZQHDM + data << r.WORKDATE + allRows << data + }); + } + def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_DISTRICT_GJ_ALL_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_DISTRICT_GJ_ALL_${curDate}_0001.dat" + } + def headers = [] +//["ÐÐÕþÇøID","ÐÐÕþÇøÃû³Æ","ÐÐÕþÇøÃû³ÆÆ´Òô","³ÇÊÐID","¹ú±êÂë","ÏÔʾ˳Ðò","ÐÐÕþÇøÀà±ð","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾","Âß¼­ÐÐÕþÇø","Âß¼­ÐÐÕþÇø»®´úÂë","ÐÐÕþÇø»®´úÂë","Êý¾Ýʱ¼ä"] + + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + println "BIGDATA_DISTRICT_GJ Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println "BIGDATA_DISTRICT_GJ ÉÏ´«FtpÍê³É......" + } + + + def exportGuidedPrice() { + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select ID, COMMID, COMMNAME, CITYID, CITYNAME, DISTID, DISTNAME, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE,AVG_PRICE, GUIDING_PERSON, REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME ,SOURCECODE from guided_price_gj where CITYID='${cityCode}'"; + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.ID + data << r.COMMID + data << r.COMMNAME + data << r.CITYID + data << r.CITYNAME + data << r.DISTID + data << r.DISTNAME + data << r.DEALDATE + data << r.AVG_PRICE + data << r.GUIDING_PERSON + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + } + def fileName = "/ccb_evaluation/MODEL_000000_000000_GUIDED_PRICE_GJ_ALL_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_GUIDED_PRICE_GJ_ALL_${curDate}_0001.dat" + } + def headers = [] +//["µÚÈý·½¾ù¼ÛID","Â¥ÅÌID","Ð¡ÇøÃû³Æ","³ÇÊÐID","³ÇÊÐÃû³Æ","ÐÐÕþÇøID","ÐÐÕþÇøÃû³Æ","Ö¸µ¼ÈÕÆÚ","Ö¸µ¼¼Û¸ñ","Ìí¼ÓÈË","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾"] + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + println "GUIDED_PRICE_GJ Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println "GUIDED_PRICE_GJ ÉÏ´«FtpÍê³É......" + } + + def exportCommunityGuidedPrice(def date) { + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select ID, COMMID, COMMNAME, CITYID, CITYNAME, DISTID, DISTNAME, AVGPRICE, SOURCETYPE, REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME , SOURCECODE from community_guide_price_gj where CITYID='${cityCode}' ";//and createtime>=to_date('${date}','yyyyMMdd') + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.ID + data << r.COMMID + data << r.COMMNAME + data << r.CITYID + data << r.CITYNAME + data << r.DISTID + data << r.DISTNAME + data << r.AVGPRICE + data << r.SOURCETYPE + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + } + def fileName = "/ccb_evaluation/MODEL_000000_000000_COMMUNITY_GUIDE_PRICE_GJ_ADD_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_GUIDE_PRICE_GJ_ADD_${curDate}_0001.dat" + } + def headers = []//["µÚÈý·½¾ù¼ÛID","Â¥ÅÌID","Ð¡ÇøÃû³Æ","³ÇÊÐID","³ÇÊÐÃû³Æ","ÐÐÕþÇøID","ÐÐÕþÇøÃû³Æ","Ö¸µ¼¼Û¸ñ","ÀàÐÍ","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾"] + + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + println "COMMUNITY_GUIDE_PRICE_GJ Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println "COMMUNITY_GUIDE_PRICE_GJ ÉÏ´«FtpÍê³É......" + } + + def exportBigdataDeal(def new_dists) { + + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + if(new_dists){ + def newstr = "('"+new_dists.join("','")+"')" + def sql1 = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, \n" + + "HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, \n" + + "HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, \n" + + "PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE, CJJE, WORKDATE\n" + + "from bigdata_deal_gj where CITYID='${cityCode}' and distid not in ${newstr}" + def rets1 = dealData(sql1) + + def sql2 = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, \n" + + "HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, \n" + + "HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, \n" + + "PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE, CJJE, WORKDATE\n" + + "from bigdata_deal_gj where CITYID='${cityCode}' and distid in ${newstr}" + def rets2 = dealData(sql2) + allRows.addAll(rets1) + allRows.addAll(rets2) + }else{ + def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, \n" + + "HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, \n" + + "HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, \n" + + "PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE, CJJE, WORKDATE\n" + + "from bigdata_deal_gj where CITYID='${cityCode}' "; + allRows.addAll(dealData(sql)) + } + } + + def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_${curDate}_0001.dat" + } + def headers = [] + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + println "BIGDATA_DEAL_GJ Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println "BIGDATA_DEAL_GJ ÉÏ´«FtpÍê³É......" + } + + + def dealData(def sql){ + def allRows = [] + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.CITYID + data << r.DEALID + data << r.CITYNAME + data << r.DISTID + data << r.DISTNAME + data << r.STREET + data << r.STREETNO + data << r.COMMID + data << r.COMMNAME + data << r.BUILDID + data << r.BUILDNO + data << r.BUILDNAME + data << r.UNITID + data << r.UNITNO + data << r.UNITNAME + data << r.HOUSEID + data << r.ADDRESS + data << r.BUILDYEAR + data << r.PROPTYPE + data << r.PROPYEARS + data << r.PERIODNUM + data << r.FLOORNUM + data << r.FLOORTYPE + data << r.FLOORCNT + data << r.BUILDTYPE + data << r.BUILDSTRU + data << r.BUILDAREA + data << r.LIVINGAREA + data << r.HOUSESTYLE + data << r.ROOMCNT + data << r.LIVINGROOMCNT + data << r.KITCHENCNT + data << r.BATHROOMCNT + data << r.HOUSEUSE + data << r.HOUSESTRU + data << r.HOUSEASPECT + data << r.FITMENT + data << r.EVALUATENO + data << r.DEALUNITPRICE + data << r.DEALTOTALPRICE + data << r.DECLAREPRICE + data << r.EVALUATEPRICE + data << r.CONTRACTNO + data << r.DEALDATE + data << r.DEALTYPE + data << r.PAYTYPE + data << r.DEALPERIOD + data << r.IFELEVATOR + data << r.COMPAREAGARDEN + data << r.COMPAREATERRACE + data << r.COMPAREABALCONY + data << r.COMPAREABAYWINDOW + data << r.COMPAREAATTIC + data << r.COMPAREAGARAGE + data << r.COMPAREABASEMENT + data << r.COMPAREAOTHER + data << r.DATASOURCE + data << r.AGENCYID + data << r.AGENCYNAME + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + data << r.CJJE + data << r.WORKDATE + allRows << data + }); + return allRows + } + + def exportThirdPartyPrice() { + def sql = "select ID, COMMID, COMMNAME, CITYID, CITYNAME, DISTID, DISTNAME, YEAR_MONTH, ZHUGE_AVG_PRICE, ANJUKE_AVG_PRICE, FANG_AVG_PRICE, LIANJIA_AVG_PRICE, CITYHOUSE_AVG_PRICE, MAITIAN_AVG_PRICE, KE_AVG_PRICE, \n" + + "TAOFANG_AVG_PRICE, ZHONGYUAN_AVG_PRICE, TBS_AVG_PRICE, QFANG_AVG_PRICE, FANGTAN_AVG_PRICE, FANGDUODUO_AVG_PRICE, WIWJ_AVG_PRICE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE\n" + + "from third_party_price_gj"; + def allRows = [] + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.ID + data << r.COMMID + data << r.COMMNAME + data << r.CITYID + data << r.CITYNAME + data << r.DISTID + data << r.DISTNAME + data << r.YEAR_MONTH + data << r.ZHUGE_AVG_PRICE + data << r.ANJUKE_AVG_PRICE + data << r.FANG_AVG_PRICE + data << r.LIANJIA_AVG_PRICE + data << r.CITYHOUSE_AVG_PRICE + data << r.MAITIAN_AVG_PRICE + data << r.KE_AVG_PRICE + data << r.TAOFANG_AVG_PRICE + data << r.ZHONGYUAN_AVG_PRICE + data << r.TBS_AVG_PRICE + data << r.QFANG_AVG_PRICE + data << r.FANGTAN_AVG_PRICE + data << r.FANGDUODUO_AVG_PRICE + data << r.WIWJ_AVG_PRICE + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE.replaceAll(~'\\r', '') + allRows << data + }) + def fileName = "/ccb_evaluation/MODEL_000000_000000_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" + } + def headers = [] +//["µÚÈý·½¾ù¼ÛID","Â¥ÅÌID","Ð¡ÇøÃû³Æ","³ÇÊÐID","³ÇÊÐÃû³Æ","ÐÐÕþÇøID","ÐÐÕþÇøÃû³Æ","¾ù¼Û¶ÔÓ¦µÄÔ·Ý","Öî¸ðÕÒ·¿¾ù¼Û","°²¾Ó¿Í¾ù¼Û","·¿ÌìϾù¼Û","Á´¼Ò¾ù¼Û","³ÇÊз¿²ú¾ù¼Û","ÂóÌï¾ù¼Û","±´¿Ç¾ù¼Û","ÌÔ·¿365","ÖÐÔ­¾ù¼Û","Íò©Ê¿¾ù¼Û","Q·¿¾ù¼Û","·¿Ì½¾ù¼Û","·¿¶à¶à¾ù¼Û","ÎÒ°®ÎÒ¼Ò¾ù¼Û","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾"] + + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + println "THIRD_PARTY_PRICE_GJ Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println "THIRD_PARTY_PRICE_GJ ÉÏ´«Êý¾ÝÎļþÍê³É......" + } + + + def exportThirdPartyPrice2(new_dists) { + + def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" +// fileName = "D:\\MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" + } + def headers = [] + def index = 0 + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def allRows = [] + if(new_dists) { + def newstr = "('"+new_dists.join("','")+"')" + def sql1 = "select ID, CITYID, DISTID, COMMID, COMMNAME, DATA_SOURCE_ID, DATA_SOURCE, PRICE_DATE, COMMUNITY_PRICE, COMMUNITY_MAX_PRICE, " + + "COMMUNITY_MIN_PRICE, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME from BIGDATA_THIRD_PARTY_PRICE_GJ where " + + "CITYID='${cityCode}' and distid not in ${newstr} "; + def rets1 = getThirdPartyDatas(sql1) + allRows.addAll(rets1) + + def sql2 = "select ID, CITYID, DISTID, COMMID, COMMNAME, DATA_SOURCE_ID, DATA_SOURCE, PRICE_DATE, COMMUNITY_PRICE, COMMUNITY_MAX_PRICE, " + + "COMMUNITY_MIN_PRICE, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME from BIGDATA_THIRD_PARTY_PRICE_GJ where " + + "CITYID='${cityCode}' and distid in ${newstr} "; + def rets2 = getThirdPartyDatas(sql2) + allRows.addAll(rets2) + }else{ + def sql = "select ID, CITYID, DISTID, COMMID, COMMNAME, DATA_SOURCE_ID, DATA_SOURCE, PRICE_DATE, COMMUNITY_PRICE, COMMUNITY_MAX_PRICE, COMMUNITY_MIN_PRICE, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME from BIGDATA_THIRD_PARTY_PRICE_GJ where CITYID='${cityCode}'"; + allRows = getThirdPartyDatas(sql) + } + if(allRows && allRows.size()>0){ + index = index + 1 + if(index==1){ + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + }else{ + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true); + } + } + } + + println "BIGDATA_THIRD_PARTY_PRICE_GJ Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + } + + def getThirdPartyDatas(def sql){ + def allRows = [] + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.ID + data << r.CITYID + data << r.DISTID + data << r.COMMID + data << r.COMMNAME + data << r.DATA_SOURCE_ID + data << r.DATA_SOURCE + data << r.PRICE_DATE + data << r.COMMUNITY_PRICE + data << r.COMMUNITY_MAX_PRICE + data << r.COMMUNITY_MIN_PRICE + data << r.UPDATETIME + allRows << data + }) + return allRows; + } + + def exportBigdataCommunity(){ + + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select CITYID, DISTID, COMMID, DISTNAME, COMMNAME, ADDRESS, LATITUDE, LONGITUDE, LANDAREA, BUILDAREA, GREENINGRATE, PLOTRATIO, PARKINGCNT, BUILDYEAR, HOUSEUSE, ZTS, WORKDATE, UPDATEFLAG, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,COMMTYPE, \n" + + "\tCOMMALIAS, STREET, STREETNO, IFNEW, INTRODUCTION, REMARK, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, SOURCECODE, XZJDB, LJXZQHDM, LJXZQH,STATUS from bigdata_community_gj where CITYID='${cityCode}' ";//where cityId in (350200,150100) + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.DISTID + data << r.COMMID + data << r.DISTNAME + data << r.COMMNAME + data << r.ADDRESS + data << r.LATITUDE + data << r.LONGITUDE + data << r.LANDAREA + data << r.BUILDAREA + data << r.GREENINGRATE + data << r.PLOTRATIO + data << r.PARKINGCNT + data << r.BUILDYEAR + data << r.HOUSEUSE + data << r.ZTS + data << r.WORKDATE + data << r.UPDATEFLAG + data << r.UPDATETIME + data << r.COMMTYPE + data << r.COMMALIAS + data << r.STREET + data << r.STREETNO + data << r.IFNEW + data << "" + data << r.REMARK + data << r.CREATETIME + data << r.SOURCECODE + data << r.XZJDB + data << r.LJXZQHDM + data << r.LJXZQH + data << r.STATUS + allRows << data + }); + } + + def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_COMMUNITY_GJ_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMUNITY_GJ_ALL_${curDate}_0001.dat" + } + def headers = []//["³ÇÊÐID","ÐÐÕþÇøID","Ð¡ÇøID","ÐÐÕþÇøÃû³Æ","Ð¡ÇøÃû³Æ","ÏêϸµØÖ·","γ¶È","¾­¶È","Õ¼µØ×ÜÃæ»ý","½¨Öþ×ÜÃæ»ý","ÂÌ»¯ÂÊ","ÈÝ»ýÂÊ","³µÎ»ÊýÁ¿","½¨ÖþÄê´ú","·¿ÎÝÓÃ;", + //"×ÜÌ×Êý","Êý¾Ýʱ¼ä","¸üбê¼Ç","¸üÐÂʱ¼ä","Ð¡ÇøÀàÐÍ","Ð¡ÇøÔøÓÃÃû","½ÖµÀ","ÃÅÅÆºÅ","ÊÇ·ñÐÂÅÌ","Ð¡Çø½éÉÜ","±¸×¢","´´½¨Ê±¼ä","À´Ô´¹«Ë¾", + //"ÏçÕò/½ÖµÀ°ì","Âß¼­ÐÐÕþÇø»®´úÂë","Âß¼­ÐÐÕþÇø»®","״̬"] + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + println "BIGDATA_COMMUNITY_GJ Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println "BIGDATA_COMMUNITY_GJ ÉÏ´«FtpÍê³É......" + } + + def exportBigdataForsale(new_dists){ + //["±±¾©","ÉϺ£"] + def fileName = "/ccb_evaluation/MODEL_000000_000000_BIGDATA_FORSALE_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_FORSALE_GJ_ADD_${curDate}_0001.dat" + } + def headers = []//["³ÇÊÐID","³öÊÛID","¹ÒÅÆ·¿ÎÝID","³ÇÊÐÃû³Æ","ÐÐÕþÇøID","ÐÐÕþÇøÃû³Æ","Ð¡ÇøID","Ð¡ÇøÃû³Æ","Â¥¶°ID","Â¥¶°±àºÅ","Â¥¶°Ãû³Æ","µ¥ÔªID","µ¥Ôª±àºÅ","µ¥ÔªÃû³Æ","»§ID","ÏêϸµØÖ·","½¨ÖþÄê´ú","ȨÊô","ȨÊôÄêÏÞ","µ¥¼Û","×ܼÛ","³öÊÛ¸¶¿î·½Ê½","ËùÔÚÂ¥²ã","×ÜÂ¥²ã","½¨ÖþÀàÐÍ","ÊÒÄڽṹ","½¨Öþ½á¹¹","½¨ÖþÃæ»ý","Ì×ÄÚÃæ»ý","»§ÐÍ","ÊÒ","Ìü","³ø","ÎÀ","³¯Ïò","×°ÐÞÇé¿ö","ÊÇ·ñÓеçÌÝ","¼¸Ìݼ¸»§","·¢²¼Ê±¼ä","µ½ÆÚʱ¼ä","ÊÇ·ñÊ×·¢","·¿Ô´Êý¾ÝÀ´Ô´","Öн鹫˾ID","Öн鹫˾Ãû³Æ","·¢²¼ÈË","·¢²¼È˵绰","ÃèÊöÐÅÏ¢","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾","¸½¼ÓÐÅÏ¢"] + def index = 0 + for(def city : citys){ + def cityCode = cityCodeMap.get(city) + + def allRows = [] + if(new_dists){ + def newstr = "('"+new_dists.join("','")+"')" + def sql1 = "select CITYID,FORSALEID,PROPCODE,CITYNAME,DISTID,DISTNAME,COMMID,COMMNAME, BUILDID,BUILDNO, BUILDNAME,UNITID,UNITNO,UNITNAME,HOUSEID,ADDRESS,BUILDYEAR,PROPTYPE,PROPYEARS,UNITPRICE,TOTALPRICE,PAYTYPE,FLOORNUM,FLOORCNT,\n" + + " BUILDTYPE, HOUSESTRU,BUILDSTRU,BUILDAREA,LIVINGAREA,HOUSESTYLE,ROOMCNT,LIVINGROOMCNT,KITCHENCNT, BATHROOMCNT,HOUSEASPECT,FITMENT,IFELEVATOR,ELEVATORHOUSE,to_char(PUBLISHTIME,'yyyy-mm-dd hh24:mi:ss') as PUBLISHTIME,to_char(EXPIRETIME,'yyyy-mm-dd hh24:mi:ss') as EXPIRETIME,\n" + + " IFFIRST,DATASOURCE,AGENCYID,AGENCYNAME,PUBLISHER,PHONE,DESCRIPTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE,ATTACH from bigdata_forsale_gj " + + "where cityId='${cityCode}' and distid not in ${newstr}"; + def rets1 = getHouseDatas(sql1, fileName) + if(rets1){ + allRows.addAll(rets1) + } + + }else{ + def sql = "select CITYID,FORSALEID,PROPCODE,CITYNAME,DISTID,DISTNAME,COMMID,COMMNAME, BUILDID,BUILDNO, BUILDNAME,UNITID,UNITNO,UNITNAME,HOUSEID,ADDRESS,BUILDYEAR,PROPTYPE,PROPYEARS,UNITPRICE,TOTALPRICE,PAYTYPE,FLOORNUM,FLOORCNT,\n" + + " BUILDTYPE, HOUSESTRU,BUILDSTRU,BUILDAREA,LIVINGAREA,HOUSESTYLE,ROOMCNT,LIVINGROOMCNT,KITCHENCNT, BATHROOMCNT,HOUSEASPECT,FITMENT,IFELEVATOR,ELEVATORHOUSE,to_char(PUBLISHTIME,'yyyy-mm-dd hh24:mi:ss') as PUBLISHTIME,to_char(EXPIRETIME,'yyyy-mm-dd hh24:mi:ss') as EXPIRETIME,\n" + + " IFFIRST,DATASOURCE,AGENCYID,AGENCYNAME,PUBLISHER,PHONE,DESCRIPTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE,ATTACH from bigdata_forsale_gj where cityId='${cityCode}' "; + allRows = getHouseDatas(sql, fileName) + } + if(allRows && allRows.size()>0){ +// index = index + 1 +// if(index == 1){ +// FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); +// }else{ + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true); +// } + } + } + + if(new_dists){//²¹³ä±»ÐÞÇøÓòµÄÊý¾Ý + def newstr = "('"+new_dists.join("','")+"')" + def sql2 = "select CITYID,FORSALEID,PROPCODE,CITYNAME,DISTID,DISTNAME,COMMID,COMMNAME, BUILDID,BUILDNO, BUILDNAME,UNITID,UNITNO,UNITNAME,HOUSEID,ADDRESS,BUILDYEAR,PROPTYPE,PROPYEARS,UNITPRICE,TOTALPRICE,PAYTYPE,FLOORNUM,FLOORCNT,\n" + + " BUILDTYPE, HOUSESTRU,BUILDSTRU,BUILDAREA,LIVINGAREA,HOUSESTYLE,ROOMCNT,LIVINGROOMCNT,KITCHENCNT, BATHROOMCNT,HOUSEASPECT,FITMENT,IFELEVATOR,ELEVATORHOUSE,to_char(PUBLISHTIME,'yyyy-mm-dd hh24:mi:ss') as PUBLISHTIME,to_char(EXPIRETIME,'yyyy-mm-dd hh24:mi:ss') as EXPIRETIME,\n" + + " IFFIRST,DATASOURCE,AGENCYID,AGENCYNAME,PUBLISHER,PHONE,DESCRIPTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE,ATTACH " + + "from bigdata_forsale_gj where distid in ${newstr}" + def rets2 = getHouseDatas(sql2, fileName) + if(rets2.size()>0){ + FileUtils.batchCreateFile(rets2, fileName, headers, "utf-8", true); + } + } + println "BIGDATA_FORSALE_GJ Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println "BIGDATA_FORSALE_GJ ÉÏ´«FtpÍê³É......" + } + + def getHouseDatas(sql, fileName){ + def allRows = [] + def index = 0 + sqlInstance.eachRow(sql,{r-> + index = index+1 + println r.CITYNAME +" "+index + def data = [] + data << r.CITYID + data << r.FORSALEID + data << r.PROPCODE + data << r.CITYNAME + data << r.DISTID + data << r.DISTNAME + data << r.COMMID + data << r.COMMNAME + data << r.BUILDID + data << r.BUILDNO + data << r.BUILDNAME + data << r.UNITID + data << r.UNITNO + data << r.UNITNAME + data << r.HOUSEID + data << r.ADDRESS + data << r.BUILDYEAR + data << r.PROPTYPE + data << r.PROPYEARS + data << r.UNITPRICE + data << r.TOTALPRICE + data << r.PAYTYPE + data << r.FLOORNUM + data << r.FLOORCNT + data << r.BUILDTYPE + data << r.HOUSESTRU + data << r.BUILDSTRU + data << r.BUILDAREA + data << r.LIVINGAREA + data << r.HOUSESTYLE + data << r.ROOMCNT + data << r.LIVINGROOMCNT + data << r.KITCHENCNT + data << r.BATHROOMCNT + data << r.HOUSEASPECT + data << r.FITMENT + data << r.IFELEVATOR + data << r.ELEVATORHOUSE + data << r.PUBLISHTIME + data << r.EXPIRETIME + data << r.IFFIRST + data << r.DATASOURCE + data << r.AGENCYID + data << r.AGENCYNAME + data << r.PUBLISHER + data << r.PHONE + data << "" + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + data << r.ATTACH + allRows << data + if(allRows.size()%200000==0){ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true); + allRows.clear() + } + }); + + if(allRows.size>0){ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true); + allRows.clear() + } +// return allRows + return null + } + + + def exportAvmEvaluationGJNB(){ + + def fileName = "/ccb_evaluation/MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat" + def fileName1 = "/ccb_evaluation/MODEL_000000_000000_AVM_EVALUATION_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat" + fileName1 = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_GJ_ADD_${curDate}_0001.dat" + } + + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select ID,CITYID,CITYNAME, YEAR_MONTH, COMMUNITY_NUM, HAS_PRICE_COMMUNITY_NUM, PRICE_COVERAGE, ARTIFICIAL_CALC_NUM, ARTIFICIAL_CALC_COVERAGE, SAMPLE_CALC_NUM, SAMPLE_CALC_COVERAGE, \n" + + "ANN_CALC_NUM, ANN_CALC_COVERAGE, TEST_NUM, TEST_COMM_NUM, TEST_COMM_COVERAGE, PPE15_COVERAGE, RATE_MEDIAN, COEFFICIENT,DEAL_TEST_CASE_NUM, DEAL_TEST_COMM_NUM, DEAL_TEST_COMM_COVERAGE, DEAL_PPE15_COVERAGE, \n" + + "DEAL_COEFFICIENT, DEAL_RATE_MEDIAN, THIRD_TEST_CASE_NUM, THIRD_TEST_COMM_NUM, THIRD_TEST_COMM_COVERAGE, THIRD_PPE15_COVERAGE, THIRD_COEFFICIENT, THIRD_RATE_MEDIAN, \n" + + "to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, SOURCECODE from avm_evaluation_gj where CITYID='${cityCode}' "; + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.ID + data << r.CITYID + data << r.CITYNAME + data << r.YEAR_MONTH + data << r.COMMUNITY_NUM + data << r.HAS_PRICE_COMMUNITY_NUM + data << r.PRICE_COVERAGE + data << r.ARTIFICIAL_CALC_NUM + data << r.ARTIFICIAL_CALC_COVERAGE + data << r.SAMPLE_CALC_NUM + data << r.SAMPLE_CALC_COVERAGE + data << r.ANN_CALC_NUM + data << r.ANN_CALC_COVERAGE + data << r.TEST_NUM + data << r.TEST_COMM_NUM + data << r.TEST_COMM_COVERAGE + data << r.PPE15_COVERAGE + data << r.RATE_MEDIAN + data << r.COEFFICIENT + data << r.DEAL_TEST_CASE_NUM + data << r.DEAL_TEST_COMM_NUM + data << r.DEAL_TEST_COMM_COVERAGE + data << r.DEAL_PPE15_COVERAGE + data << r.DEAL_COEFFICIENT + data << r.DEAL_RATE_MEDIAN + data << r.THIRD_TEST_CASE_NUM + data << r.THIRD_TEST_COMM_NUM + data << r.THIRD_TEST_COMM_COVERAGE + data << r.THIRD_PPE15_COVERAGE + data << r.THIRD_COEFFICIENT + data << r.THIRD_RATE_MEDIAN + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + } + + def headers = [] + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + FileUtils.batchCreateFile(allRows, fileName1, headers, "utf-8", false); + println "AVM_EVALUATION_GJNB Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + CcbFtpTestUtils.ftpUpload(null, fileName1, curDate) + println "AVM_EVALUATION_GJNB ÉÏ´«FtpÍê³É......" + } + + def exportAVMEvaluationItemGJNB(){ + def fileName = "/ccb_evaluation/MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat" + def fileName1 = "/ccb_evaluation/MODEL_000000_000000_AVM_EVALUATION_ITEM_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat" + fileName1 = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_AVM_EVALUATION_ITEM_GJ_ADD_${curDate}_0001.dat" + } + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, COMMID, COMMNAME, YEAR_MONTH, CALC_AVG_PRICE, AVG_PRICE, CALC_TYPE, CONFIDENCE,TARGET_AVG_PRICE, \n" + + "to_char(DEALDATE,'yyyy-mm-dd hh24:mi:ss') as DEALDATE, UNIT_PRICE, BUILDAREA, FITMENT, HOUSEASPECT, FLOORNUM, FLOORCNT, DATA_TYPE, RATE, PE, \n" + + "to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME from avm_evaluation_item_gj where CITYID='${cityCode}' "; + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.ID + data << r.CITYID + data << r.CITYNAME + data << r.DISTID + data << r.DISTNAME + data << r.COMMID + data << r.COMMNAME + data << r.YEAR_MONTH + data << r.CALC_AVG_PRICE + data << r.AVG_PRICE + data << r.CALC_TYPE + data << r.CONFIDENCE + data << r.TARGET_AVG_PRICE + data << r.DEALDATE + data << r.UNIT_PRICE + data << r.BUILDAREA + data << r.FITMENT + data << r.HOUSEASPECT + data << r.FLOORNUM + data << r.FLOORCNT + data << r.DATA_TYPE + data << r.RATE + data << r.PE + data << r.CREATETIME + allRows << data + }); + } + def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","CONFIDENCE","TARGET_AVG_PRICE","DEALDATE","UNIT_PRICE","BUILDAREA","FITMENT","HOUSEASPECT","FLOORNUM","FLOORCNT","DATA_TYPE","RATE","PE","CREATETIME"] + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + FileUtils.batchCreateFile(allRows, fileName1, headers, "utf-8", false); + println "AVM_EVALUATION_ITEM_GJNB Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + CcbFtpTestUtils.ftpUpload(null, fileName1, curDate) + println "AVM_EVALUATION_ITEM_GJNB ÉÏ´«FtpÍê³É......" + } + + def exportCommunityBasePrice(){ + + def allRows = [] + def fileName = "/ccb_evaluation/MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" + def fileName1 = "/ccb_evaluation/MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" + fileName1 = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" + } + def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"] + + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, COMMID, COMMNAME, YEAR_MONTH, CALC_AVG_PRICE, AVG_PRICE, CALC_TYPE, FAKE_RATE, DIFF_RATE, CONFI_RATE, CORR_RATE, CONFIDENCE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from community_base_price_gj where CITYID='${cityCode}' "; + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.ID + data << r.CITYID + data << r.CITYNAME + data << r.DISTID + data << r.DISTNAME + data << r.COMMID + data << r.COMMNAME + data << r.YEAR_MONTH + data << r.CALC_AVG_PRICE + data << r.AVG_PRICE + data << r.CALC_TYPE + data << r.FAKE_RATE + data << r.DIFF_RATE + data << r.CONFI_RATE + data << r.CORR_RATE + data << r.CONFIDENCE + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + if(allRows.size()%200000==0){ + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true); + FileUtils.batchCreateFile(allRows, fileName1, headers, "utf-8", true); + allRows.clear() + } + }); + } + + if(allRows.size()>0){ + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true); + FileUtils.batchCreateFile(allRows, fileName1, headers, "utf-8", true); + } + + println "COMMUNITY_BASE_PRICE_GJNB Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + CcbFtpTestUtils.ftpUpload(null, fileName1, curDate) + println "COMMUNITY_BASE_PRICE_GJNB ÉÏ´«FtpÍê³É......" + } + + def exportCommunityBasePriceGj(){ + def allRows = [] + def fileName = "/ccb_evaluation/MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" + } + def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, COMMID, COMMNAME, YEAR_MONTH, CALC_AVG_PRICE, AVG_PRICE, CALC_TYPE, FAKE_RATE, DIFF_RATE, CONFI_RATE, CORR_RATE, CONFIDENCE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from community_base_price_gj where CITYID='${cityCode}' "; + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.ID + data << r.CITYID + data << r.CITYNAME + data << r.DISTID + data << r.DISTNAME + data << r.COMMID + data << r.COMMNAME + data << r.YEAR_MONTH + data << r.CALC_AVG_PRICE + data << r.AVG_PRICE + data << r.CALC_TYPE + data << r.FAKE_RATE + data << r.DIFF_RATE + data << r.CONFI_RATE + data << r.CORR_RATE + data << r.CONFIDENCE + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + if(allRows.size()%200000==0){ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true); + allRows.clear() + } + }); + } + + if(allRows.size()>0){ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true); + } + + println "COMMUNITY_BASE_PRICE_GJ Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println "COMMUNITY_BASE_PRICE_GJ ÉÏ´«FtpÍê³É......" + } + + def exportCityPrice(){ + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + + def sql = "select ID, CITYID, CITYNAME, YEAR_MONTH, CALC_AVG_PRICE, PRICE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, SOURCECODE from city_price_gj where CITYID='${cityCode}'"; + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.ID + data << r.CITYID + data << r.CITYNAME + data << r.YEAR_MONTH + data << r.CALC_AVG_PRICE + data << r.PRICE + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + } + def fileName = "/ccb_evaluation/MODEL_000000_000000_CITY_PRICE_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_CITY_PRICE_GJ_ADD_${curDate}_0001.dat" + } + def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"] + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + println "CITY_PRICE_GJ Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println "CITY_PRICE_GJ ÉÏ´«FtpÍê³É......" + } + + def exportRegionPrice(){ + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, YEAR_MONTH, CALC_AVG_PRICE, PRICE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, SOURCECODE from DISTRICT_PRICE_GJ where CITYID='${cityCode}'"; + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.ID + data << r.CITYID + data << r.CITYNAME + data << r.DISTID + data << r.DISTNAME + data << r.YEAR_MONTH + data << r.CALC_AVG_PRICE + data << r.PRICE + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + } + def fileName = "/ccb_evaluation/MODEL_000000_000000_DISTRICT_PRICE_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_DISTRICT_PRICE_GJ_ADD_${curDate}_0001.dat" + } + def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"] + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + println "DISTRICT_PRICE_GJ Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println "DISTRICT_PRICE_GJ ÉÏ´«FtpÍê³É......" + } + + def exportCommunityPdescribeGj(){ + + def fileName = "/ccb_evaluation/MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" + } + def headers = [] + + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select ID,COMMUNITY_ID,CITYID ,CITY_NAME,DISTRICT_CODE ,DISTRICT_NAME,COMMUNITY_NAME,PQ_NAME,BASE_PRICE,CONFIDENCE_LEVEL,CNT,MIN_PRICE,MEDIANPRICE,MEANPRICE,MAX_PRICE,TIME,FIRSTDATAT,THIRDDATA,RELATIVEERROR,SKEWNESS,PQ_PRICE_RANGE,DISTRICT_PRICE_RANGE ,DESCRIPTION,PRIV_BASE_PRICE,IS_ARTTFICIAL,PRIV_FINAL_PRICE,to_char(CREATE_DATE,'yyyy-mm-dd') as CREATE_DATE,PRICE,PRICE_SOURCE,CASE_MD_PRICE,CASE_AVG_PRICE,INDEX_LABEL,MAIN_PROPERTY,COMMTYPE,NEW_DEAL_PRICE,to_char(NEW_DEAL_DATE,'yyyy-mm-dd') as NEW_DEAL_DATE,PRICE_MOM_RATIO,MAX_MOM_RATIO,PRICE_YOY_RATIO ,SATUR_RATIO,NEIGHBOR_PRICE from community_p_describe_gj where CITYID='${cityCode}'"; + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.ID + data << r.COMMUNITY_ID + data << r.CITYID + data << r.CITY_NAME + data << r.DISTRICT_CODE + data << r.DISTRICT_NAME + data << r.COMMUNITY_NAME + data << r.PQ_NAME + data << r.BASE_PRICE + data << r.CONFIDENCE_LEVEL + data << r.CNT + data << r.MIN_PRICE + data << r.MEDIANPRICE + data << r.MEANPRICE + data << r.MAX_PRICE + data << r.TIME + data << r.FIRSTDATAT + data << r.THIRDDATA + data << r.RELATIVEERROR + data << r.SKEWNESS + data << r.PQ_PRICE_RANGE + data << r.DISTRICT_PRICE_RANGE + data << r.DESCRIPTION + data << r.PRIV_BASE_PRICE + data << r.IS_ARTTFICIAL + data << r.PRIV_FINAL_PRICE + data << r.CREATE_DATE + data << r.PRICE + data << r.PRICE_SOURCE + data << r.CASE_MD_PRICE + data << r.CASE_AVG_PRICE + data << r.INDEX_LABEL + data << r.MAIN_PROPERTY + data << r.COMMTYPE + data << r.NEW_DEAL_PRICE + data << r.NEW_DEAL_DATE + data << r.PRICE_MOM_RATIO + data << r.MAX_MOM_RATIO + data << r.PRICE_YOY_RATIO + data << r.SATUR_RATIO + data << r.NEIGHBOR_PRICE + allRows << data + + if(allRows.size()%200000==0){ + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true); + allRows.clear() + } + }); + } + + println allRows.size() + if(allRows.size()>0){ + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true); + allRows.clear() + } + println "community_p_describe_gj Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println "community_p_describe_gj ÉÏ´«FtpÍê³É......" + } + + def exportCommCaseDetailGj(){ + + def fileName = "/ccb_evaluation/MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat" + } + def headers = [] + def allRows = [] + def index = 0 + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select ID, CITYID, COMMUNITY_ID, NETLISTING_ID, PRICE_DATE, to_char(CREATE_DATE,'yyyy-mm-dd') as CREATE_DATE from comm_case_detail_gj where cityid='${cityCode}'"; + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.ID + data << r.CITYID + data << r.COMMUNITY_ID + data << r.NETLISTING_ID + data << r.PRICE_DATE + data << r.CREATE_DATE + allRows << data + if(allRows.size()%200000==0){ + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true); + allRows.clear() + } + }); + } + + if(allRows.size()>0){ + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true); + allRows.clear() + } + println "comm_case_detail_gj Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println "comm_case_detail_gj ÉÏ´«FtpÍê³É......" + } + + def exportLastFile(){ + def dataCodeFileName = "/ccb_evaluation/${curDate}.ok" + if(CommonDatautils.isWindow()){ + dataCodeFileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\${curDate}.ok" + } + FileUtils.batchCreateFile([], dataCodeFileName, [], "utf-8", false); + CcbFtpTestUtils.ftpUpload(null, dataCodeFileName, curDate) + } + + def exportOkFile(){ + def dataCodeFileName = "/ccb_evaluation/${curDate}.ok" + if(CommonDatautils.isWindow()){ + dataCodeFileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\${curDate}.ok" + } + FileUtils.batchCreateFile([], dataCodeFileName, [], "utf-8", false); + CcbFtpTestUtils.ftpUpload(null, dataCodeFileName, curDate) + } + + def exportInOk(){ + Vector files = CcbFtpTestUtils.listFileNames(null, curDate) + Iterator fileVec = files.iterator() + def fileRows = [] + while(fileVec.hasNext()){ + ChannelSftp.LsEntry file = fileVec.next() + + if(org.apache.commons.lang.StringUtils.isNotBlank(file.getFilename()) && file.getFilename().endsWith(".dat")){ + fileRows << file.getFilename() +" "+CcbFtpTestUtils.getFileLength(null, file.getFilename(), curDate) + } + } + def fileName = "/ccb_evaluation/${curDate}.ok" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\${curDate}.ok" + } + FileUtils.createTxtFile(fileRows, fileName, "utf-8", false); + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println "ͳ¼ÆÎļþ³¤¶ÈokÎļþ ÉÏ´«FtpÍê³É......" + } +} + diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleData.groovy index 22861ba1d..b25c4efbd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleData.groovy @@ -43,7 +43,8 @@ class ExportOracleData { exportCommunityBuileType()// exportThirdPartyPrice2(lastMonth, new_dists)// - exportBigdataForsale(lastMonthStr +"-19", new_dists) //2022-07-19 +// exportBigdataForsale(lastMonthStr +"-19", new_dists) //2022-07-19 ֮ǰ°´publish_dateµ¼³ö + exportBigdataForsale(lastMonthStr +"-18", new_dists) //ÏÖÔÚ°´updatetimeµ¼³ö exportBigdataDeal(lastMonthStr + "-01", new_dists) //2022-07-01 //µÚÈý·½ÍøÕ¾È¨Öرí @@ -659,13 +660,13 @@ class ExportOracleData { def sql1 = "select CITYID,FORSALEID,PROPCODE,CITYNAME,DISTID,DISTNAME,COMMID,COMMNAME, BUILDID,BUILDNO, BUILDNAME,UNITID,UNITNO,UNITNAME,HOUSEID,ADDRESS,BUILDYEAR,PROPTYPE,PROPYEARS,UNITPRICE,TOTALPRICE,PAYTYPE,FLOORNUM,FLOORCNT,\n" + " BUILDTYPE, HOUSESTRU,BUILDSTRU,BUILDAREA,LIVINGAREA,HOUSESTYLE,ROOMCNT,LIVINGROOMCNT,KITCHENCNT, BATHROOMCNT,HOUSEASPECT,FITMENT,IFELEVATOR,ELEVATORHOUSE,to_char(PUBLISHTIME,'yyyy-mm-dd hh24:mi:ss') as PUBLISHTIME,to_char(EXPIRETIME,'yyyy-mm-dd hh24:mi:ss') as EXPIRETIME,\n" + " IFFIRST,DATASOURCE,AGENCYID,AGENCYNAME,PUBLISHER,PHONE,DESCRIPTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE,ATTACH from bigdata_forsale_gj " + - "where cityId='${cityCode}' and publishtime>=to_date('${publishDate}','yyyy-MM-dd') and distid not in ${newstr}"; + "where cityId='${cityCode}' and updatetime>=to_date('${publishDate}','yyyy-MM-dd') and distid not in ${newstr}"; def rets1 = getHouseDatas(sql1) allRows.addAll(rets1) }else{ def sql = "select CITYID,FORSALEID,PROPCODE,CITYNAME,DISTID,DISTNAME,COMMID,COMMNAME, BUILDID,BUILDNO, BUILDNAME,UNITID,UNITNO,UNITNAME,HOUSEID,ADDRESS,BUILDYEAR,PROPTYPE,PROPYEARS,UNITPRICE,TOTALPRICE,PAYTYPE,FLOORNUM,FLOORCNT,\n" + " BUILDTYPE, HOUSESTRU,BUILDSTRU,BUILDAREA,LIVINGAREA,HOUSESTYLE,ROOMCNT,LIVINGROOMCNT,KITCHENCNT, BATHROOMCNT,HOUSEASPECT,FITMENT,IFELEVATOR,ELEVATORHOUSE,to_char(PUBLISHTIME,'yyyy-mm-dd hh24:mi:ss') as PUBLISHTIME,to_char(EXPIRETIME,'yyyy-mm-dd hh24:mi:ss') as EXPIRETIME,\n" + - " IFFIRST,DATASOURCE,AGENCYID,AGENCYNAME,PUBLISHER,PHONE,DESCRIPTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE,ATTACH from bigdata_forsale_gj where cityId='${cityCode}' and publishtime>=to_date('${publishDate}','yyyy-MM-dd')"; + " IFFIRST,DATASOURCE,AGENCYID,AGENCYNAME,PUBLISHER,PHONE,DESCRIPTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE,ATTACH from bigdata_forsale_gj where cityId='${cityCode}' and updatetime>=to_date('${publishDate}','yyyy-MM-dd')"; allRows = getHouseDatas(sql) } if(allRows.size()>0){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleDataTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleDataTest.groovy index 431fc02c2..2c727edfa 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleDataTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleDataTest.groovy @@ -12,6 +12,7 @@ import org.apache.commons.codec.digest.DigestUtils import java.sql.ResultSet +//µ¼³ö¹ÀÖµ ÔöÁ¿Êý¾Ý аæ class ExportOracleDataTest { def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", @@ -45,7 +46,7 @@ class ExportOracleDataTest { exportCommunityBuileType()// exportThirdPartyPrice2(lastMonth, new_dists)// - exportBigdataForsale(lastMonthStr +"-19", new_dists) //2022-07-19 + exportBigdataForsale(lastMonthStr +"-18", new_dists) //2022-07-19 °´¸üÐÂʱ¼äµ¼³öÊý¾Ý exportBigdataDeal(lastMonthStr + "-01", new_dists) //2022-07-01 //µÚÈý·½ÍøÕ¾È¨Öرí @@ -58,7 +59,7 @@ class ExportOracleDataTest { exportCityPrice(curMonth)//ÎÞ³ÇÊÐÇø·Ö exportRegionPrice(curMonth)//ÎÞ³ÇÊÐÇø·Ö - exportCommunityBasePriceGj(curMonth)//ÒѺÏÏÂÃæµÄºÏ²¢ //ÎÞ³ÇÊÐÇø·Ö +// exportCommunityBasePriceGj(curMonth)//ÒѺÏÏÂÃæµÄºÏ²¢ //ÎÞ³ÇÊÐÇø·Ö exportCommunityBasePrice(curMonth)//ÎÞ³ÇÊÐÇø·Ö exportCommunityPdescribeGj(curMonth)//ÎÞ³ÇÊÐÇø·Ö @@ -658,13 +659,13 @@ class ExportOracleDataTest { def sql1 = "select CITYID,FORSALEID,PROPCODE,CITYNAME,DISTID,DISTNAME,COMMID,COMMNAME, BUILDID,BUILDNO, BUILDNAME,UNITID,UNITNO,UNITNAME,HOUSEID,ADDRESS,BUILDYEAR,PROPTYPE,PROPYEARS,UNITPRICE,TOTALPRICE,PAYTYPE,FLOORNUM,FLOORCNT,\n" + " BUILDTYPE, HOUSESTRU,BUILDSTRU,BUILDAREA,LIVINGAREA,HOUSESTYLE,ROOMCNT,LIVINGROOMCNT,KITCHENCNT, BATHROOMCNT,HOUSEASPECT,FITMENT,IFELEVATOR,ELEVATORHOUSE,to_char(PUBLISHTIME,'yyyy-mm-dd hh24:mi:ss') as PUBLISHTIME,to_char(EXPIRETIME,'yyyy-mm-dd hh24:mi:ss') as EXPIRETIME,\n" + " IFFIRST,DATASOURCE,AGENCYID,AGENCYNAME,PUBLISHER,PHONE,DESCRIPTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE,ATTACH from bigdata_forsale_gj " + - "where cityId='${cityCode}' and publishtime>=to_date('${publishDate}','yyyy-MM-dd') and distid not in ${newstr}"; + "where cityId='${cityCode}' and updatetime>=to_date('${publishDate}','yyyy-MM-dd') and distid not in ${newstr}"; def rets1 = getHouseDatas(sql1) allRows.addAll(rets1) }else{ def sql = "select CITYID,FORSALEID,PROPCODE,CITYNAME,DISTID,DISTNAME,COMMID,COMMNAME, BUILDID,BUILDNO, BUILDNAME,UNITID,UNITNO,UNITNAME,HOUSEID,ADDRESS,BUILDYEAR,PROPTYPE,PROPYEARS,UNITPRICE,TOTALPRICE,PAYTYPE,FLOORNUM,FLOORCNT,\n" + " BUILDTYPE, HOUSESTRU,BUILDSTRU,BUILDAREA,LIVINGAREA,HOUSESTYLE,ROOMCNT,LIVINGROOMCNT,KITCHENCNT, BATHROOMCNT,HOUSEASPECT,FITMENT,IFELEVATOR,ELEVATORHOUSE,to_char(PUBLISHTIME,'yyyy-mm-dd hh24:mi:ss') as PUBLISHTIME,to_char(EXPIRETIME,'yyyy-mm-dd hh24:mi:ss') as EXPIRETIME,\n" + - " IFFIRST,DATASOURCE,AGENCYID,AGENCYNAME,PUBLISHER,PHONE,DESCRIPTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE,ATTACH from bigdata_forsale_gj where cityId='${cityCode}' and publishtime>=to_date('${publishDate}','yyyy-MM-dd')"; + " IFFIRST,DATASOURCE,AGENCYID,AGENCYNAME,PUBLISHER,PHONE,DESCRIPTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE,ATTACH from bigdata_forsale_gj where cityId='${cityCode}' and updatetime>=to_date('${publishDate}','yyyy-MM-dd')"; allRows = getHouseDatas(sql) } if(allRows.size()>0){ @@ -976,9 +977,9 @@ class ExportOracleDataTest { }); def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" - def fileName = "/ccb_evaluation/MODEL_000000_000000_CITY_PRICE_GJ_ALL_${curDate}_0001.dat" + def fileName = "/ccb_evaluation/MODEL_000000_000000_CITY_PRICE_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_CITY_PRICE_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_CITY_PRICE_GJ_ADD_${curDate}_0001.dat" } def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); @@ -1007,9 +1008,9 @@ class ExportOracleDataTest { }); def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" - def fileName = "/ccb_evaluation/MODEL_000000_000000_DISTRICT_PRICE_GJ_ALL_${curDate}_0001.dat" + def fileName = "/ccb_evaluation/MODEL_000000_000000_DISTRICT_PRICE_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_DISTRICT_PRICE_GJ_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_DISTRICT_PRICE_GJ_ADD_${curDate}_0001.dat" } def headers = []//["ID","CITYID","CITYNAME","DISTID","DISTNAME","COMMID","COMMNAME","YEAR_MONTH","CALC_AVG_PRICE","AVG_PRICE","CALC_TYPE","FAKE_RATE","DIFF_RATE","CONFI_RATE","CORR_RATE","CONFIDENCE","CREATETIME","UPDATETIME","SOURCECODE"] FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); @@ -1149,14 +1150,14 @@ class ExportOracleDataTest { def exportInOk(){ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" - Vector files = CcbFtpTestUtils.listFileNames(curDate) + Vector files = CcbFtpTestUtils.listFileNames(null, curDate) Iterator fileVec = files.iterator() def fileRows = [] while(fileVec.hasNext()){ ChannelSftp.LsEntry file = fileVec.next() if(org.apache.commons.lang.StringUtils.isNotBlank(file.getFilename()) && file.getFilename().endsWith(".dat")){ - fileRows << file.getFilename() +" "+CcbFtpTestUtils.getFileLength(file.getFilename(), curDate) + fileRows << file.getFilename() +" "+CcbFtpTestUtils.getFileLength(null, file.getFilename(), curDate) } } def fileName = "/ccb_evaluation/${curDate}.ok" diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleEvaluationData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleEvaluationData.groovy index b37ee5b94..513e7025c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleEvaluationData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ExportOracleEvaluationData.groovy @@ -13,6 +13,8 @@ class ExportOracleEvaluationData { "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") def citys = null + def cityCodeMap = CcbCommonUtils.findCityCodeValue() + static main(args) { def task = new ExportOracleEvaluationData() task.run(args) @@ -29,7 +31,7 @@ class ExportOracleEvaluationData { exportCityPrice(curMonth) exportRegionPrice(curMonth) - exportCommunityBasePriceGj(curMonth)//ÒѺÏÏÂÃæµÄºÏ²¢ + // exportCommunityBasePriceGj(curMonth)//ÒѺÏÏÂÃæµÄºÏ²¢ exportCommunityBasePrice(curMonth) exportCommunityPdescribeGj(curMonth) @@ -45,49 +47,53 @@ class ExportOracleEvaluationData { } def exportAvmEvaluationGJNB(yearMonth){ - def sql = "select ID,CITYID,CITYNAME, YEAR_MONTH, COMMUNITY_NUM, HAS_PRICE_COMMUNITY_NUM, PRICE_COVERAGE, ARTIFICIAL_CALC_NUM, ARTIFICIAL_CALC_COVERAGE, SAMPLE_CALC_NUM, SAMPLE_CALC_COVERAGE, \n" + - "ANN_CALC_NUM, ANN_CALC_COVERAGE, TEST_NUM, TEST_COMM_NUM, TEST_COMM_COVERAGE, PPE15_COVERAGE, RATE_MEDIAN, COEFFICIENT,DEAL_TEST_CASE_NUM, DEAL_TEST_COMM_NUM, DEAL_TEST_COMM_COVERAGE, DEAL_PPE15_COVERAGE, \n" + - "DEAL_COEFFICIENT, DEAL_RATE_MEDIAN, THIRD_TEST_CASE_NUM, THIRD_TEST_COMM_NUM, THIRD_TEST_COMM_COVERAGE, THIRD_PPE15_COVERAGE, THIRD_COEFFICIENT, THIRD_RATE_MEDIAN, \n" + - "to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, SOURCECODE from avm_evaluation_gj where YEAR_MONTH = ${yearMonth}"; + def allRows = [] - sqlInstance.eachRow(sql,{r-> - def data = [] - data << r.ID - data << r.CITYID - data << r.CITYNAME - data << r.YEAR_MONTH - data << r.COMMUNITY_NUM - data << r.HAS_PRICE_COMMUNITY_NUM - data << r.PRICE_COVERAGE - data << r.ARTIFICIAL_CALC_NUM - data << r.ARTIFICIAL_CALC_COVERAGE - data << r.SAMPLE_CALC_NUM - data << r.SAMPLE_CALC_COVERAGE - data << r.ANN_CALC_NUM - data << r.ANN_CALC_COVERAGE - data << r.TEST_NUM - data << r.TEST_COMM_NUM - data << r.TEST_COMM_COVERAGE - data << r.PPE15_COVERAGE - data << r.RATE_MEDIAN - data << r.COEFFICIENT - data << r.DEAL_TEST_CASE_NUM - data << r.DEAL_TEST_COMM_NUM - data << r.DEAL_TEST_COMM_COVERAGE - data << r.DEAL_PPE15_COVERAGE - data << r.DEAL_COEFFICIENT - data << r.DEAL_RATE_MEDIAN - data << r.THIRD_TEST_CASE_NUM - data << r.THIRD_TEST_COMM_NUM - data << r.THIRD_TEST_COMM_COVERAGE - data << r.THIRD_PPE15_COVERAGE - data << r.THIRD_COEFFICIENT - data << r.THIRD_RATE_MEDIAN - data << r.CREATETIME - data << r.UPDATETIME - data << r.SOURCECODE - allRows << data - }); + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select ID,CITYID,CITYNAME, YEAR_MONTH, COMMUNITY_NUM, HAS_PRICE_COMMUNITY_NUM, PRICE_COVERAGE, ARTIFICIAL_CALC_NUM, ARTIFICIAL_CALC_COVERAGE, SAMPLE_CALC_NUM, SAMPLE_CALC_COVERAGE, \n" + + "ANN_CALC_NUM, ANN_CALC_COVERAGE, TEST_NUM, TEST_COMM_NUM, TEST_COMM_COVERAGE, PPE15_COVERAGE, RATE_MEDIAN, COEFFICIENT,DEAL_TEST_CASE_NUM, DEAL_TEST_COMM_NUM, DEAL_TEST_COMM_COVERAGE, DEAL_PPE15_COVERAGE, \n" + + "DEAL_COEFFICIENT, DEAL_RATE_MEDIAN, THIRD_TEST_CASE_NUM, THIRD_TEST_COMM_NUM, THIRD_TEST_COMM_COVERAGE, THIRD_PPE15_COVERAGE, THIRD_COEFFICIENT, THIRD_RATE_MEDIAN, \n" + + "to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, SOURCECODE from avm_evaluation_gj where YEAR_MONTH = ${yearMonth} and CITYID='${cityCode}'"; + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.ID + data << r.CITYID + data << r.CITYNAME + data << r.YEAR_MONTH + data << r.COMMUNITY_NUM + data << r.HAS_PRICE_COMMUNITY_NUM + data << r.PRICE_COVERAGE + data << r.ARTIFICIAL_CALC_NUM + data << r.ARTIFICIAL_CALC_COVERAGE + data << r.SAMPLE_CALC_NUM + data << r.SAMPLE_CALC_COVERAGE + data << r.ANN_CALC_NUM + data << r.ANN_CALC_COVERAGE + data << r.TEST_NUM + data << r.TEST_COMM_NUM + data << r.TEST_COMM_COVERAGE + data << r.PPE15_COVERAGE + data << r.RATE_MEDIAN + data << r.COEFFICIENT + data << r.DEAL_TEST_CASE_NUM + data << r.DEAL_TEST_COMM_NUM + data << r.DEAL_TEST_COMM_COVERAGE + data << r.DEAL_PPE15_COVERAGE + data << r.DEAL_COEFFICIENT + data << r.DEAL_RATE_MEDIAN + data << r.THIRD_TEST_CASE_NUM + data << r.THIRD_TEST_COMM_NUM + data << r.THIRD_TEST_COMM_COVERAGE + data << r.THIRD_PPE15_COVERAGE + data << r.THIRD_COEFFICIENT + data << r.THIRD_RATE_MEDIAN + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + } def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"; def fileName = "/ccb/MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat" @@ -108,38 +114,43 @@ class ExportOracleEvaluationData { } def exportAVMEvaluationItemGJNB(yearMonth){ - def sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, COMMID, COMMNAME, YEAR_MONTH, CALC_AVG_PRICE, AVG_PRICE, CALC_TYPE, CONFIDENCE,TARGET_AVG_PRICE, \n" + - "to_char(DEALDATE,'yyyy-mm-dd hh24:mi:ss') as DEALDATE, UNIT_PRICE, BUILDAREA, FITMENT, HOUSEASPECT, FLOORNUM, FLOORCNT, DATA_TYPE, RATE, PE, \n" + - "to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME from avm_evaluation_item_gj where YEAR_MONTH = ${yearMonth}"; + def allRows = [] - sqlInstance.eachRow(sql,{r-> - def data = [] - data << r.ID - data << r.CITYID - data << r.CITYNAME - data << r.DISTID - data << r.DISTNAME - data << r.COMMID - data << r.COMMNAME - data << r.YEAR_MONTH - data << r.CALC_AVG_PRICE - data << r.AVG_PRICE - data << r.CALC_TYPE - data << r.CONFIDENCE - data << r.TARGET_AVG_PRICE - data << r.DEALDATE - data << r.UNIT_PRICE - data << r.BUILDAREA - data << r.FITMENT - data << r.HOUSEASPECT - data << r.FLOORNUM - data << r.FLOORCNT - data << r.DATA_TYPE - data << r.RATE - data << r.PE - data << r.CREATETIME - allRows << data - }); + + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, COMMID, COMMNAME, YEAR_MONTH, CALC_AVG_PRICE, AVG_PRICE, CALC_TYPE, CONFIDENCE,TARGET_AVG_PRICE, \n" + + "to_char(DEALDATE,'yyyy-mm-dd hh24:mi:ss') as DEALDATE, UNIT_PRICE, BUILDAREA, FITMENT, HOUSEASPECT, FLOORNUM, FLOORCNT, DATA_TYPE, RATE, PE, \n" + + "to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME from avm_evaluation_item_gj where YEAR_MONTH = ${yearMonth} AND CITYID='${cityCode}'"; + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.ID + data << r.CITYID + data << r.CITYNAME + data << r.DISTID + data << r.DISTNAME + data << r.COMMID + data << r.COMMNAME + data << r.YEAR_MONTH + data << r.CALC_AVG_PRICE + data << r.AVG_PRICE + data << r.CALC_TYPE + data << r.CONFIDENCE + data << r.TARGET_AVG_PRICE + data << r.DEALDATE + data << r.UNIT_PRICE + data << r.BUILDAREA + data << r.FITMENT + data << r.HOUSEASPECT + data << r.FLOORNUM + data << r.FLOORCNT + data << r.DATA_TYPE + data << r.RATE + data << r.PE + data << r.CREATETIME + allRows << data + }); + } def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"; def fileName = "/ccb/MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat" @@ -158,31 +169,35 @@ class ExportOracleEvaluationData { } def exportCommunityBasePrice(yearMonth){ - def sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, COMMID, COMMNAME, YEAR_MONTH, CALC_AVG_PRICE, AVG_PRICE, CALC_TYPE, FAKE_RATE, DIFF_RATE, CONFI_RATE, CORR_RATE, CONFIDENCE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from community_base_price_gj where year_month=${yearMonth}"; + def allRows = [] - sqlInstance.eachRow(sql,{r-> - def data = [] - data << r.ID - data << r.CITYID - data << r.CITYNAME - data << r.DISTID - data << r.DISTNAME - data << r.COMMID - data << r.COMMNAME - data << r.YEAR_MONTH - data << r.CALC_AVG_PRICE - data << r.AVG_PRICE - data << r.CALC_TYPE - data << r.FAKE_RATE - data << r.DIFF_RATE - data << r.CONFI_RATE - data << r.CORR_RATE - data << r.CONFIDENCE - data << r.CREATETIME - data << r.UPDATETIME - data << r.SOURCECODE - allRows << data - }); + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, COMMID, COMMNAME, YEAR_MONTH, CALC_AVG_PRICE, AVG_PRICE, CALC_TYPE, FAKE_RATE, DIFF_RATE, CONFI_RATE, CORR_RATE, CONFIDENCE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from community_base_price_gj where year_month=${yearMonth} AND CITYID='${cityCode}'"; + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.ID + data << r.CITYID + data << r.CITYNAME + data << r.DISTID + data << r.DISTNAME + data << r.COMMID + data << r.COMMNAME + data << r.YEAR_MONTH + data << r.CALC_AVG_PRICE + data << r.AVG_PRICE + data << r.CALC_TYPE + data << r.FAKE_RATE + data << r.DIFF_RATE + data << r.CONFI_RATE + data << r.CORR_RATE + data << r.CONFIDENCE + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + } def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"; def fileName = "/ccb/MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" @@ -201,34 +216,39 @@ class ExportOracleEvaluationData { } def exportCommunityBasePriceGj(yearMonth){ - def sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, COMMID, COMMNAME, YEAR_MONTH, CALC_AVG_PRICE, AVG_PRICE, CALC_TYPE, FAKE_RATE, DIFF_RATE, CONFI_RATE, CORR_RATE, CONFIDENCE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from community_base_price_gj where year_month=${yearMonth}"; + def allRows = [] - sqlInstance.eachRow(sql,{r-> - def data = [] - data << r.ID - data << r.CITYID - data << r.CITYNAME - data << r.DISTID - data << r.DISTNAME - data << r.COMMID - data << r.COMMNAME - data << r.YEAR_MONTH - data << r.CALC_AVG_PRICE - data << r.AVG_PRICE - data << r.CALC_TYPE - data << r.FAKE_RATE - data << r.DIFF_RATE - data << r.CONFI_RATE - data << r.CORR_RATE - data << r.CONFIDENCE - data << r.CREATETIME - data << r.UPDATETIME - data << r.SOURCECODE - allRows << data - }); + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, COMMID, COMMNAME, YEAR_MONTH, CALC_AVG_PRICE, AVG_PRICE, CALC_TYPE, FAKE_RATE, DIFF_RATE, CONFI_RATE, CORR_RATE, CONFIDENCE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from community_base_price_gj where year_month=${yearMonth} AND CITYID='${cityCode}'"; + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.ID + data << r.CITYID + data << r.CITYNAME + data << r.DISTID + data << r.DISTNAME + data << r.COMMID + data << r.COMMNAME + data << r.YEAR_MONTH + data << r.CALC_AVG_PRICE + data << r.AVG_PRICE + data << r.CALC_TYPE + data << r.FAKE_RATE + data << r.DIFF_RATE + data << r.CONFI_RATE + data << r.CORR_RATE + data << r.CONFIDENCE + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + } def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"; def fileName = "/ccb/MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" } @@ -240,21 +260,24 @@ class ExportOracleEvaluationData { } def exportCityPrice(month){ - def sql = "select ID, CITYID, CITYNAME, YEAR_MONTH, CALC_AVG_PRICE, PRICE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, SOURCECODE from city_price_gj where year_month=${month}"; def allRows = [] - sqlInstance.eachRow(sql,{r-> - def data = [] - data << r.ID - data << r.CITYID - data << r.CITYNAME - data << r.YEAR_MONTH - data << r.CALC_AVG_PRICE - data << r.PRICE - data << r.CREATETIME - data << r.UPDATETIME - data << r.SOURCECODE - allRows << data - }); + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select ID, CITYID, CITYNAME, YEAR_MONTH, CALC_AVG_PRICE, PRICE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, SOURCECODE from city_price_gj where year_month=${month} AND CITYID='${cityCode}'"; + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.ID + data << r.CITYID + data << r.CITYNAME + data << r.YEAR_MONTH + data << r.CALC_AVG_PRICE + data << r.PRICE + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + } def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" def fileName = "/ccb/MODEL_000000_000000_CITY_PRICE_GJ_ALL_${curDate}_0001.dat" @@ -269,23 +292,27 @@ class ExportOracleEvaluationData { } def exportRegionPrice(month){ - def sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, YEAR_MONTH, CALC_AVG_PRICE, PRICE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, SOURCECODE from DISTRICT_PRICE_GJ where year_month=${month}"; def allRows = [] - sqlInstance.eachRow(sql,{r-> - def data = [] - data << r.ID - data << r.CITYID - data << r.CITYNAME - data << r.DISTID - data << r.DISTNAME - data << r.YEAR_MONTH - data << r.CALC_AVG_PRICE - data << r.PRICE - data << r.CREATETIME - data << r.UPDATETIME - data << r.SOURCECODE - allRows << data - }); + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, YEAR_MONTH, CALC_AVG_PRICE, PRICE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, SOURCECODE from DISTRICT_PRICE_GJ where year_month=${month} AND CITYID='${cityCode}'"; + + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.ID + data << r.CITYID + data << r.CITYNAME + data << r.DISTID + data << r.DISTNAME + data << r.YEAR_MONTH + data << r.CALC_AVG_PRICE + data << r.PRICE + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + } def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" def fileName = "/ccb/MODEL_000000_000000_DISTRICT_PRICE_GJ_ALL_${curDate}_0001.dat" @@ -301,68 +328,67 @@ class ExportOracleEvaluationData { def exportCommunityPdescribeGj(month){ -// def citys = CcbCommonUtils.citys; -// def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" def fileName = "/ccb/MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" } def headers = [] -// -// for(def city : citys) { -// def cityCode = cityCodeDataMap.get(city) - def sql = "select ID,COMMUNITY_ID,CITYID ,CITY_NAME,DISTRICT_CODE ,DISTRICT_NAME,COMMUNITY_NAME,PQ_NAME,BASE_PRICE,CONFIDENCE_LEVEL,CNT,MIN_PRICE,MEDIANPRICE,MEANPRICE,MAX_PRICE,TIME,FIRSTDATAT,THIRDDATA,RELATIVEERROR,SKEWNESS,PQ_PRICE_RANGE,DISTRICT_PRICE_RANGE ,DESCRIPTION,PRIV_BASE_PRICE,IS_ARTTFICIAL,PRIV_FINAL_PRICE,to_char(CREATE_DATE,'yyyy-mm-dd') as CREATE_DATE,PRICE,PRICE_SOURCE,CASE_MD_PRICE,CASE_AVG_PRICE,INDEX_LABEL,MAIN_PROPERTY,COMMTYPE,NEW_DEAL_PRICE,to_char(NEW_DEAL_DATE,'yyyy-mm-dd') as NEW_DEAL_DATE,PRICE_MOM_RATIO,MAX_MOM_RATIO,PRICE_YOY_RATIO ,SATUR_RATIO,NEIGHBOR_PRICE from community_p_describe_gj where time=${month}"; -// def sql = "select ID,COMMUNITY_ID,CITYID ,CITY_NAME,DISTRICT_CODE ,DISTRICT_NAME,COMMUNITY_NAME,PQ_NAME,BASE_PRICE,CONFIDENCE_LEVEL,CNT,MIN_PRICE,MEDIANPRICE,MEANPRICE,MAX_PRICE,TIME,FIRSTDATAT,THIRDDATA,RELATIVEERROR,SKEWNESS,PQ_PRICE_RANGE,DISTRICT_PRICE_RANGE ,DESCRIPTION,PRIV_BASE_PRICE,IS_ARTTFICIAL,PRIV_FINAL_PRICE,to_char(CREATE_DATE,'yyyy-mm-dd') as CREATE_DATE,PRICE,PRICE_SOURCE,CASE_MD_PRICE,CASE_AVG_PRICE,INDEX_LABEL,MAIN_PROPERTY,COMMTYPE,NEW_DEAL_PRICE,to_char(NEW_DEAL_DATE,'yyyy-mm-dd') as NEW_DEAL_DATE,PRICE_MOM_RATIO,MAX_MOM_RATIO,PRICE_YOY_RATIO ,SATUR_RATIO,NEIGHBOR_PRICE from community_p_describe_gj where time in (202110,202111,202112,202201)"; def allRows = [] - sqlInstance.eachRow(sql, { r -> - def data = [] - data << r.ID - data << r.COMMUNITY_ID - data << r.CITYID - data << r.CITY_NAME - data << r.DISTRICT_CODE - data << r.DISTRICT_NAME - data << r.COMMUNITY_NAME - data << r.PQ_NAME - data << r.BASE_PRICE - data << r.CONFIDENCE_LEVEL - data << r.CNT - data << r.MIN_PRICE - data << r.MEDIANPRICE - data << r.MEANPRICE - data << r.MAX_PRICE - data << r.TIME - data << r.FIRSTDATAT - data << r.THIRDDATA - data << r.RELATIVEERROR - data << r.SKEWNESS - data << r.PQ_PRICE_RANGE - data << r.DISTRICT_PRICE_RANGE - data << r.DESCRIPTION - data << r.PRIV_BASE_PRICE - data << r.IS_ARTTFICIAL - data << r.PRIV_FINAL_PRICE - data << r.CREATE_DATE - data << r.PRICE - data << r.PRICE_SOURCE - data << r.CASE_MD_PRICE - data << r.CASE_AVG_PRICE - data << r.INDEX_LABEL - data << r.MAIN_PROPERTY - data << r.COMMTYPE - data << r.NEW_DEAL_PRICE - data << r.NEW_DEAL_DATE - data << r.PRICE_MOM_RATIO - data << r.MAX_MOM_RATIO - data << r.PRICE_YOY_RATIO - data << r.SATUR_RATIO - data << r.NEIGHBOR_PRICE - allRows << data - }); + + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select ID,COMMUNITY_ID,CITYID ,CITY_NAME,DISTRICT_CODE ,DISTRICT_NAME,COMMUNITY_NAME,PQ_NAME,BASE_PRICE,CONFIDENCE_LEVEL,CNT,MIN_PRICE,MEDIANPRICE,MEANPRICE,MAX_PRICE,TIME,FIRSTDATAT,THIRDDATA,RELATIVEERROR,SKEWNESS,PQ_PRICE_RANGE,DISTRICT_PRICE_RANGE ,DESCRIPTION,PRIV_BASE_PRICE,IS_ARTTFICIAL,PRIV_FINAL_PRICE,to_char(CREATE_DATE,'yyyy-mm-dd') as CREATE_DATE,PRICE,PRICE_SOURCE,CASE_MD_PRICE,CASE_AVG_PRICE,INDEX_LABEL,MAIN_PROPERTY,COMMTYPE,NEW_DEAL_PRICE,to_char(NEW_DEAL_DATE,'yyyy-mm-dd') as NEW_DEAL_DATE,PRICE_MOM_RATIO,MAX_MOM_RATIO,PRICE_YOY_RATIO ,SATUR_RATIO,NEIGHBOR_PRICE from community_p_describe_gj where time=${month} AND CITYID='${cityCode}'"; + + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.ID + data << r.COMMUNITY_ID + data << r.CITYID + data << r.CITY_NAME + data << r.DISTRICT_CODE + data << r.DISTRICT_NAME + data << r.COMMUNITY_NAME + data << r.PQ_NAME + data << r.BASE_PRICE + data << r.CONFIDENCE_LEVEL + data << r.CNT + data << r.MIN_PRICE + data << r.MEDIANPRICE + data << r.MEANPRICE + data << r.MAX_PRICE + data << r.TIME + data << r.FIRSTDATAT + data << r.THIRDDATA + data << r.RELATIVEERROR + data << r.SKEWNESS + data << r.PQ_PRICE_RANGE + data << r.DISTRICT_PRICE_RANGE + data << r.DESCRIPTION + data << r.PRIV_BASE_PRICE + data << r.IS_ARTTFICIAL + data << r.PRIV_FINAL_PRICE + data << r.CREATE_DATE + data << r.PRICE + data << r.PRICE_SOURCE + data << r.CASE_MD_PRICE + data << r.CASE_AVG_PRICE + data << r.INDEX_LABEL + data << r.MAIN_PROPERTY + data << r.COMMTYPE + data << r.NEW_DEAL_PRICE + data << r.NEW_DEAL_DATE + data << r.PRICE_MOM_RATIO + data << r.MAX_MOM_RATIO + data << r.PRICE_YOY_RATIO + data << r.SATUR_RATIO + data << r.NEIGHBOR_PRICE + allRows << data + }); + } println allRows.size() FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); -// } + println "community_p_describe_gj Êý¾ÝÎļþÊä³öÍê³É......" CcbFtpUtils.ftpUpload(null, fileName, curDate) println "community_p_describe_gj ÉÏ´«FtpÍê³É......" @@ -370,8 +396,6 @@ class ExportOracleEvaluationData { def exportCommCaseDetailGj(month){ -// def citys = CcbCommonUtils.citys; - def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" def fileName = "/ccb/MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat" @@ -381,8 +405,8 @@ class ExportOracleEvaluationData { def headers = [] for(def city : citys){ - def cityCode = cityCodeDataMap.get(city) - def sql = "select ID, CITYID, COMMUNITY_ID, NETLISTING_ID, PRICE_DATE, to_char(CREATE_DATE,'yyyy-mm-dd') as CREATE_DATE from comm_case_detail_gj where cityid='${cityCode}' and price_date=${month}"; + def cityCode = cityCodeMap.get(city) + def sql = "select ID, CITYID, COMMUNITY_ID, NETLISTING_ID, PRICE_DATE, to_char(CREATE_DATE,'yyyy-mm-dd') as CREATE_DATE from comm_case_detail_gj where cityid='${cityCode}' and price_date=${month} AND CITYID='${cityCode}'"; def allRows = [] sqlInstance.eachRow(sql,{r-> def data = [] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/FjwPricePkCcbPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/FjwPricePkCcbPrice.groovy index b28516075..5c2e8c26c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/FjwPricePkCcbPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/FjwPricePkCcbPrice.groovy @@ -1,11 +1,14 @@ package com.fangjia.script.ccbevaluation +import com.fangjia.core.RegionData import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.common.DataHandleUtils import com.fangjia.script.gj.ccb.CcbCodeUtils import com.fangjia.script.util.CommonUtils import com.fangjia.script.util.DateUtils +import com.fangjia.script.util.ElasticUtils import com.fangjia.script.util.ExcelUtils +import com.mongodb.BasicDBObject import groovy.sql.Sql import org.apache.commons.lang.StringUtils @@ -23,13 +26,73 @@ class FjwPricePkCcbPrice { def sqlInstance236 = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") + def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse", + "postgres", "postgres", "org.postgresql.Driver") + static main(args) { def task = new FjwPricePkCcbPrice() // task.run() // task.updatePrice() // task.addFjwPrice() -// task.addCcbPrice() - task.addMarketPrice() +// task.addCcbPrice()//oracle + +// task.addCcbPriceFromGuided() +// task.addMarketPrice() + +// task.exportFjwPriceAndCcbPrice() +// task.addNewDistPrice() + + task.addCcbPrice2()//°´id²é +// task.addCcbPrice3()//°´city,region,name²é +// task.standRegion() +// task.addGuidPrice() + } + + + def addCcbPrice2(){ + def cityCodeMap = CcbCommonUtils.findCityCodeValue() + ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Ö¸µ¼¼Û\\ÉîÛÚÕþ¸®Ö¸µ¼¼Û_²¹³ä.xlsx", { d -> + if(d['C']){ + def map = findAvgPrice(d['C'], cityCodeMap.get(d['E'])) + if(map){ + d['K'] = map.avg_price + d['L'] = map.calc_type +// d['AI'] = map.credit_value + d['M'] = map.month + } + } + }) + } + + def addGuidPrice(){ + def cityCodeMap = CcbCommonUtils.findCityCodeValue() + ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Ö¸µ¼¼Û\\ÉîÛÚÕþ¸®Ö¸µ¼¼Û_230421.xlsx", { d -> + if(d['M']){ + def map = findGuidePrice(d['C'], d['E']) + if(map){ + d['M'] = map.avg_price + d['N'] = map.date.toString() + } + } + }) + } + + def addCcbPrice3(){ + def cityCodeMap = CcbCommonUtils.findCityCodeValue() + ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\Èð·á\\½ð»ª¡¢ÉÜÐ˹úÐÅ´ï²é¼Û_×îн¨Ðм۸ñ.xlsx", { d -> + if(d['A']){ + def dist = CommonDatautils.findDistrict(d['A'], d['B'], d['C'], "district") + if(dist){ + def map = findAvgPrice(dist._id.toString(), cityCodeMap.get(d['A'])) + if(map){ + d['F'] = map.avg_price + d['G'] = map.calc_type + d['H'] = map.month + } + } + + } + }, 1) } def addMarketPrice(){ @@ -43,6 +106,62 @@ class FjwPricePkCcbPrice { }) } + def addNewDistPrice(){ + ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Ö¸µ¼¼Û\\ÐÂÂ¥ÅÌÌí¼ÓÖ¸µ¼¼Û.xlsx",{d-> +// def map = findCommunityByEs(d['B'], d['C'], d['D']) +// if(map){ +// if(map.get("°²¾Ó¿Í-з¿")){ +// def dbo = map.get("°²¾Ó¿Í-з¿") +// d['F'] = dbo.avg_price +// d['G'] = dbo.open_date +// } +// if(map.get("±´¿ÇÕÒ·¿-з¿")){ +// def dbo = map.get("±´¿ÇÕÒ·¿-з¿") +// d['H'] = dbo.avg_price +// d['I'] = dbo.open_date +// }else if(map.get("Â¥ÅÌÍø-з¿")){ +// def dbo = map.get("Â¥ÅÌÍø-з¿") +// d['J'] = dbo.avg_price +// d['K'] = dbo.open_date +// } +// } + def dbo = CommonDatautils.queryDistrictPrice(d['B'], d['C'], d['D'], DateUtils.parseFromTightByPattern('2023-03-12','yyyy-MM-dd')) +// def fjwPriceMap = CommonDatautils.queryAllDistrictPrice(DateUtils.parseFromTightByPattern('2023-03-12','yyyy-MM-dd')) + if(dbo){ + d['N'] = dbo.avg_price + + if(dbo.value_type == 1){ + d['O'] = "Ö¸µ¼¼Û" + }else if(dbo.value_type == 2){ + d['O'] = "×ÔÉíÑù±¾" + }else if(dbo.value_type == 3){ + d['O'] = "µÚÈý·½" + }else if(dbo.value_type == 4){ + d['O'] = "½»Ò×Êý¾Ý" + }else if(dbo.value_type == 5){ + d['O'] = "ÖܱßÂ¥ÅÌ" + }else if(dbo.value_type == 6){ + d['O'] = "ÍÆµ¼" + }else if(dbo.value_type == 9){ + d['O'] = "Éñ¾­ÍøÂç" + }else if(dbo.value_type == 10){ + d['O'] = "ÎÞ·½Ê½" + }else{ + d['O'] = "" + } + } + }) + } + + def findCommunityByEs(city,region, name){ + def names = new HashSet() + def map = [:] + ElasticUtils.executeSqlQuery("select * from community where city='${city}' and region='${region}' and name='${name}' and is_new=1", { d-> + map.put(d.source, d) + }) + return map; + } + def addCcbPrice(){ def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Ö¸µ¼¼Û\\ÐÂÀÏËã·¨¼Û¸ñ²îÒì´óÐ¡Çø.xlsx",{d-> @@ -66,6 +185,24 @@ class FjwPricePkCcbPrice { }) } + def addCcbPriceFromGuided(){ + def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() + ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\½¨ÐÐ\\¶þÆÚ\\È˹¤Ö¸µ¼¼Û2.xls",{d-> + if(d['B'] && !d['O']){ + def cityId = d['D'] + def dist = CommonDatautils.findDistrictById(d['B']) + if(dist){ + def map = getCommunityBasePriceGjByCommid(cityId, dist._id.toString(), 202209) + if(map){ + d['O'] = map.avg_price + d['P'] = map.calc_type + d['Q'] = map.credit + } + } + } + }) + } + def updatePrice(){ def index = 0 @@ -80,13 +217,13 @@ class FjwPricePkCcbPrice { } def addFjwPrice(){ - ExcelUtils.modify("D:\\Êý¾Ý\\½¨ÐÐ\\²âÊÔ\\È˹¤²é¼Û£¨7455£©_0824_0913.xlsx",{d-> - if(!d['M']){ - def dist = CommonDatautils.findDistrictById(d['D']) + ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\½¨ÐÐ\\3Ô¹úÐÅ´ï²î¼Û_755Ìõ.xlsx",{d-> + if(!d['K']){ + def dist = CommonDatautils.findDistrictById(d['C']) if(dist){ - def dbo = CommonDatautils.queryDistrictPrice(dist.city, dist.region, dist.name, DateUtils.parseFromTightByPattern("2022-09-11","yyyy-MM-dd")) + def dbo = CommonDatautils.queryDistrictPrice(dist.city, dist.region, dist.name, DateUtils.parseFromTightByPattern("2023-03-26","yyyy-MM-dd")) if(dbo){ - d['M'] = dbo.avg_price + d['K'] = dbo.avg_price } } } @@ -94,6 +231,20 @@ class FjwPricePkCcbPrice { }) } + def standRegion(){ + ExcelUtils.multiThreadingModify("C:\\Users\\gaojuan\\Downloads\\¸ßµÂд×ÖÂ¥.xlsx",{d-> + if(d['A']){ + def city = RegionData.formatCity(d['A']) + if(city){ + def newRegion = RegionData.formatRegion(city, d['B']) + d['J'] = city + d['K'] = newRegion + } + + } + }) + } + def run(){ def ccbPrices = getCommunityBasePriceGj(202208) println "ccb×ÜÁ¿£º"+ccbPrices.size() @@ -264,4 +415,88 @@ class FjwPricePkCcbPrice { } out.close(); } + + def exportFjwPriceAndCcbPrice(){ + def citys = ["º¼ÖÝ"] + for(def c : citys){ + def districts = CommonDatautils.findAllDistricts(c, "district", ["city", "region", "name"]); + println c +" "+districts.size() + def fjwPriceMap = CommonDatautils.queryAllDistrictPrice(DateUtils.parseFromTightByPattern('2023-03-05','yyyy-MM-dd')) + def cityCodeMap = CcbCommonUtils.findCityCodeValue() + def rets = [] + rets << ["³ÇÊÐ","ÇøÓò","Ãû³Æ","·¿¼ÛÍø¼Û¸ñ","·¿¼ÛÍø¼ÆË㷽ʽ","½¨Ðм۸ñ","½¨ÐмÆË㷽ʽ","½¨ÐмÆËãʱ¼ä"] + for(def dist : districts ){ + def priceMap = fjwPriceMap.get(dist.city+"##"+dist.region+"##"+dist.name) + def ret = [] + ret << dist.city + ret << dist.region + ret << dist.name + if(priceMap){ + ret << priceMap.avg_price + if(priceMap.value_type == 1){ + ret << "Ö¸µ¼¼Û" + }else if(priceMap.value_type == 2){ + ret << "×ÔÉíÑù±¾" + }else if(priceMap.value_type == 3){ + ret << "µÚÈý·½" + }else if(priceMap.value_type == 4){ + ret << "½»Ò×Êý¾Ý" + }else if(priceMap.value_type == 5){ + ret << "ÖܱßÂ¥ÅÌ" + }else if(priceMap.value_type == 6){ + ret << "ÍÆµ¼" + }else if(priceMap.value_type == 9){ + ret << "Éñ¾­ÍøÂç" + }else if(priceMap.value_type == 10){ + ret << "ÎÞ·½Ê½" + }else{ + ret << "" + } + }else{ + ret << '' + ret << '' + } + def map = findAvgPrice(dist._id.toString(), cityCodeMap.get(c)) + if(map){ + ret << map.avg_price + ret << map.calc_type + ret << map.credit_value + ret << map.month + } + rets << ret + } + ExcelUtils.write("d:\\Êý¾Ý\\Èð·á\\º¼Öݼ۸ñ.xlsx",rets, c) + println c+" µ¼³öÍê³É" + } + } + + + def findAvgPrice(def commid, def cityid){ + def sql = "SELECT gujia_bds_clc_avprc,gujia_bds_clmtd,gujiabds_clc_yrmo_val,gujia_bds_cfdc_dgr from t_app_p9pha_plda.avm_community_base_price_gj_h where urbn_id='${cityid}' and gujia_bds_id='${commid}' order by gujiabds_clc_yrmo_val desc limit 1" + def map = [:] + pgsqlInstance.eachRow(sql, { r -> + map.avg_price = r.gujia_bds_clc_avprc + map.type = r.gujia_bds_clmtd + map.month = r.gujiabds_clc_yrmo_val + map.credit_value = r.gujia_bds_cfdc_dgr + if(r.gujia_bds_clmtd == 1){ + map.calc_type = "È˹¤¹ÀÖµ" + }else if(r.gujia_bds_clmtd == 2){ + map.calc_type = "Ñù±¾¼ÆËã" + }else if(r.gujia_bds_clmtd == 3){ + map.calc_type = "Éñ¾­ÍøÂç" + } + }) + return map + } + + def findGuidePrice(def commid, def city){ + def sql = "SELECT gujia_bds_drc_prc,gujia_drc_dt from base.t0831_guided_price_gj_h where urbn_nm='${city}' and gujia_bds_id='${commid}' ORDER BY gujia_drc_dt desc limit 1" + def map = [:] + pgsqlInstance.eachRow(sql, { r -> + map.avg_price = r.gujia_bds_drc_prc + map.date = r.gujia_drc_dt + }) + return map + } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy index 6981c7149..953a53a6b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/GuiDingPriceBatch.groovy @@ -11,6 +11,7 @@ import com.fangjia.script.util.DateUtils import com.fangjia.script.util.ExcelUtils import com.mongodb.BasicDBObject import com.mongodb.DBCollection +import groovy.sql.Sql import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.CountDownLatch @@ -30,6 +31,12 @@ class GuiDingPriceBatch extends BaseBatch{ def sDate= Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -2, "yyyyMM")); def static final DBCollection dataProcessColl = CrawalDBUtil.getDataProcessCol(); + def curDate= DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-15"; + + def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse?stringtype=unspecified", + "postgres", "postgres", "org.postgresql.Driver") + + static main(args) { runBatch(new GuiDingPriceBatch(), args); } @@ -39,12 +46,14 @@ class GuiDingPriceBatch extends BaseBatch{ def citys = CcbCommonUtils.getRunningCitys(args) def rows = [] + CcbCommonUtils.deleteGuidedPrice(curDate) for (def city : citys) { def cityCodeDatas = CcbCommonUtils.findCityCodeValue() def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) //Ìí¼Ó×Ô¼º¿âÖеÄÈ˹¤Ö¸µ¼¼Û - def prices = CcbCommonUtils.findPersonPrice(city, "2022-10-22", "2022-10-27") + def prices = CcbCommonUtils.findPersonPrice(city, "2023-04-26", "2023-05-23") +// def prices = CcbCommonUtils.findPersonPrice(city, "2022-01-01", "2022-11-22") if(prices){ def distMap = getDistrictMap(city) def rets = createCityDatas(cityCodeDatas, distCodeMap, distMap, prices) @@ -73,10 +82,10 @@ class GuiDingPriceBatch extends BaseBatch{ def headers = []//["µÚÈý·½¾ù¼ÛID","Â¥ÅÌID","Ð¡ÇøÃû³Æ","³ÇÊÐID","³ÇÊÐÃû³Æ","ÐÐÕþÇøID","ÐÐÕþÇøÃû³Æ","Ö¸µ¼ÈÕÆÚ","Ö¸µ¼¼Û¸ñ","Ìí¼ÓÈË","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾"] FileUtils.batchCreateFile(rows, "d:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\GUIDED_PRICE_GJ.dat", headers, "utf-8", false); -// def rets = [] -// rets << headers -// rets.addAll(rows) -// ExcelUtils.write("d:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\excel\\guiding_price.xlsx", rets, "Êý¾Ý") + saveToPgSql(rows) + + //¸üо²Ì¬Êý¾Ý±í + updateVersion(DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-28") } @@ -150,7 +159,7 @@ class GuiDingPriceBatch extends BaseBatch{ ret << CcbCommonUtils.getCcbCity(dist.city) ret << areaData.district_code ret << areaData.district - ret << DateUtils.formatDateByPattern(ps.guiding_date, "yyyy-MM-dd HH:mm:ss") + ret << curDate//DateUtils.formatDateByPattern(ps.guiding_date, "yyyy-MM-dd HH:mm:ss") ret << ps.guiding_value ret << "·¿¼ÛÍø" ret << "" @@ -207,5 +216,43 @@ class GuiDingPriceBatch extends BaseBatch{ return distMap; } + def saveToPgSql(rows){ + for(def r : rows) { + for (def i = 0; i < r.size(); i++) { + if("" == r[i]){ + r[i] = null + } + } + r << null + r << DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-28" + r << null + r << '2999-12-31' + r << null + r << null + r << null + } + + println "start: "+new Date() + def sql = "insert into base.t0831_guided_price_gj_h values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)" + + pgsqlInstance.withBatch(300, sql){ ps-> + for(def r : rows) { + ps.addBatch(r[0], r[1], r[2], r[3], r[4], r[5], r[6], r[7], r[8], r[9], r[10], r[11], r[12], r[13], r[14], r[15], r[16], r[17], r[18], r[19], r[20]) + } + } + + println "end: "+new Date() + } + + def updateVersion(def time){ + def tables = ["t0831_website_config_gj_h","t0831_bigdata_district_gj_h","t0831_evaluate_rate_gj_h","t0831_bigdata_poi_gj_h","t0831_guided_price_gj_h","t0831_community_staging_gj_h","t0831_community_guide_price_gj_h"] + for(def tableName : tables){ + def sql = "update base."+tableName+" set p9_start_date='"+time+"'" + pgsqlInstance.executeUpdate(sql) + } + + } + + } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/PgsqlCommUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/PgsqlCommUtils.groovy new file mode 100644 index 000000000..f2a564cb7 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/PgsqlCommUtils.groovy @@ -0,0 +1,20 @@ +package com.fangjia.script.ccbevaluation + +import groovy.sql.Sql + +class PgsqlCommUtils { + + public static def database = "warehouse" + + public static def sqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/"+database+"?stringtype=unspecified", + "postgres", "postgres", "org.postgresql.Driver") + + public static def findAllDistrictIdsByOracle(def cityid){ + def sql = "select gujia_comm_id from base.t0831_bigdata_community_gj_h where urbn_id='${cityid}' and gujia_bds_bds_st=0"; + def set = new HashSet() + sqlInstance.eachRow(sql,{r-> + set << r.gujia_comm_id + }); + return set + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/StagingDistrictBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/StagingDistrictBatch.groovy index ed95e4cc6..cae04cf55 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/StagingDistrictBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/StagingDistrictBatch.groovy @@ -9,6 +9,7 @@ import com.fangjia.script.util.DateUtils import com.fangjia.script.util.DbUtils import com.fangjia.script.util.ExcelUtils import com.mongodb.BasicDBObject +import groovy.sql.Sql import org.bson.types.ObjectId /** @@ -18,6 +19,9 @@ import org.bson.types.ObjectId @BatchOwner(Watcher.GaoJuan) class StagingDistrictBatch extends BaseBatch{ + def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse?stringtype=unspecified", + "postgres", "postgres", "org.postgresql.Driver") + static main(args) { runBatch(new StagingDistrictBatch(), args); } @@ -47,6 +51,8 @@ class StagingDistrictBatch extends BaseBatch{ //ExcelUtils.write("d:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\excel\\COMMUNITY_STAGING_GJ.xlsx", results, "Êý¾Ý") FileUtils.batchCreateFile(rows, fileName,headers, "utf-8", false); + saveToPgSql(rows) + } def createCityData(def dists, def fenQiMap){ @@ -86,4 +92,34 @@ class StagingDistrictBatch extends BaseBatch{ } return fenQiMap; } + + + def saveToPgSql(rows){ + for(def r : rows) { + for (def i = 0; i < r.size(); i++) { + if("" == r[i]){ + r[i] = null + } + } + r << null + r << DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-28" + r << null + r << '2999-12-31' + r << null + r << null + r << null + } + + println "start: "+new Date() + def sql = "insert into base.t0831_community_staging_gj_h values (?,?,?,?,?,?,?,?,?,?,?,?,?,?)" + + pgsqlInstance.withBatch(20000, sql){ ps-> + for(def r : rows) { + ps.addBatch(r[0], r[1], r[2], r[3], r[4], r[5], r[6], r[7], r[8], r[9], r[10], r[11], r[12], r[13]) + ps.toString() + } + } + + println "end: "+new Date() + } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy index e987ea5af..db8fef0a1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/Test.groovy @@ -33,8 +33,8 @@ import java.util.regex.*; def sqlInstance236 = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") -//def sqlInstance94 = Sql.newInstance("jdbc:oracle:thin:@192.168.0.94:1521:orcl", -// "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") +def sqlInstance94 = Sql.newInstance("jdbc:oracle:thin:@192.168.0.94:1521:orcl", + "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") DBCollection DIST_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") @@ -45,6 +45,159 @@ DBCollection POLYLINECOLL = MongoUtils.getCollectionByAuth20190102("fangjia_craw def offlineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.136:28017"; def DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business", "res_esfdealprice", offlineUrl) +//def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse", +// "postgres", "postgres", "org.postgresql.Driver") + +//def citys = ["ɽÄÏ","»ÆÄÏÖÝ","¸ÊÄÏ","¿Ë×ÎÀÕËÕ","¼ÎÓø¹Ø","º£±±ÖÝ","°¢À­ÉÆÃË","Å­½­ÖÝ","ºÍÌï","ÈÕ¿¦Ôò","²ý¶¼","º£ÄÏÖÝ","ÓñÊ÷ÖÝ","ͳ·¬","°¢ÀÕÌ©","Èýɳ","Ëþ³Ç","¸Ê×ÎÖÝ","¹ûÂåÖÝ","ÁÖÖ¥","ÄÇÇú","°¢°ÓÖÝ","ÉñÅ©¼Ü"] +//def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() + + +//ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\Ð¡Çø\\Ð¡ÇøµØÖ·Ãûµ¥_¹À¼Ò¿Æ¼¼V2 (3).xlsx",{d-> +// if(d['J']){ +// def cityId = cityCodeDataMap.get(d['H']) +// def map = findCcbPriceCredit(sqlInstance236, cityId, d['J']) +// println d['H'] +" "+d['J']+ map.toString() +// if(map){ +// d['Q'] = map.credit +// d['R'] = map.month +// d['U'] = map.price +// } +//// def thirdMap = findThirdPriceBySource(sqlInstance236, cityId, d['J']) +//// if(thirdMap){ +//// d['S'] = thirdMap.price +//// d['T'] = thirdMap.month +//// } +// } +// +//}) + +//def countCitys = ExcelUtils.read("C:\\Users\\gaojuan\\Desktop\\pgsql-city.xlsx",0,1) +//def allCitys = CcbCommonUtils.citys_all +//def cityCodeMap = CcbCommonUtils.findCityCodeValue() +//def index = 0 +//for(def c : allCitys){ +// def cityCode = cityCodeMap.get(c) +// def count = null; +// index++ +// for(def r : countCitys){ +// if(cityCode.toString() == r['A'].toString().toDouble().toInteger().toString()){ +// count = r['B'] +// break +// } +// } +// println index +" "+ c+" "+count +//} +// +//def findCcbPriceCredit(sqlInstance, cityid, commid){ +// def sql = "select * from (select CONFIDENCE,year_month,avg_price from community_base_price_gj where cityid='${cityid}' and commid='${commid}' order by year_month desc) WHERE ROWNUM <= 1" +// def map = [:] +// sqlInstance.eachRow(sql,{r-> +// map.month = r.year_month +// map.credit = r.CONFIDENCE +// map.price = r.avg_price +// }); +// return map +//} + +def findThirdPriceBySource(sqlInstance, cityid, commid){ + def sql = "select * from (select data_source, price_date, community_price,commid from bigdata_third_party_price_gj where cityid='${cityid}' and commid='${commid}' and data_source in ('±´¿Ç','Á´¼Ò') \n" + + "order by price_date desc) WHERE ROWNUM <= 1" + def map = [:] + sqlInstance.eachRow(sql,{r-> + map.month = r.price_date + map.price = r.community_price + }); + return map +} + + + + + +//for(def c : citys){ +// def cityCode = cityCodeDataMap.get(c) +// println c +" "+cityCode +// def priceDists = findAllPriceDist(sqlInstance236,cityCode, 202301) +//// +// checkNoPriceDist(sqlInstance236, priceDists, cityCode) +//} + +def checkNoPriceDist(sqlInstance236,priceDists, cityid){ + def commids = [] + def sql = "select commid from bigdata_community_gj where cityid='${cityid}' and status=0"; + sqlInstance236.eachRow(sql, { r -> + commids << r.commid + }) + + for(def commid : commids){ + if(!priceDists.contains(commid)){ + updateDistStatus(sqlInstance236, commid) + } + } + return commids +} + + +def updateDistStatus(sqlInstance236, commid){ + def sql = "update bigdata_community_gj set status=1 where commid='${commid}'"; + sqlInstance236.executeUpdate(sql) +} +def findAllPriceDist(sqlInstance236, cityid, yearMonth){ + def commids = [] + def sql = "select commid from community_base_price_gj where cityid='${cityid}' and year_month=${yearMonth} "; + sqlInstance236.eachRow(sql, { r -> + commids << r.commid + }) + return commids +} +//def citys = ['ËÕÖÝ','º¼ÖÝ','Äþ²¨','ÎÂÖÝ','¼ÎÐË','ºþÖÝ','ÉÜÐË','½ð»ª','áéÖÝ','ÖÛɽ','̨ÖÝ','ÀöË®'] +// +//def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() +//def rets = [] +//for(def c : citys){ +// def citycode = cityCodeDataMap.get(c) +// def datas = findAllData(sqlInstance236, citycode) +// def totalCount = datas.size() +// def landareaCount = 0; +// def buildareaCount = 0 +// def greeningrateCount = 0 +// def plotratioCount = 0 +// for(def m : datas){ +// if(m.landarea){ +// landareaCount ++ +// } +// if(m.buildarea){ +// buildareaCount++ +// } +// if(m.greeningrate){ +// greeningrateCount++ +// } +// if(m.plotratio){ +// plotratioCount++ +// } +// } +// +// def landAreaPre = landareaCount*100/totalCount +// def buildAreaPre = buildareaCount*100/totalCount +// def greeningratePre = greeningrateCount*100/totalCount +// def plotratioPre = plotratioCount*100/totalCount +// rets << [c, totalCount, landAreaPre, buildAreaPre, greeningratePre, plotratioPre] +//} +// +//ExcelUtils.write("D:\\Êý¾Ý\\½¨ÐÐ\\²âÊÔ\\12³Ç¸²¸ÇÂÊͳ¼Æ.xlsx",rets, "¸²¸ÇÂÊ") + +def findAllData(sqlInstance236, citycode){ + def sql = "select landarea,buildarea,greeningrate,plotratio from bigdata_community_fjw where cityid='${citycode}'" + def rets = [] + sqlInstance236.eachRow(sql,{r-> + rets << ["landarea":r.landarea, "buildarea":r.buildarea, "greeningrate":r.greeningrate, "plotratio":r.plotratio] + }); + return rets + +} + + + ////def url = "https://sh.anjuke.com" ////def s = DataHandleUtils.findMatchPattern(name, "https://\\w+.anjuke.com") ////println s @@ -446,6 +599,56 @@ def DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business //// } ////},0) // + +//ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\½¨ÐÐ\\¶þÆÚ\\252¸ö³ÇÊÐɾ³ýÐ¡Çø.xlsx",{d-> +// if(d['A']){ +// def dbo = CommonDatautils.findDistrictById(d['D']) +// if(dbo){ +// def udata = new BasicDBObject() +//// udata.put("name_cat", 11) +// udata.put("status", 1) +// udata.put("m_date",new Date()) +// +// def q = new BasicDBObject() +// q.put("_id", dbo._id) +// DbUtils.seaweed.update(q, new BasicDBObject('$set', udata)) +// }else{ +// println dbo._id.toString() +" ûÕÒµ½" +// } +// } +//},0) + +//def citys = ["º£¿Ú","ÈýÑÇ","Èýɳ","Îåָɽ","Çíº£","ÙÙÖÝ","ÎIJý","ÍòÄþ","¶«·½","¶¨°²","ÍͲý","³ÎÂõ","ÁÙ¸ß","°×ɳ","²ý½­","ÀÖ¶«","ÁêË®","±£Í¤","ÇíÖÐ"] +//for(def c : citys){ +// def districts = CommonDatautils.findAllDistrictByCity(c, "district", ["city","name"]) +// println c +" "+districts.size() +//} + +//def cityCodeMap = CcbCommonUtils.findCityCodeValue() +//ExcelUtils.multiThreadingModify("C:\\Users\\gaojuan\\Desktop\\252³ÇµÚÈý·½¾ù¼Û.xlsx", { d -> +//// cityCodeMap.each {k,v-> +//// if(d['A'].toString()==v){ +//// d['C'] = k +//// println k +//// } +//// } +//// if(!d['D']){ +//// d['D'] = findCount(d['A'].toString().toDouble().toInteger().toString(), sqlInstance94) +//// } +// d['F'] = findThirdCommCount(d['A'].toString().toDouble().toInteger().toString(), sqlInstance94) +// +//}); + +//def citys = CcbCommonUtils.citys_252 +//def runCitys = ['ÁijÇ','±¦¼¦','ÉØ¹Ø','¸·Ñô','ÒË´º','ÖÜ¿Ú','ºÓÔ´','ÐÃÖÝ','ÈýÃÅÏ¿','ÓÀÖÝ','áéÖÝ','Å̽õ','°×Òø','ÓñϪ','´ïÖÝ','¾°µÂÕò','º×±Ú','ÁÉÑô','ÁùÅÌË®','Õżҽç','º£Î÷ÖÝ','Ð˰²ÃË','°¢°ÓÖÝ','ÄÇÇú','Î÷Ë«°æÄÉÖÝ','ÁÉÔ´','ºªµ¦','ƽ¶¥É½','ÄÏÑô','ÉÌÇð','ÄÏÆ½','»Æ¸Ô','¶õ¶û¶à˹','ãòÖÝ','Áù°²','ºù«µº','³±ÖÝ','ËÞÖÝ','ÇìÑô','»³»¯','ÕÅÒ´','Ç­¶«ÄÏ','ÔÆ¸¡','±¾Ïª','°ÙÉ«','ÒÁ´º','ÕÑͨ','ÎýÁÖ¹ùÀÕÃË','¿ËÀ­ÂêÒÀ','ÌìÃÅ','²©¶ûËþÀ­','´óÐ˰²Áë','Ϋ·»','ÃàÑô','÷ÖÝ','ÏåÑô','°üÍ·','Ôæ×¯','¶«Óª','ÐÅÑô','½úÖÐ','¿ª·â','³ÐµÂ','ïÃû','¾£ÃÅ','ºìºÓ','¤ÄÏ','ÌúÁë','»ÆÉ½','ÏÌÄþ','ÑÓ°²','¹ãÔª','ÎÚÀ¼²ì²¼','ËæÖÝ','ÒæÑô','ÑôȪ','ÄÚ½­','¾ÆÈª','±Ï½Ú','°²Ë³','Àö½­','ÉÌÂå','À´±ö','Ç­Î÷ÄÏ','·À³Ç¸Û','Í­ÈÊ','ÙÙÖÝ','³ç×ó','ºâÑô','ÏÌÑô','ÐÂÏç','Äϳä','¾£ÖÝ','µÂÑô','ººÖÐ','ÏæÌ¶','³à·å','¼Ñľ˹','µ¤¶«','»´ÄÏ','¸§ÖÝ','ÀöË®','¹ã°²','ÙñÖÝ','²ý¼ª','¶õÖÝ','°×³Ç','¶÷Ê©','ÒÁÀç','Í­Áê','ÁÖÖ¥','º£¶«','¹ðÁÖ','ÁÙ·Ú','μÄÏ','±õÖÝ','ºÊÔó','Т¸Ð','Óª¿Ú','å§Ñô','¸§Ë³','×Ô¹±','ÐÂÓà','¼¦Î÷','ÇÕÖÝ','»´±±','°²¿µ','×ÊÑô','ÎÚº£','ÖÐÎÀ','º×¸Ú','ʯ×ìɽ','ÈÕ¿¦Ôò','²ý¶¼','µÂºêÖÝ','ͳ·¬','°¢ÀÕÌ©','ÁÙÒÊ','Íþº£','Ì©°²','ËÞǨ','µÂÖÝ','°²Ñô','פÂíµê','Ë绯','ÉÏÈÄ','ÆÎÌï','°ö²º','´óÇì','äðºÓ','Ê®Ñß','½ú³Ç','Ðû³Ç','ÖÛɽ','ÉÛÑô','´óÀí','³þÐÛ','ÌìË®','³ØÖÝ','ËÉÔ­','¸·ÐÂ','°ÍÒô¹ùÀã','ÏÉÌÒ','ÎäÍþ','ÆÕ¶ý','ºÓ³Ø','Í­´¨','µÏÇìÖÝ','DZ½­','ºØÖÝ','Ëþ³Ç','¼ÃÄþ','½­ÃÅ','¸ÓÖÝ','Ðí²ý','³üÖÝ','ÁúÑÒ','Ô˳Ç','³¤ÖÎ','ÀÖɽ','³»ÖÝ','ËìÄþ','Çú¾¸','ºôÂ×±´¶û','Ñô½­','³¯Ñô','°ÍÑåÄ×¶û','Ë·ÖÝ','¦µ×','ÎàÖÝ','°ÍÖÐ','Ç­ÄÏ','ÎâÖÒ','ÁÙÏÄ','Á¹É½ÖÝ','¶¨Î÷','ƼÏç','¸ÊÄÏ','ÅÊÖ¦»¨','¿Ë×ÎÀÕËÕ','ɽÄÏ','ÁÙ²×','½ð²ý','ÐĮ̈','ºâË®','ÄþµÂ','ÓÜÁÖ','°°É½','½¹×÷','ĵµ¤½­','ÆëÆë¹þ¶û','üɽ','ÈýÃ÷','ÂÀÁº','¼ª°²','ƽÁ¹','ͨÁÉ','½ÒÑô','»ÆÊ¯','Ò˱ö','ÑÓ±ß','ÉÇβ','ÓñÁÖ','ͨ»¯','ËÄÆ½','°¢¿ËËÕ','¹ó¸Û','°×ɽ','˫Ѽɽ','ÏæÎ÷','¹þÃÜ','±£É½','ӥ̶','¿¦Ê²','ÑŰ²','ºÚºÓ','ºÍÌï','¹ÌÔ­','°¢À­ÉÆÃË','Æß̨ºÓ','¼ÎÓø¹Ø'] +//for(def c : citys){ +// if(!runCitys.contains(c)){ +// def code = cityCodeMap.get(c) +// println code +" "+ c +// } +//} + + // // // @@ -731,15 +934,26 @@ def DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business // return count //} // -//def findCount(cityid, sqlInstance){ -// def sql = "select count(*) as count from bigdata_community_gj where cityid='${cityid}' and status=0"; -// def count = 0 -// -// sqlInstance.eachRow(sql,{r-> -// count = r.count -// }); -// return count -//} +def findCount(cityid, sqlInstance){ + def sql = "select count(*) as count from bigdata_community_gj where cityid='${cityid}' and status=0"; + def count = 0 + + sqlInstance.eachRow(sql,{r-> + count = r.count + }); + return count +} + + +def findThirdCommCount(cityid, sqlInstance){ + def sql = "select count(*) as count from (select count(*) from bigdata_third_party_price_gj where price_date=202209 and cityid='${cityid}' group by commid)"; + def count = 0 + + sqlInstance.eachRow(sql,{r-> + count = r.count + }); + return count +} // // // @@ -975,8 +1189,80 @@ def DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business // return map //} +// +//def fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Ö¸µ¼¼Û\\ÎÞ¼Û¸ñÐ¡Çø(3)2.23.xlsx" +//ExcelUtils.multiThreadingModify(fileName, { d -> +// def dist = CommonDatautils.findDistrictById(d['A']) +// if(dist){ +// d['G'] = dist.city +// d['H'] = dist.region +// d['I'] = dist.name +// } +//}) + + + +//def findAvgPrice(def commid, def pgsqlInstance, def cityid){ +// def sql = "SELECT gujia_bds_clc_avprc,gujia_bds_clmtd,gujiabds_clc_yrmo_val from t_app_p9pha_plda.avm_community_base_price_gj_h where urbn_id='${cityid}' and gujia_bds_id='${commid}' order by gujiabds_clc_yrmo_val desc limit 1" +// def map = [:] +// pgsqlInstance.eachRow(sql, { r -> +// map.avg_price = r.gujia_bds_clc_avprc +// map.type = r.gujia_bds_clmtd +// map.month = r.gujiabds_clc_yrmo_val +// if(r.gujia_bds_clmtd == 1){ +// map.calc_type = "È˹¤¹ÀÖµ" +// }else if(r.gujia_bds_clmtd == 2){ +// map.calc_type = "Ñù±¾¼ÆËã" +// }else if(r.gujia_bds_clmtd == 3){ +// map.calc_type = "Éñ¾­ÍøÂç" +// } +// }) +// return map +//} + +//def file = "C:\\Users\\gaojuan\\Desktop\\¹úÐÅ´ïÐ¡Çø.xlsx" +//def cityCodeMap = CcbCommonUtils.findCityCodeValue() +//ExcelUtils.multiThreadingModify(file, { d -> +// if(d['A']){ +// def cityCode = cityCodeMap.get(d['A']) +// def newRegin = RegionData.formatRegion(d['A'], d['B']) +// if(newRegin){ +// def dist = CommonDatautils.findDistrict(d['A'], newRegin, d['C'], "district") +// if(dist){ +// d['H'] = dist._id.toString() +// def map = findAvgPrice(dist._id.toString(), pgsqlInstance, cityCode) +// if(map){ +// d['I'] = map.avg_price +// d['J'] = map.calc_type +// d['K'] = map.month +// } +// +// } +// } +// } +//}) + + +def findAvgPrice(def commid, def pgsqlInstance, def cityid){ + def sql = "SELECT gujia_bds_clc_avprc,gujia_bds_clmtd,gujiabds_clc_yrmo_val from t_app_p9pha_plda.avm_community_base_price_gj_h where urbn_id='${cityid}' and gujia_bds_id='${commid}' order by gujiabds_clc_yrmo_val desc limit 1" + def map = [:] + pgsqlInstance.eachRow(sql, { r -> + map.avg_price = r.gujia_bds_clc_avprc + map.type = r.gujia_bds_clmtd + map.month = r.gujiabds_clc_yrmo_val + if(r.gujia_bds_clmtd == 1){ + map.calc_type = "È˹¤¹ÀÖµ" + }else if(r.gujia_bds_clmtd == 2){ + map.calc_type = "Ñù±¾¼ÆËã" + }else if(r.gujia_bds_clmtd == 3){ + map.calc_type = "Éñ¾­ÍøÂç" + } + }) + return map +} + //def fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Ö¸µ¼¼Û\\0922Èë¿âÊý¾Ý.xlsx" //def datas = ExcelUtils.read(fileName, 0, 1) //def keys = [] @@ -1001,33 +1287,51 @@ def DBCollection youda_esfhouse_coll = MongoUtils.getCollectionByName2("business -def fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Ö¸µ¼¼Û\\È˹¤Ö¸µ¼¼Û¼Èë_1020.xlsx" - -ExcelUtils.multiThreadingModify(fileName, {d-> - if(d['A']){ -// def region = RegionData.formatRegion(d['A'], d['B']) -// if(region){ -// def dist = CommonDatautils.findDistrict(d['A'], region, d['C'], "district") +//def fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Ö¸µ¼¼Û\\È˹¤Ö¸µ¼¼Û¼Èë_1020.xlsx" +// +//ExcelUtils.multiThreadingModify(fileName, {d-> +// if(d['A']){ +//// def region = RegionData.formatRegion(d['A'], d['B']) +//// if(region){ +//// def dist = CommonDatautils.findDistrict(d['A'], region, d['C'], "district") +//// if(dist){ +//// d['E'] = dist.region +//// d['F'] = dist._id.toString() +//// } +//// } +// if(!d['F']){ +// def dist = CommonDatautils.findDistrictById(d['A']) +//// // if(dist){ -// d['E'] = dist.region -// d['F'] = dist._id.toString() +//// d['H'] = dist.region +//// d['G'] = dist.name +// d['F'] = dist.status // } // } - if(!d['F']){ - def dist = CommonDatautils.findDistrictById(d['A']) // - if(dist){ -// d['H'] = dist.region -// d['G'] = dist.name - d['F'] = dist.status - } - } +// } +//},0) + + +def fileName = "C:\\Users\\gaojuan\\Desktop\\·¿¼ÛÍøÐÂÔöÐ¡ÇøÊý¾Ý_0427.xlsx" +ExcelUtils.multiThreadingModify(fileName, { d -> + def count = CommonDatautils.findDistrictCount(null, d['B'], d['C'], "district") + if(count && count==1){ + def dist = CommonDatautils.findDistrict(null, d['B'], d['C'], "district") + d['E'] = dist.city } + +// def dist = CommonDatautils.findDistrictById(d['A']) +// if(dist){ +// d['B'] = dist.region +// d['C'] = dist.name +// d['J'] = dist.status +// } +// def newRegion = RegionData.formatRegion(d['A'], d['B']) +// d['F'] = newRegion },0) - - //ExcelUtils.modify(fileName, {d-> // if(d['A']){ // def sql = "update guided_price_gj set dealdate=to_date('2022-09-20','yyyy-MM-dd') where id='${d['A']}'" @@ -1038,6 +1342,30 @@ ExcelUtils.multiThreadingModify(fileName, {d-> +//ExcelUtils.modify("D:\\Êý¾Ý\\½¨ÐÐ\\¶þÆÚ\\¸¶.xlsx",{d-> +// def obj = CommonDatautils.findDistrict(d['D'],d['L'], d['K'], "district") +// if(obj){ +// def count = findGuidedPrice(sqlInstance236, obj._id.toString()) +// if(count){ +// d['M'] = "´æÔÚ" +// } +// d['N'] = obj.name_cat +// d['O'] = obj.estate_type2 +// } +// +//}) + +def findGuidedPrice(sqlInstance, id){ + def count = 0 + def sql = "select count(*) as count from guided_price_gj where commid='${id}'" + sqlInstance.eachRow(sql,{r-> + count = r.count + }); + return count +} + + + diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TestRepeat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TestRepeat.groovy index c0833369a..b2e287b7c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TestRepeat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TestRepeat.groovy @@ -1,5 +1,8 @@ package com.fangjia.script.ccbevaluation +import com.fangjia.datastore.driver.DSCollection +import com.fangjia.datastore.driver.DataStore +import com.mongodb.BasicDBObject import groovy.sql.Sql import java.util.concurrent.ConcurrentHashMap @@ -12,15 +15,24 @@ class TestRepeat { ExecutorService fixedThreadPool = Executors.newFixedThreadPool(80) - def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.100:31521:orcl", - "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") +// def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.100:31521:orcl", +// "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") + + private DSCollection seabird = new DataStore("192.168.0.100", 37017).getCollection("fangjia.seabird") static main(args) { def task = new TestRepeat() task.run() } def run(){ - + def q = new BasicDBObject() + q.put("cat", "sell") + q.put("city", "ÏåÑô") + def count = seabird.count(q) + println count +// for(def d : dbcursor){ +// println d.name +// } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy index 6b1009e6c..da8662b0e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ThirdPartyPriceBatch.groovy @@ -22,9 +22,9 @@ import java.util.concurrent.ConcurrentHashMap @BatchOwner(Watcher.GaoJuan) class ThirdPartyPriceBatch extends BaseBatch { - def sDate= 202109//Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); - def startDate = 202107 - def endDate = 202109 + def sDate= Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM"));//202304// + def startDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -3, "yyyyMM")) //202302 + def endDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); //202304 // def curDate = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -6, "yyyyMM")); static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") @@ -36,26 +36,46 @@ class ThirdPartyPriceBatch extends BaseBatch { def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") + + def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse?stringtype=unspecified", + "postgres", "postgres", "org.postgresql.Driver") + static main(args) { runBatch(new ThirdPartyPriceBatch(), args); } @Override public void process(Object args) { + +// def gocPrices = CcbCommonUtils.findDistGovPrice("ÉîÛÚ") +// def sql = "delete from base.t0831_bigdata_third_party_price_gj_h where gujiabds_avprc_dt_val=202303 and gujia_bds_id=?" +// pgsqlInstance.withBatch(500, sql){ ps-> +// for(def id : gocPrices){ +// ps.addBatch(id) +// } +// } + def citys = CcbCommonUtils.getRunningCitys(args) def rows = [] def index = 0 - def weekend = DateUtils.getFirstDayOfWeek(new Date()) + def weekend = DateUtils.getFirstDayOfWeek(DateUtils.parseFromTightByPattern(sDate+"15", "yyyyMMdd")) + def cityCodeDatas = CcbCommonUtils.findCityCodeValue() for(def city : citys){ index++ + + def gocIdsPrices = [] + if(city == "ÉîÛÚ"){ + gocIdsPrices = CcbCommonUtils.findDistGovPrice(city) + } + def statMap = getDistrictStatByCity(city, weekend) - def cityCodeDatas = CcbCommonUtils.findCityCodeValue() def distCodeMap = CcbCommonUtils.findAllDistrictCodeValue(city) def dists = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city", "region", "name","name_cat", "estate_type2","lng"]) def thirdPriceMap = findThirdPartyPrice(city, statMap) //def rets = createCityDatas(cityCodeDatas, distCodeMap, dists, thirdPriceMap)//ÀϵÚÈý·½¾ù¼Û±í£¨ÏÖ²»Óã© - def rets = createCityDatas1(cityCodeDatas, distCodeMap, dists, thirdPriceMap) + + def rets = createCityDatas1(cityCodeDatas, distCodeMap, dists, thirdPriceMap, gocIdsPrices) // def rets = createData3(cityCodeDatas.get(city))//еÚÈý·½¾ù¼Û±í£¬Òª×ö2²½£¬Âé·³ rows.addAll(rets) println index+" "+city+" "+rets.size() +" "+rows.size() @@ -69,6 +89,8 @@ class ThirdPartyPriceBatch extends BaseBatch { def header = []//["µÚÈý·½¾ù¼ÛID","Â¥ÅÌID","Ð¡ÇøÃû³Æ","³ÇÊÐID","³ÇÊÐÃû³Æ","ÐÐÕþÇøID","ÐÐÕþÇøÃû³Æ","¾ù¼Û¶ÔÓ¦µÄÔ·Ý","Öî¸ðÕÒ·¿¾ù¼Û","°²¾Ó¿Í¾ù¼Û","·¿ÌìϾù¼Û","Á´¼Ò¾ù¼Û","³ÇÊз¿²ú¾ù¼Û","ÂóÌï¾ù¼Û","±´¿Ç¾ù¼Û","ÌÔ·¿365","ÖÐÔ­¾ù¼Û","Íò©Ê¿¾ù¼Û","Q·¿¾ù¼Û","·¿Ì½¾ù¼Û","·¿¶à¶à¾ù¼Û","ÎÒ°®ÎÒ¼Ò¾ù¼Û","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾"] FileUtils.batchCreateFile(rows, fileName, header, "utf-8", true); + saveToPgSql(rows) + } @@ -181,10 +203,12 @@ class ThirdPartyPriceBatch extends BaseBatch { } - def createCityDatas1(cityCodeDatas, distCodeMap, dists, thirdPriceMap){ + def createCityDatas1(cityCodeDatas, distCodeMap, dists, thirdPriceMap, gocPrices){ def allRows = [] for(def d : dists){ - + if(gocPrices && gocPrices.contains(d._id.toString())){ + continue; + } def third = thirdPriceMap.get(d.region+"##"+d.name) if(third){ def data = distCodeMap.get(d.region) @@ -502,8 +526,8 @@ class ThirdPartyPriceBatch extends BaseBatch { def findThirdPartyPrice(def city, def statMap){ def q = new BasicDBObject() q.put("city", city) - q.put("s_date", new BasicDBObject('$gte', startDate).append('$lte',endDate)) + def dbcursor = AVERAGE_STATISTICS.find(q).sort(new BasicDBObject("s_date", -1)) def map = [:] for(def db : dbcursor){ @@ -618,4 +642,32 @@ class ThirdPartyPriceBatch extends BaseBatch { } + def saveToPgSql(rows){ + for(def r : rows) { + for (def i = 0; i < r.size(); i++) { + if("" == r[i]){ + r[i] = null + } + } + r << null + r << DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-28" + r << null + r << '2999-12-31' + r << null + r << null + r << null + } + + println "start: "+new Date() + def sql = "insert into base.t0831_bigdata_third_party_price_gj_h values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)" + + pgsqlInstance.withBatch(50000, sql){ ps-> + for(def r : rows) { + ps.addBatch(r[0], r[1], r[2], r[3], r[4], r[5], r[6], r[7], r[8], r[9], r[10], r[11], r[12], r[13], r[14], r[15], r[16], r[17], r[18]) + } + } + + println "end: "+new Date() + } + } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TradeStatLog.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TradeStatLog.groovy index c2f488b5f..e8bd49824 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TradeStatLog.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/TradeStatLog.groovy @@ -50,8 +50,25 @@ class TradeStatLog { // task.deleteDealData2() // task.statTableCount() // task.filterTrade() +// task.updateDealPriceType() + } + def updateDealPriceType(){ + def citys = CommonDatautils.findAllCity() + def index = 0 + for(def c : citys){ + DEAL_PRICE_COLL.find(new BasicDBObject("city", c)).sort(new BasicDBObject("trade_date",-1)).batchSize(5000).each {it-> + if(it.total_price instanceof Double){ + index ++ + println index+" "+it.city+" "+it.total_price+" "+it._id.toString() + + def udata = new BasicDBObject() + udata.put("total_price", (int)it.total_price) + DEAL_PRICE_COLL.update(new BasicDBObject("_id", it._id), new BasicDBObject('$set', udata)) + } + } + } } def statTableCount(){ @@ -73,15 +90,15 @@ class TradeStatLog { } def run(){ - def citys = CcbCommonUtils.citys_92; + def citys = CcbCommonUtils.citys_all; def rets = [] - rets << ["³ÇÊÐ","7ÔÂ×ÜÁ¿","8ÔÂ×ÜÁ¿","9ÔÂ×ÜÁ¿","Õ¼±È","±´¿Ç","Á´¼Ò", "ÎÒ°®ÎÒ¼Ò","·¿ÌìÏÂ","ÖÐÔ­"] + rets << ["³ÇÊÐ","23Äê2ÔÂ×ÜÁ¿","23Äê3ÔÂ×ÜÁ¿","23Äê4ÔÂ×ÜÁ¿","Õ¼±È","±´¿Ç","Á´¼Ò", "ÎÒ°®ÎÒ¼Ò","·¿ÌìÏÂ","ÖÐÔ­"] def sources = ["±´¿ÇÕÒ·¿","Á´¼ÒÔÚÏß","ÎÒ°®ÎÒ¼Ò","·¿ÌìÏÂ","ÖÐÔ­µØ²ú"] //def startDate = "2021-05-01" - def startDate = "2022-07-01" - def date = "2022-08-01" - def endDate = "2022-09-01" - def newDate = "2022-10-01" + def startDate = "2023-02-01" + def date = "2023-03-01" + def endDate = "2023-04-01" + def newDate = "2023-05-01" for(def city : citys){ def lastMonthCount = findTradesCount(city, null, DateUtils.parseFromTightByPattern(startDate,"yyyy-MM-dd"), DateUtils.parseFromTightByPattern(date,"yyyy-MM-dd")) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/UpdateData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/UpdateData.groovy index 024ad4123..640b024b9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/UpdateData.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/UpdateData.groovy @@ -1,5 +1,7 @@ package com.fangjia.script.ccbevaluation +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.gj.FiledStrand import com.fangjia.script.util.DbUtils import com.mongodb.BasicDBObject import groovy.sql.Sql @@ -11,7 +13,26 @@ class UpdateData { static main(args) { def task = new UpdateData(); - task.run() +// task.run() + task.updateBlock() + } + + def updateBlock(){ + def citys = CommonDatautils.findAllCity() + for(def c : citys){ + def dists = CommonDatautils.findAllDistrictByCity(c, "district", ["city","region", "block","name"]) + for(def d : dists){ + if(d.block){ + def newBlock = FiledStrand.processBlock(d.city, d.region, d.block) + if(newBlock!= d.block){ + def udata = new BasicDBObject() + udata.put("block", newBlock) + println d.city+" "+d.block +" "+newBlock + DbUtils.seaweed.update(new BasicDBObject('_id',d._id),new BasicDBObject('$set', udata)) + } + } + } + } } def run(){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/AddressCut.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/AddressCut.groovy index 19bf6561b..af276a9c9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/AddressCut.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/AddressCut.groovy @@ -7,8 +7,12 @@ import com.fangjia.script.gj.district.FangjiaClientUtils import com.fangjia.script.lixue.util.DBUtils import com.fangjia.script.util.DbUtils import com.fangjia.script.util.ExcelUtils +import com.fangjia.script.util.MongoUtils import com.mongodb.BasicDBObject +import com.mongodb.DBCollection +import org.elasticsearch.xpack.sql.jdbc.EsDataSource +import java.sql.ResultSet import java.util.concurrent.CopyOnWriteArrayList import java.util.concurrent.CountDownLatch import java.util.concurrent.ExecutorService @@ -16,13 +20,118 @@ import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong class AddressCut extends BaseBatch{ + + + final DBCollection thirdPartyPriceColl = MongoUtils.getCollectionByName("fangjia_craw", "third_party_price", "192.168.0.235", 27018) + + public static EsDataSource dataSource = new EsDataSource() + private static final String address = "jdbc:es://http://seawater.es.db.fangjia.com:9200?timezone=UTC&page.size=240&connect.timeout=240000&network.timeout=60000&page.timeout=240000&query.timeout=90000" + static { + dataSource.setUrl(address) + Properties connectionProperties = new Properties() + connectionProperties.put("user", "developer") + connectionProperties.put("password", "5e8edd851d2fdfbd7415232c67367cc3") + dataSource.setProperties(connectionProperties) + } static main(args) { runBatch(new AddressCut(), args); } @Override public void process(Object args) { - sameAddr() +<<<<<<< HEAD +// sameAddr() + seaweedStreetUpdate() + } + + def seaweedStreetUpdate(){ + ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\½¨ÐÐ\\Ð¡ÇøµØÖ·²ð·Ö\\ÒѺËʵ-·2.xlsx",{d-> + if(d['A']){ + def dbo = CommonDatautils.findDistrict(d['A'], d['B'], d['C'], "district") + if(dbo){ + def udate = new BasicDBObject() + def street = null + def address = "" + if(d['E']){ + street = d['E'] + udate.put("street", street) + address = street + } + def streetNum = null + if(d['F']){ + streetNum = d['F'] + udate.put("street_number", streetNum) + address = address + streetNum + } + + if(dbo.address!=address){ + udate.put("address", address) + } + if(udate){ + udate.put("m_date", new Date()) + DBUtils.seaweed.update(new BasicDBObject('_id', dbo.get("_id")), new BasicDBObject('$set', udate)) + } + + } + } + + }) +======= +// sameAddr() //ÏàͬµØÖ·Ð¡Çø +// roadMatch() + addAnjukeRoad() + + } + + def addAnjukeRoad(){ + ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Ð¡ÇøµØÖ·²ð·Ö\\Ð¡ÇøµØÖ·ÇзÖ(½á¹û)_1.xlsx", { d -> + def roads = findThirdPartyPrice(d['A'], d['B'], d['C'], "Á´¼Ò") + if(roads){ + d['O'] = roads[0] + } + }); + } + + def findThirdPartyPrice(city, region, name, source){ + def q = new BasicDBObject() + q.put("city", city) + q.put("region", region) + q.put("name", name) + q.put("source", source) + def dbcursor = thirdPartyPriceColl.find(q).sort(new BasicDBObject("s_date", -1)).limit(10) + def roads = [] + for(def d : dbcursor){ + if(d.address && !roads.contains(d.address)){ + roads << d.address + } + } + return roads + } + + def roadMatch(){ + def cityRoadsMap = queryPoiMap() + println "µÀ·¼ÓÔØÍê³É....." + ExcelUtils.modify("D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Ð¡ÇøµØÖ·²ð·Ö\\Ð¡ÇøµØÖ·ÇзÖ(½á¹û)_1.xlsx", { d -> + def roads = cityRoadsMap.get(d['A']) +// if (roads && roads.contains(d['E'])) { +// d['L'] = "ÊÇ" +// println d['A'] + " " + d['E'] +// } + + if(roads){ + for(def road : roads){ + if(!d['L'] && d['E'] && d['E'].toString().contains(road)){ + d['L'] = "Öмä°üº¬" + d['M'] = road + println d['A'] + " " + d['E'] + break; + } + } + } + }) + + +>>>>>>> c1a5ab8c6aa973a91e6be5547ec0925db3fa500f } def sameAddr() { @@ -143,4 +252,29 @@ class AddressCut extends BaseBatch{ latch.await() return rows; } + + def queryPoiMap(){ + final StringBuffer sqlBuffer = new StringBuffer() + sqlBuffer.append("SELECT cityname,name,type FROM amap_poi WHERE 1=1") +// sqlBuffer.append(" and cityname = '" + city + "'") +// sqlBuffer.append(" and name = '" + name + "'") + sqlBuffer.append(" and type like '%µÀ·Ãû%'") +// sqlBuffer.append(" and MATCH(name,'${name}')") +// sqlBuffer.append(" and source = '¸ßµÂ' order by score() desc") + ResultSet rs = dataSource.connection.createStatement().executeQuery(sqlBuffer.toString()) + def cityMap = [:] + while (rs.next()) { + def city = rs.getString("cityname"); + def road = rs.getString("name") + def roads = cityMap.get(city) + if(!roads){ + roads = new HashSet() + } + roads << road + cityMap.put(city, roads) + + } + return cityMap; + } + } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbDataStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbDataStat.groovy index 1aa5a391f..d7be2d646 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbDataStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/CcbDataStat.groovy @@ -1,6 +1,7 @@ package com.fangjia.script.ccbevaluation.data import com.fangjia.script.ccbevaluation.CcbCommonUtils +import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.common.DataHandleUtils import com.fangjia.script.util.DateUtils import com.fangjia.script.util.ExcelUtils @@ -19,7 +20,22 @@ class CcbDataStat { static main(args) { def task = new CcbDataStat() // task.run() - task.tradeRun() +// task.tradeRun() + task.regionDistStat() + } + + def regionDistStat(){ + def citys = CcbCommonUtils.citys_252 + def rows = [] + for(def c : citys){ + def regions = CommonDatautils.getRegionListByCity(c) + for(def r : regions){ + def count = CommonDatautils.findRegionDistrictCount("district",c, r) + rows << [c, r, count] + println c +" "+r +" "+count + } + } + ExcelUtils.write("d:\\Êý¾Ý\\½¨ÐÐ\\ÇøÓòÐ¡ÇøÁ¿Í³¼Æ.xlsx", rows, "ͳ¼Æ") } def tradeRun(){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/TestData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/TestData.groovy new file mode 100644 index 000000000..857b62715 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/data/TestData.groovy @@ -0,0 +1,115 @@ +package com.fangjia.script.ccbevaluation.data + +import com.fangjia.core.util.BaiDuApiUtils +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.util.DbUtils +import com.fangjia.script.util.ElasticUtils +import com.fangjia.script.util.ExcelUtils +import com.mongodb.BasicDBObject + +class TestData { + + static main(args) { + def task = new TestData() +// task.run() + task.update() + } + + def update(){ + ExcelUtils.modify("C:\\Users\\gaojuan\\Desktop\\ÁúÑÒ1.xlsx", { d -> + def dist = CommonDatautils.findDistrictById(d['A']) + if(dist){ + if(d['E'] && d['G']=="È˹¤"){ + def q = new BasicDBObject() + def baidu = BaiDuApiUtils.geoconv(d['E'].toString().toDouble(), d['F'].toString().toDouble(), 3) + def lng2 = baidu.x + def lat2 = baidu.y + + Long dLat2 = lat2 * 10000000000L + Long dLng2 = lng2 * 10000000000L + + q.put("lat2", dLat2) + q.put("lng2", dLng2) + + Long lng = d['E'].toString().toDouble() * 10000000000L + Long lat = d['F'].toString().toDouble() * 10000000000L + q.put("lng", lng) + q.put("lat", lat) + DbUtils.seaweed.update(new BasicDBObject('_id',d['A']),new BasicDBObject('$set',q)) + } + } + }); + } + + def run(){ + ExcelUtils.modify("C:\\Users\\gaojuan\\Desktop\\ÁúÑÒ.xlsx", { d -> + def dist = CommonDatautils.findDistrictById(d['A']) + if(dist){ + def loc = getLocation(dist.city, dist.region, dist.name) + if(loc){ + d['E'] = loc.x + d['F'] = loc.y + println d['C']+" "+loc.x+" "+loc.y + } + } + +// if(!d['E']){ +// def loc = getAmapLocation("ÁúÑÒÊÐ", d['B'], d['C']) +// if(loc){ +// d['E'] = loc.x +// d['F'] = loc.y +// } +// } + +// if(!d['E']){ +// def dist = CommonDatautils.findDistrictById(d['A']) +// if(dist){ +// def loc = getAmapOldLocation(dist.city, dist.region, d['C']) +// if(loc){ +// d['E'] = loc.x +// d['F'] = loc.y +// } +// } +// +// } + + }); + } + + def getLocation(city, region, name){ + String sql = "select * from community where city='${city}' and region='${region}' and name='${name}' " + def loc = null + ElasticUtils.executeSqlQuery(sql,{ data-> + if(!loc && data.location){ + loc = data.location + } + }) + return loc; + } + + def getAmapLocation(city, region, name){ + String sql = "select * from amap_poi_detail where cityname='${city}' and adname='${region}' and MATCH(name, '${name}') " + def loc = null + ElasticUtils.executeSqlQuery(sql,{ data-> + if(!loc && data.location){ + if(name == data.name){ + loc = data.location + } + } + }) + return loc; + } + + def getAmapOldLocation(city, region, name){ + String sql = "select * from amap_poi where cityname='${city}' and adname='${region}' and MATCH(name, '${name}') " + def loc = null + ElasticUtils.executeSqlQuery(sql,{ data-> + if(!loc && data.location){ + if(name == data.name){ + loc = data.location + } + } + }) + return loc; + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportAllPgData.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportAllPgData.groovy new file mode 100644 index 000000000..58407d269 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportAllPgData.groovy @@ -0,0 +1,1040 @@ +package com.fangjia.script.ccbevaluation.pgsql + +import com.fangjia.script.ccbevaluation.CcbCommonUtils +import com.fangjia.script.ccbevaluation.CcbFtpTestUtils +import com.fangjia.script.ccbevaluation.CcbFtpUtils +import com.fangjia.script.ccbevaluation.ronghe.SSHHelperTest +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.gj.ccb.FileUtils +import com.fangjia.script.util.DateUtils +import com.jcraft.jsch.ChannelSftp +import groovy.sql.Sql +import org.apache.commons.codec.digest.DigestUtils + +class ExportAllPgData { + def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse", + "postgres", "postgres", "org.postgresql.Driver") + def citys = null + def cityCodeMap = CcbCommonUtils.findCityCodeValue() + +// def database = "base" + def database = "t_app_p9pha_plda." + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; + def linux_prefix = "/home/goojia/ccb_data/evaluation/" + def win_prefix = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\evaluation\\${curDate}\\" + + def testCitys = ['110000','130200','140200','150200','320500','320800','330100','420900','440100','610100'] + + static main(args) { + def task = new ExportAllPgData() + task.run(args) + } + + def run(args) { + citys = CcbCommonUtils.getRunningCitys(args) + def new_dists = [] + +// exportEvaluationRateData() +// exportBigdataPoiData() +// exportBigdataDistrictData() +//// +//// //µÚÈý·½ÍøÕ¾È¨Öرí +// exportWebsiteRate(); +// +// exportGuidedPrice()//ËæÈ˹¤¸Ä±ä// +// exportCommunityGuidedPrice()//ËæÕþ²ß// +// //´¦ÀíÐ¡ÇøÇé¿ö +// exportCommunityStaging()//ûcityid +// exportBigdataCommunity()// +// +// exportCommunityBuildType()// +// + exportThirdPartyPrice2(new_dists)// + exportBigdataForsale(new_dists) //ÏÖÔÚ°´updatetimeµ¼³ö +// exportBigdataDeal(new_dists) //2022-07-01 + + + //¼ÆËã½á¹ûÏà¹Ø +// exportAvmEvaluationGJNB() +// exportAVMEvaluationItemGJNB() +// +// exportCityPrice() +// exportRegionPrice() + + exportCommunityBasePrice() +// exportCommunityBasePrice1(curMonth) + +// exportCommunityPdescribeGj() +// exportCommCaseDetailGj() +// +// exportInOk() +//// +// SSHHelperTest jschCommand = new SSHHelperTest(); +// System.out.println(jschCommand.executeCommand("sh /home/ccb_evaluation/output/eval_package.sh ${curDate}")); + } + + def exportEvaluationRateData() { + def sql = "select gujia_ceft_id,gujia_ceft_tp,gujia_bds_ceft,gujia_bds_seq, gujia_urbn,rmrk_dsc, to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm, gujia_src_co from "+database+".t0831_evaluate_rate_gj_h"; + def allRows = [] + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_ceft_id + data << r.gujia_ceft_tp + data << r.gujia_bds_ceft + data << r.gujia_bds_seq + data << r.gujia_urbn + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + + + def fileName = linux_prefix + "MODEL_000000_000000_EVALUATE_RATE_GJ_ALL_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = win_prefix + "MODEL_000000_000000_EVALUATE_RATE_GJ_ALL_${curDate}_0001.dat" + } + createFileToFtp("EVALUATE_RATE", allRows, fileName, curDate, false) + } + + def exportBigdataPoiData() { + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select urbn_id,gujia_admndiv_id,gujia_fsid,poi_nm,gujia_tp,gujia_tp_ecd,gujia_bds_ltt,gujia_bds_lgt,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+".t0831_bigdata_poi_gj_h where urbn_id='${cityCode}'"; + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.urbn_id + data << r.gujia_admndiv_id + data << r.gujia_fsid + data << r.poi_nm + data << r.gujia_tp + data << r.gujia_tp_ecd + data << r.gujia_bds_ltt + data << r.gujia_bds_lgt + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + } + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; + + def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_POI_GJ_ALL_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = win_prefix + "MODEL_000000_000000_BIGDATA_POI_GJ_ALL_${curDate}_0001.dat" + } + createFileToFtp("BIGDATA_POI_GJ", allRows, fileName, curDate, false) + } + + def exportBigdataDistrictData() { + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select gujia_admndiv_id,gujia_admndiv_nm,gujia_admndiv_nm_cpa,urbn_id,gujia_natstd_cd,gujia_dspl_seq,gujia_admndiv_cgy,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_lgc_admndiv_dsc,gujia_lgc_admndiv_cd,gujia_adiv_cd_val,gujia_bds_data_tm_val from "+database+".t0831_bigdata_district_gj_h where urbn_id='${cityCode}'"; + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_admndiv_id + data << r.gujia_admndiv_nm + data << r.gujia_admndiv_nm_cpa + data << r.urbn_id + data << r.gujia_natstd_cd + data << r.gujia_dspl_seq + data << r.gujia_admndiv_cgy + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + data << r.gujia_lgc_admndiv_dsc + data << r.gujia_lgc_admndiv_cd + data << r.gujia_adiv_cd_val + data << r.gujia_bds_data_tm_val + allRows << data + }); + } + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; + def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_DISTRICT_GJ_ALL_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = win_prefix + "MODEL_000000_000000_BIGDATA_DISTRICT_GJ_ALL_${curDate}_0001.dat" + } + createFileToFtp("BIGDATA_DISTRICT_GJ", allRows, fileName, curDate, false) + } + + def exportWebsiteRate(){ + def sql = "select gujiadatawebst_src_id,gujia_data_webst_src,gujiadatawebstmpng_id,gujia_bds_wgt,gujia_bds_tp,gujia_src_co,urbn_id,gujia_urbn,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm, to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from "+database+".t0831_website_config_gj_h"; + def allRows = [] + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujiadatawebst_src_id + data << r.gujia_data_webst_src + data << r.gujiadatawebstmpng_id + data << r.gujia_bds_wgt + data << r.gujia_bds_tp + data << r.gujia_src_co + data << r.urbn_id + data << r.gujia_urbn + data << r.data_crt_tm + data << r.data_udt_tm + allRows << data + }); + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; + def fileName = linux_prefix + "MODEL_000000_000000_WEBSITE_CONFIG_GJ_ALL_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = win_prefix + "MODEL_000000_000000_WEBSITE_CONFIG_GJ_ALL_${curDate}_0001.dat" + } + createFileToFtp("WEBSITE_CONFIG_GJ", allRows, fileName, curDate, false) + } + + + def exportGuidedPrice() { + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select gujia_fsid,gujia_bds_id,comm_nm,urbn_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,to_char(gujia_drc_dt,'yyyy-mm-dd') as gujia_drc_dt,gujia_bds_drc_prc,gujia_add_psn,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+".t0831_guided_price_gj_h where urbn_id='${cityCode}'"; + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_fsid + data << r.gujia_bds_id + data << r.comm_nm + data << r.urbn_id + data << r.urbn_nm + data << r.gujia_admndiv_id + data << r.gujia_admndiv_nm + data << r.gujia_drc_dt + data << r.gujia_bds_drc_prc + data << r.gujia_add_psn + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + } + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; + def fileName = linux_prefix + "MODEL_000000_000000_GUIDED_PRICE_GJ_ALL_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = win_prefix + "MODEL_000000_000000_GUIDED_PRICE_GJ_ALL_${curDate}_0001.dat" + } + createFileToFtp("GUIDED_PRICE_GJ", allRows, fileName, curDate, false) + } + + def exportCommunityGuidedPrice() { + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select gujia_fsid,gujia_bds_id, comm_nm, urbn_id, urbn_nm, gujia_admndiv_id, gujia_admndiv_nm, gujia_bds_drc_prc, gujia_bds_drc_prc_src, rmrk_dsc, to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm, to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm, gujia_src_co from "+database+".t0831_community_guide_price_gj_h where urbn_id='${cityCode}'"; + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_fsid + data << r.gujia_bds_id + data << r.comm_nm + data << r.urbn_id + data << r.urbn_nm + data << r.gujia_admndiv_id + data << r.gujia_admndiv_nm + data << r.gujia_bds_drc_prc + data << r.gujia_bds_drc_prc_src + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + } + + def fileName = linux_prefix + "MODEL_000000_000000_COMMUNITY_GUIDE_PRICE_GJ_ADD_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = win_prefix + "MODEL_000000_000000_COMMUNITY_GUIDE_PRICE_GJ_ADD_${curDate}_0001.dat" + } + createFileToFtp("COMMUNITY_GUIDE_PRICE_GJ", allRows, fileName, curDate, false) + } + + def exportBigdataCommunity(){ + + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select urbn_id,gujia_admndiv_id,gujia_comm_id,gujia_admndiv_nm,comm_nm,gujia_dtl_adr,gujia_bds_ltt,gujia_bds_lgt,gujiabdsocpoldtotarea,gujiabds_bld_tot_area,gujia_bds_grnrate,gujia_bds_vol_rate,gujia_bds_park_num,gujia_bds_bld_yr_rc,gujia_bds_hs_use_val,totunits,gujia_bds_data_tm_val,gujiabds_udt_flag_val,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_comm_tp_val,gujia_comm_fmnm,gujia_str,gujia_hsno,gujiawthr_new_pan_ind,gujia_comm_intd,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,gujia_src_co,gujia_vlgtwn_str_mng,gujia_lgc_admndiv_cd,gujia_lgc_adiv,gujia_bds_bds_st from base.t0831_bigdata_community_gj_h where urbn_id='${cityCode}' ";//where cityId in (350200,150100) + pgsqlInstance.eachRow(sql,{r-> + def data = [] + data << r.urbn_id + data << r.gujia_admndiv_id + data << r.gujia_comm_id + data << r.gujia_admndiv_nm + data << r.comm_nm + data << r.gujia_dtl_adr + data << r.gujia_bds_ltt + data << r.gujia_bds_lgt + data << r.gujiabdsocpoldtotarea + data << r.gujiabds_bld_tot_area + data << r.gujia_bds_grnrate + data << r.gujia_bds_vol_rate + data << r.gujia_bds_park_num + data << r.gujia_bds_bld_yr_rc + data << r.gujia_bds_hs_use_val + data << r.totunits + data << r.gujia_bds_data_tm_val + data << r.gujiabds_udt_flag_val + data << r.data_udt_tm + data << r.gujia_comm_tp_val + data << r.gujia_comm_fmnm + data << r.gujia_str + data << r.gujia_hsno + data << r.gujiawthr_new_pan_ind + data << r.gujia_comm_intd + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.gujia_src_co + data << r.gujia_vlgtwn_str_mng + data << r.gujia_lgc_admndiv_cd + data << r.gujia_lgc_adiv + data << r.gujia_bds_bds_st + allRows << data + }); + } + def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_COMMUNITY_GJ_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "MODEL_000000_000000_BIGDATA_COMMUNITY_GJ_ALL_${curDate}_0001.dat" + } + createFileToFtp("BIGDATA_COMMUNITY_GJ", allRows, fileName, curDate, false) + } + + def exportCommunityStaging() { + + def allRows = [] + def sql = "select gujia_instm_id,gujia_comm_id,gujiacomm_prim_prd_id,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+".t0831_community_staging_gj_h"; + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_instm_id + data << r.gujia_comm_id + data << r.gujiacomm_prim_prd_id + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + def fileName = linux_prefix + "MODEL_000000_000000_COMMUNITY_STAGING_GJ_ALL_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = win_prefix + "MODEL_000000_000000_COMMUNITY_STAGING_GJ_ALL_${curDate}_0001.dat" + } + createFileToFtp("COMMUNITY_STAGING_GJ", allRows, fileName, curDate, false) + } + + def exportCommunityBuildType() { + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select urbn_id,gujia_comm_id,gujia_bld_tp_val,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_bds_data_tm_val from "+database+".t0831_bigdata_commbuildtype_gj_h where urbn_id='${cityCode}'"; + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.urbn_id + data << r.gujia_comm_id + data << r.gujia_bld_tp_val + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + data << r.gujia_bds_data_tm_val + allRows << data + }); + } + def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_COMMBUILDTYPE_GJ_ALL_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = win_prefix + "MODEL_000000_000000_BIGDATA_COMMBUILDTYPE_GJ_ALL_${curDate}_0001.dat" + } + createFileToFtp("BIGDATA_COMMBUILDTYPE_GJ", allRows, fileName, curDate, false) + } + + def exportThirdPartyPrice2(new_dists) { + + def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = win_prefix + "MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" + } + def index = 0 + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def allRows = [] + if(new_dists) { + def newstr = "('"+new_dists.join("','")+"')" + def sql1 = "select gujia_trdpt_avprc_id,urbn_id,gujia_admndiv_id,gujia_bds_id,comm_nm,gujia_dtsr_id,gujia_dtsr_dsc,gujiabds_avprc_dt_val,gujia_bds_comm_avprc,gujiabdscomm_hgst_prc,gujiabdscomm_lwst_prc,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from "+database+".t0831_bigdata_third_party_price_gj_h where " + + "urbn_id='${cityCode}' and gujia_admndiv_id not in ${newstr} "; + def rets1 = getThirdPartyDatas(sql1) + allRows.addAll(rets1) + + def sql2 = "select gujia_trdpt_avprc_id,urbn_id,gujia_admndiv_id,gujia_bds_id,comm_nm,gujia_dtsr_id,gujia_dtsr_dsc,gujiabds_avprc_dt_val,gujia_bds_comm_avprc,gujiabdscomm_hgst_prc,gujiabdscomm_lwst_prc,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from "+database+".t0831_bigdata_third_party_price_gj_h where " + + "urbn_id='${cityCode}' and gujia_admndiv_id in ${newstr} "; + def rets2 = getThirdPartyDatas(sql2) + allRows.addAll(rets2) + }else{ + + if(testCitys.contains(cityCode)){ + def sql = "select gujia_trdpt_avprc_id,urbn_id,gujia_admndiv_id,gujia_bds_id,comm_nm,gujia_dtsr_id,gujia_dtsr_dsc,gujiabds_avprc_dt_val,gujia_bds_comm_avprc,gujiabdscomm_hgst_prc,gujiabdscomm_lwst_prc,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from base.t0831_bigdata_third_party_price_gj_h where urbn_id='${cityCode}' "; + allRows = getThirdPartyDatas(sql) + } + + } + if(allRows && allRows.size()>0){ + index = index + 1 + if(index==1){ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + }else{ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true); + } + } + } + + println "BIGDATA_THIRD_PARTY_PRICE_GJ Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + } + + def getThirdPartyDatas(def sql){ + def allRows = [] + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_trdpt_avprc_id + data << r.urbn_id + data << r.gujia_admndiv_id + data << r.gujia_bds_id + data << r.comm_nm + data << r.gujia_dtsr_id + data << r.gujia_dtsr_dsc + data << r.gujiabds_avprc_dt_val + data << r.gujia_bds_comm_avprc + data << r.gujiabdscomm_hgst_prc + data << r.gujiabdscomm_lwst_prc + data << r.data_udt_tm + allRows << data + }) + return allRows; + } + + + def exportBigdataDeal(def new_dists) { + + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + if(new_dists){ + def newstr = "('"+new_dists.join("','")+"')" + def sql1 = "select urbn_id,gujia_bds_mdl_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_str,gujia_hsno,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_bds_wbt_floor,gujia_lyr_tp_val,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_bds_trdtckt_prc,gujia_bds_mdl_tot_prc,gujia_bds_dcl_tot_prc,gujiabds_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_bds_mdl_cyc,gujiawthrext_lift_ind,gujiabdslndfgrngvarea,gujiabdslutbl_gv_area,gujiabdssuntblgv_area,gujiabdsbayindowgarea,gujiabdstowerfrgvarea,gujia_bds_grg_gv_area,gujiabdsundgdrmgvarea,gujiabds_othr_gv_area,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_bds_mkdam,gujia_bds_data_tm_val " + + "from "+database+".t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and gujia_admndiv_id not in ${newstr}" + def rets1 = dealData(sql1) + + def sql2 = "select urbn_id,gujia_bds_mdl_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_str,gujia_hsno,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_bds_wbt_floor,gujia_lyr_tp_val,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_bds_trdtckt_prc,gujia_bds_mdl_tot_prc,gujia_bds_dcl_tot_prc,gujiabds_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_bds_mdl_cyc,gujiawthrext_lift_ind,gujiabdslndfgrngvarea,gujiabdslutbl_gv_area,gujiabdssuntblgv_area,gujiabdsbayindowgarea,gujiabdstowerfrgvarea,gujia_bds_grg_gv_area,gujiabdsundgdrmgvarea,gujiabds_othr_gv_area,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_bds_mkdam,gujia_bds_data_tm_val " + + "from "+database+".t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and gujia_admndiv_id in ${newstr}" + def rets2 = dealData(sql2) + allRows.addAll(rets1) + allRows.addAll(rets2) + }else{ + def sql = "select urbn_id,gujia_bds_mdl_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_str,gujia_hsno,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_bds_wbt_floor,gujia_lyr_tp_val,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_bds_trdtckt_prc,gujia_bds_mdl_tot_prc,gujia_bds_dcl_tot_prc,gujiabds_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_bds_mdl_cyc,gujiawthrext_lift_ind,gujiabdslndfgrngvarea,gujiabdslutbl_gv_area,gujiabdssuntblgv_area,gujiabdsbayindowgarea,gujiabdstowerfrgvarea,gujia_bds_grg_gv_area,gujiabdsundgdrmgvarea,gujiabds_othr_gv_area,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_bds_mkdam,gujia_bds_data_tm_val " + + "from "+database+".t0831_bigdata_deal_gj_h where urbn_id='${cityCode}'"; + allRows.addAll(dealData(sql)) + } + } + + def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = win_prefix + "MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_${curDate}_0001.dat" + } + createFileToFtp("BIGDATA_DEAL_GJ", allRows, fileName, curDate, false) + } + + + def dealData(def sql){ + def allRows = [] + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.urbn_id + data << r.gujia_bds_mdl_id + data << r.urbn_nm + data << r.gujia_admndiv_id + data << r.gujia_admndiv_nm + data << r.gujia_str + data << r.gujia_hsno + data << r.gujia_comm_id + data << r.comm_nm + data << r.gujia_bld_id + data << r.bld_id + data << r.gujia_bld_nm + data << r.gujia_unit_id + data << r.unit_id + data << r.gujia_unit_nm + data << r.gujia_acc_id + data << r.gujia_dtl_adr + data << r.gujia_bds_bld_yr_rc + data << r.gujia_own_val + data << r.gujia_own_yrlmt_val + data << r.gujia_prd_val + data << r.gujia_bds_wbt_floor + data << r.gujia_lyr_tp_val + data << r.gujiabdstot_floor_num + data << r.gujia_bld_tp_val + data << r.gujia_bld_stc + data << r.guiabconstructionarea + data << r.gujiabdsset_innr_area + data << r.gujia_acc_tp_val + data << r.gujia_bds_room_num + data << r.gujia_bds_dept_num + data << r.gujia_bds_ktch_num + data << r.gujia_bds_hlt_btw_num + data << r.gujia_hs_use + data << r.gujia_indr_stc_val + data << r.gujia_twrd_val + data << r.gujia_dcrt_sttn + data << r.gujia_ases_bt_ln_num + data << r.gujia_bds_trdtckt_prc + data << r.gujia_bds_mdl_tot_prc + data << r.gujia_bds_dcl_tot_prc + data << r.gujiabds_ases_tot_prc + data << r.gujiasigntonlinectrid + data << r.txn_dt + data << r.gujia_txn_tp_val + data << r.gujia_sell_pymtmod + data << r.gujia_bds_mdl_cyc + data << r.gujiawthrext_lift_ind + data << r.gujiabdslndfgrngvarea + data << r.gujiabdslutbl_gv_area + data << r.gujiabdssuntblgv_area + data << r.gujiabdsbayindowgarea + data << r.gujiabdstowerfrgvarea + data << r.gujia_bds_grg_gv_area + data << r.gujiabdsundgdrmgvarea + data << r.gujiabds_othr_gv_area + data << r.gujia_hs_src_dtsrc + data << r.intr_co_id + data << r.intr_co_nm + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + data << r.gujia_bds_mkdam + data << r.gujia_bds_data_tm_val + allRows << data + }); + return allRows + } + + + def exportBigdataForsale(new_dists){ + def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_FORSALE_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "MODEL_000000_000000_BIGDATA_FORSALE_GJ_ADD_${curDate}_0001.dat" + } + def index = 0 + for(def city : citys){ + def cityCode = cityCodeMap.get(city) + + def allRows = [] + if(new_dists){ + def newstr = "('"+new_dists.join("','")+"')" + def sql1 = "select urbn_id,gujia_sell_id,gujia_listg_hs_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_bds_unitprc,gujia_bds_tot_prc,gujia_sell_pymtmod,gujia_bds_wbt_floor,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_indr_stc_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_twrd_val,gujia_dcrt_sttn,gujiawthrext_lift_ind,gujiajiladderjiactval,to_char(anc_tm,'yyyy-mm-dd') as anc_tm,to_char(exdat,'yyyy-mm-dd') as exdat,gujia_wthr_strt,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,gujia_anc_psn,gujia_anc_psn_tel,gujia_dsc_inf_cntnt,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_apd_inf " + + "from "+database+".t0831_bigdata_forsale_gj_h where urbn_id='${cityCode}' and gujia_admndiv_id not in ${newstr}"; + def rets1 = getHouseDatas(sql1) + allRows.addAll(rets1) + }else{ + if(testCitys.contains(cityCode)) { + def sql = "select urbn_id,gujia_sell_id,gujia_listg_hs_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_bds_unitprc,gujia_bds_tot_prc,gujia_sell_pymtmod,gujia_bds_wbt_floor,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_indr_stc_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_twrd_val,gujia_dcrt_sttn,gujiawthrext_lift_ind,gujiajiladderjiactval,to_char(anc_tm,'yyyy-mm-dd') as anc_tm,to_char(exdat,'yyyy-mm-dd') as exdat,gujia_wthr_strt,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,gujia_anc_psn,gujia_anc_psn_tel,gujia_dsc_inf_cntnt,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_apd_inf " + + "from base.t0831_bigdata_forsale_gj_h where urbn_id='${cityCode}' "; + allRows = getHouseDatas(sql) + } + } + println city +" "+allRows.size() + if(allRows.size()>0){ + index = index + 1 + if(index == 1){ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + }else{ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true); + } + + } + } + + if(new_dists){//²¹³ä±»ÐÞÇøÓòµÄÊý¾Ý + def newstr = "('"+new_dists.join("','")+"')" + def sql2 = "select urbn_id,gujia_sell_id,gujia_listg_hs_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_bds_unitprc,gujia_bds_tot_prc,gujia_sell_pymtmod,gujia_bds_wbt_floor,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_indr_stc_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_twrd_val,gujia_dcrt_sttn,gujiawthrext_lift_ind,gujiajiladderjiactval,to_char(anc_tm,'yyyy-mm-dd') as anc_tm,to_char(exdat,'yyyy-mm-dd') as exdat,gujia_wthr_strt,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,gujia_anc_psn,gujia_anc_psn_tel,gujia_dsc_inf_cntnt,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_apd_inf " + + "from "+database+".t0831_bigdata_forsale_gj_h where gujia_admndiv_id in ${newstr}" + def rets2 = getHouseDatas(sql2) + if(rets2.size()>0){ + FileUtils.batchCreateFile(rets2, fileName, [], "utf-8", true); + } + } + println "BIGDATA_FORSALE_GJ Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println "BIGDATA_FORSALE_GJ ÉÏ´«FtpÍê³É......" + } + + def getHouseDatas(sql){ + def allRows = [] + def index = 0 + pgsqlInstance.eachRow(sql,{r-> + index = index+1 + def data = [] + data << r.urbn_id + data << r.gujia_sell_id + data << r.gujia_listg_hs_id + data << r.urbn_nm + data << r.gujia_admndiv_id + data << r.gujia_admndiv_nm + data << r.gujia_comm_id + data << r.comm_nm + data << r.gujia_bld_id + data << r.bld_id + data << r.gujia_bld_nm + data << r.gujia_unit_id + data << r.unit_id + data << r.gujia_unit_nm + data << r.gujia_acc_id + data << r.gujia_dtl_adr + data << r.gujia_bds_bld_yr_rc + data << r.gujia_own_val + data << r.gujia_own_yrlmt_val + data << r.gujia_bds_unitprc + data << r.gujia_bds_tot_prc + data << r.gujia_sell_pymtmod + data << r.gujia_bds_wbt_floor + data << r.gujiabdstot_floor_num + data << r.gujia_bld_tp_val + data << r.gujia_indr_stc_val + data << r.gujia_bld_stc + data << r.guiabconstructionarea + data << r.gujiabdsset_innr_area + data << r.gujia_acc_tp_val + data << r.gujia_bds_room_num + data << r.gujia_bds_dept_num + data << r.gujia_bds_ktch_num + data << r.gujia_bds_hlt_btw_num + data << r.gujia_twrd_val + data << r.gujia_dcrt_sttn + data << r.gujiawthrext_lift_ind + data << r.gujiajiladderjiactval + data << r.anc_tm + data << r.exdat + data << r.gujia_wthr_strt + data << r.gujia_hs_src_dtsrc + data << r.intr_co_id + data << r.intr_co_nm + data << r.gujia_anc_psn + data << r.gujia_anc_psn_tel + data << r.gujia_dsc_inf_cntnt + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + data << r.gujia_apd_inf + allRows << data +// if(allRows.size()%200000==0){ +// FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true); +// allRows.clear() +// } + }); + return allRows + } + + + def exportAvmEvaluationGJNB(){ + + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select gujia_fsid,urbn_id,urbn_nm,gujia_bds_yrmo,gujia_bds_comm_num,gujiabdsvalmnycommnum,gujia_prc_cvr_rate,gujiabdsmnldpccommnum,gujia_mnl_drc_prc_pct,gujiabdssamp_comm_num,gujiaext_samp_clc_pct,gujiabdsnervetncomnum,gujianervethrunclcpct,gujiabds_tst_case_num,gujiabds_tst_comm_num,gujiatst_comm_num_pct,gujia_ppe15_cvr_rate,gujia_rto_mdn,gujia_rto_lv_san_ceft,gujiabdsmdltstcasenum,gujiabdsmdltstcommnum,gujiamdltstcommnumpct,gujiamdltst_ppe15_pct,gujiamdlrtolvsan_ceft,gujia_mdl_md_bit_rto,gujiabdstrdpttcasenum,gujiabdstrdpttcommnum,gujiatrdpttcommnumpct,gujiatrdpttstppe15pct,gujiatrdptrolvsanceft,gujiatrdpt_md_bit_rto,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+"avm_evaluation_gj_h where urbn_id='${cityCode}'"; + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_fsid + data << r.urbn_id + data << r.urbn_nm + data << r.gujia_bds_yrmo + data << r.gujia_bds_comm_num + data << r.gujiabdsvalmnycommnum + data << r.gujia_prc_cvr_rate + data << r.gujiabdsmnldpccommnum + data << r.gujia_mnl_drc_prc_pct + data << r.gujiabdssamp_comm_num + data << r.gujiaext_samp_clc_pct + data << r.gujiabdsnervetncomnum + data << r.gujianervethrunclcpct + data << r.gujiabds_tst_case_num + data << r.gujiabds_tst_comm_num + data << r.gujiatst_comm_num_pct + data << r.gujia_ppe15_cvr_rate + data << r.gujia_rto_mdn + data << r.gujia_rto_lv_san_ceft + data << r.gujiabdsmdltstcasenum + data << r.gujiabdsmdltstcommnum + data << r.gujiamdltstcommnumpct + data << r.gujiamdltst_ppe15_pct + data << r.gujiamdlrtolvsan_ceft + data << r.gujia_mdl_md_bit_rto + data << r.gujiabdstrdpttcasenum + data << r.gujiabdstrdpttcommnum + data << r.gujiatrdpttcommnumpct + data << r.gujiatrdpttstppe15pct + data << r.gujiatrdptrolvsanceft + data << r.gujiatrdpt_md_bit_rto + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + } + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"; + def fileName = linux_prefix + "MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat" + def fileName1 = linux_prefix + "MODEL_000000_000000_AVM_EVALUATION_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat" + fileName1 = win_prefix + "MODEL_000000_000000_AVM_EVALUATION_GJ_ADD_${curDate}_0001.dat" + } + createFileToFtp("AVM_EVALUATION_GJNB", allRows, fileName, curDate, false) + createFileToFtp("AVM_EVALUATION_GJ", allRows, fileName1, curDate, false) + } + + def exportAVMEvaluationItemGJNB(yearMonth){ + + def allRows = [] + + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select gujia_fsid,urbn_id,urbn_nm,gujia_rgon_id,gujia_rgon_nm,gujia_comm_id,gujia_comm_nm,gujiabds_clc_yrmo_val,gujia_bds_clc_avprc,gujia_bds_avprc,gujia_bds_clc_tp,gujia_bds_rlb,gujiabds_to_mkprc_mny,to_char(mdl_dt,'yyyy-mm-dd') as mdl_dt,gujiabds_valt_unitprc,gujia_area,gujia_dcrt_val,gujia_twrd_val,gujia_bds_floor_num,gujiabdstot_floor_num,gujia_data_tp,gujia_rto,gujia_mns_rto,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') AS data_crt_tm from "+database+"avm_evaluation_item_gj_h where urbn_id='${cityCode}'"; + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_fsid + data << r.urbn_id + data << r.urbn_nm + data << r.gujia_rgon_id + data << r.gujia_rgon_nm + data << r.gujia_comm_id + data << r.gujia_comm_nm + data << r.gujiabds_clc_yrmo_val + data << r.gujia_bds_clc_avprc + data << r.gujia_bds_avprc + data << r.gujia_bds_clc_tp + data << r.gujia_bds_rlb + data << r.gujiabds_to_mkprc_mny + data << r.mdl_dt + data << r.gujiabds_valt_unitprc + data << r.gujia_area + data << r.gujia_dcrt_val + data << r.gujia_twrd_val + data << r.gujia_bds_floor_num + data << r.gujiabdstot_floor_num + data << r.gujia_data_tp + data << r.gujia_rto + data << r.gujia_mns_rto + data << r.data_crt_tm + allRows << data + }); + } + + def fileName = linux_prefix + "MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat" + def fileName1 = linux_prefix + "MODEL_000000_000000_AVM_EVALUATION_ITEM_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat" + fileName1 = win_prefix + "MODEL_000000_000000_AVM_EVALUATION_ITEM_GJ_ADD_${curDate}_0001.dat" + } + + createFileToFtp("AVM_EVALUATION_ITEM_GJNB",allRows, fileName, curDate, false) + createFileToFtp("AVM_EVALUATION_ITEM_GJ",allRows, fileName1, curDate, false) + } + + def exportCityPrice(){ + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select gujia_trdpt_avprc_id,urbn_id,urbn_nm,gujiabds_clc_yrmo_val,gujia_bds_clc_avprc,gujia_bds_urbn_avprc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+"avm_city_price_gj_h where urbn_id='${cityCode}'";// + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_trdpt_avprc_id + data << r.urbn_id + data << r.urbn_nm + data << r.gujiabds_clc_yrmo_val + data << r.gujia_bds_clc_avprc + data << r.gujia_bds_urbn_avprc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + } + + def fileName = linux_prefix + "MODEL_000000_000000_CITY_PRICE_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "MODEL_000000_000000_CITY_PRICE_GJ_ADD_${curDate}_0001.dat" + } + createFileToFtp("CITY_PRICE_GJ",allRows, fileName, curDate, false) + } + + def exportRegionPrice(){ + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select gujia_trdpt_avprc_id,urbn_id,urbn_nm,gujia_admndiv_id,gxda_admndiv_nm,gujiabds_clc_yrmo_val,gujia_bds_clc_avprc,gujia_bds_urbn_avprc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+"avm_district_price_gj_h where urbn_id='${cityCode}'"; // + + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_trdpt_avprc_id + data << r.urbn_id + data << r.urbn_nm + data << r.gujia_admndiv_id + data << r.gxda_admndiv_nm + data << r.gujiabds_clc_yrmo_val + data << r.gujia_bds_clc_avprc + data << r.gujia_bds_urbn_avprc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + } + def fileName = linux_prefix + "MODEL_000000_000000_DISTRICT_PRICE_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "MODEL_000000_000000_DISTRICT_PRICE_GJ_ADD_${curDate}_0001.dat" + } + + createFileToFtp("DISTRICT_PRICE_GJ",allRows, fileName, curDate, false) + } + + def exportCommunityBasePrice(){ + + def fileName = linux_prefix + "MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" + def fileName1 = linux_prefix + "MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" + fileName1 = win_prefix + "MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" + } + + for(def city : citys) { + def allRows = [] + def cityCode = cityCodeMap.get(city) + if(testCitys.contains(cityCode)){ + def sql = "select gujia_bss_prc_id,urbn_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_bds_id,comm_nm,gujiabds_clc_yrmo_val,gujia_bds_clc_avprc,gujia_comm_basic_prc,gujia_bds_clmtd,gujiabds_fwd_samp_rto,gujia_bds_mns_grd,gujia_bds_cfdrg,gujiabdsarndcmprccrlt,gujia_bds_cfdc_dgr,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+"avm_community_base_price_gj_h where urbn_id='${cityCode}'";// + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_bss_prc_id + data << r.urbn_id + data << r.urbn_nm + data << r.gujia_admndiv_id + data << r.gujia_admndiv_nm + data << r.gujia_bds_id + data << r.comm_nm + data << r.gujiabds_clc_yrmo_val + data << r.gujia_bds_clc_avprc + data << r.gujia_comm_basic_prc + data << r.gujia_bds_clmtd + data << r.gujiabds_fwd_samp_rto + data << r.gujia_bds_mns_grd + data << r.gujia_bds_cfdrg + data << r.gujiabdsarndcmprccrlt + data << r.gujia_bds_cfdc_dgr + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + if(allRows.size()%200000==0){ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true); + FileUtils.batchCreateFile(allRows, fileName1, [], "utf-8", true); + allRows.clear() + } + }); + + if(allRows.size()>0){ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true); + FileUtils.batchCreateFile(allRows, fileName1, [], "utf-8", true); + } + } + } + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + CcbFtpTestUtils.ftpUpload(null, fileName1, curDate) + } + + + def exportCommunityBasePrice1(yearMonth){ + + def fileName1 = linux_prefix + "MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName1 = win_prefix + "MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" + } + + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select gujia_bss_prc_id,urbn_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_bds_id,comm_nm,gujiabds_clc_yrmo_val,gujia_bds_clc_avprc,gujia_comm_basic_prc,gujia_bds_clmtd,gujiabds_fwd_samp_rto,gujia_bds_mns_grd,gujia_bds_cfdrg,gujiabdsarndcmprccrlt,gujia_bds_cfdc_dgr,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+"avm_community_base_price_gj_h where urbn_id='${cityCode}'";//gujiabds_clc_yrmo_val=${yearMonth} AND + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_bss_prc_id + data << r.urbn_id + data << r.urbn_nm + data << r.gujia_admndiv_id + data << r.gujia_admndiv_nm + data << r.gujia_bds_id + data << r.comm_nm + data << r.gujiabds_clc_yrmo_val + data << r.gujia_bds_clc_avprc + data << r.gujia_comm_basic_prc + data << r.gujia_bds_clmtd + data << r.gujiabds_fwd_samp_rto + data << r.gujia_bds_mns_grd + data << r.gujia_bds_cfdrg + data << r.gujiabdsarndcmprccrlt + data << r.gujia_bds_cfdc_dgr + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + + if(allRows.size()%200000==0){ + FileUtils.batchCreateFile(allRows, fileName1, [], "utf-8", true); + allRows.clear() + } + }); + } + + if(allRows.size()>0){ + FileUtils.batchCreateFile(allRows, fileName1, [], "utf-8", true); + } + } + + def exportCommunityPdescribeGj(){ + + def fileName = linux_prefix + "MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" + } + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select gujia_fsid,gujia_comm_id,urbn_id,urbn_nm,admndiv_ecd,gujia_admndiv_nm,comm_nm,gujia_als_dsc,gujia_bds_bss_prc,gujiabds_cfdc_dgr_grd,gujiabdsrt3mlgcasenum,gujiabdslistgclwstprc,gujiabdslistgcaemdval,gujiabdslistgcase_avg,gujiabdslistgcemaxprc,gujia_bds_mo_val,gujiabdsavgwminvalavg,gujiabdsavgwmaxvalavg,gujia_bds_rel_err_val,gujia_dvtdgr_dsc,gujia_als_prc_rng,gujiaprcminandmax_rng,gujia_dsc,gujiabds_lmth_bss_prc,gujiabds_wthr_mnl_val,gujiabds_lmth_fnl_prc,to_char(data_crt_tm,'yyyy-mm-dd') as data_crt_tm,gujiabdsnervetuntwprc,gujia_prc_src,gujiabdsabtjlcmbitval,gujiabdsabtjlgcaseavg,gujia_indx_lbl,gujia_prim_pty_tp,gujia_comm_tp_val,gujiabds_ltst_mdl_prc,to_char(gujia_ltst_mdl_dt,'yyyy-mm-dd') as gujia_ltst_mdl_dt,gujiabdsidxnmo_moonmo,gujiabdsa1yiminmmonmo,gujiabdsidxnyr_moonmo,gujiabdsat1yspdgrscor,gujiabdsarnd1kscavprc from "+database+"avm_community_p_describe_gj_h where urbn_id='${cityCode}'"; + + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_fsid + data << r.gujia_comm_id + data << r.urbn_id + data << r.urbn_nm + data << r.admndiv_ecd + data << r.gujia_admndiv_nm + data << r.comm_nm + data << r.gujia_als_dsc + data << r.gujia_bds_bss_prc + data << r.gujiabds_cfdc_dgr_grd + data << r.gujiabdsrt3mlgcasenum + data << r.gujiabdslistgclwstprc + data << r.gujiabdslistgcaemdval + data << r.gujiabdslistgcase_avg + data << r.gujiabdslistgcemaxprc + data << r.gujia_bds_mo_val + data << r.gujiabdsavgwminvalavg + data << r.gujiabdsavgwmaxvalavg + data << r.gujia_bds_rel_err_val + data << r.gujia_dvtdgr_dsc + data << r.gujia_als_prc_rng + data << r.gujiaprcminandmax_rng + data << r.gujia_dsc + data << r.gujiabds_lmth_bss_prc + data << r.gujiabds_wthr_mnl_val + data << r.gujiabds_lmth_fnl_prc + data << r.data_crt_tm + data << r.gujiabdsnervetuntwprc + data << r.gujia_prc_src + data << r.gujiabdsabtjlcmbitval + data << r.gujiabdsabtjlgcaseavg + data << r.gujia_indx_lbl + data << r.gujia_prim_pty_tp + data << r.gujia_comm_tp_val + data << r.gujiabds_ltst_mdl_prc + data << r.gujia_ltst_mdl_dt + data << r.gujiabdsidxnmo_moonmo + data << r.gujiabdsa1yiminmmonmo + data << r.gujiabdsidxnyr_moonmo + data << r.gujiabdsat1yspdgrscor + data << r.gujiabdsarnd1kscavprc + allRows << data + }); + } + createFileToFtp("community_p_describe_gj",allRows, fileName, curDate, false) + } + + def exportCommCaseDetailGj(){ + def fileName = linux_prefix + "MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat" + } +// for(def city : citys){ +// def cityCode = cityCodeMap.get(city) +// def sql = "select gujia_fsid, urbn_id, gujia_comm_id, gujia_case_id,gujia_bds_crterm,to_char(data_crt_tm,'yyyy-mm-dd') as data_crt_tm from "+database+"avm_comm_case_detail_gj_h where urbn_id='${cityCode}' and gujia_bds_crterm=${month}"; +// def allRows = [] +// pgsqlInstance.eachRow(sql,{r-> +// def data = [] +// data << r.gujia_fsid +// data << r.urbn_id +// data << r.gujia_comm_id +// data << r.gujia_case_id +// data << r.gujia_bds_crterm +// data << r.data_crt_tm +// allRows << data +//// if(allRows.size()%200000==0){ +//// FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true); +//// allRows.clear() +//// } +// }); +// +// FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); +// } + FileUtils.batchCreateFile([], fileName, [], "utf-8", false); + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + } + + def exportMd5(){ + Vector files = CcbFtpUtils.listFileNames(curDate) + Iterator fileVec = files.iterator() + def fileRows = [] + while(fileVec.hasNext()){ + ChannelSftp.LsEntry file = fileVec.next() + if(org.apache.commons.lang.StringUtils.isNotBlank(file.getFilename()) && file.getFilename().endsWith(".dat")){ + fileRows << file.getFilename() +":"+ DigestUtils.md5Hex(file.getFilename()) + } + } + def fileName = linux_prefix + "md5.txt" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "md5.txt" + } + createFileToFtp("md5.txt",fileRows, fileName, curDate, false) + } + + + def exportInOk(){ + Vector files = CcbFtpTestUtils.listFileNames(null, curDate) + Iterator fileVec = files.iterator() + def fileRows = [] + while(fileVec.hasNext()){ + ChannelSftp.LsEntry file = fileVec.next() + + if(org.apache.commons.lang.StringUtils.isNotBlank(file.getFilename()) && file.getFilename().endsWith(".dat")){ + fileRows << file.getFilename() +" "+CcbFtpTestUtils.getFileLength(null, file.getFilename(), curDate) + } + } + def fileName = linux_prefix + "/${curDate}.ok" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "${curDate}.ok" + } + + FileUtils.createTxtFile(fileRows, fileName, "utf-8", false); + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println "okÎļþÉÏ´«FtpÍê³É......" + } + + + def createFileToFtp(tableName,allRows, fileName, curDate, isAppend){ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", isAppend); + println tableName+" Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println tableName+" ÉÏ´«FtpÍê³É......" + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlBaseEvaluation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlBaseEvaluation.groovy new file mode 100644 index 000000000..a7381d0bd --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlBaseEvaluation.groovy @@ -0,0 +1,622 @@ +package com.fangjia.script.ccbevaluation.pgsql + +import com.fangjia.script.ccbevaluation.CcbCommonUtils +import com.fangjia.script.ccbevaluation.CcbFtpTestUtils +import com.fangjia.script.ccbevaluation.CcbFtpUtils +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.gj.ccb.FileUtils +import com.fangjia.script.util.DateUtils +import groovy.sql.Sql + +class ExportPgsqlBaseEvaluation { + + def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse", + "postgres", "postgres", "org.postgresql.Driver") + def citys = null + def cityCodeMap = CcbCommonUtils.findCityCodeValue() + + def database = "base" + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; + def linux_prefix = "/home/goojia/ccb_data/evaluation/" + def win_prefix = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\evaluation\\${curDate}\\" + + static main(args) { + def task = new ExportPgsqlBaseEvaluation() + task.run(args) + } + + def run(args) { + citys = CcbCommonUtils.getRunningCitys(args) + citys = citys.reverse() + def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), 0, "yyyyMM")); + def lastMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); + def lastMonthStr = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -1, "yyyy-MM") + def new_dists = [] + + exportEvaluationRateData() + exportBigdataPoiData() + exportBigdataDistrictData() +// +// //µÚÈý·½ÍøÕ¾È¨Öرí + exportWebsiteRate(); + + exportGuidedPrice()//ËæÈ˹¤¸Ä±ä// + exportCommunityGuidedPrice(lastMonth.toString()+"28")//ËæÕþ²ß// + //´¦ÀíÐ¡ÇøÇé¿ö + exportCommunityStaging()//ûcityid + exportBigdataCommunity()// + + exportCommunityBuildType()// + + exportThirdPartyPrice2(lastMonth, new_dists)// + exportBigdataForsale(DateUtils.formatDateByPattern(new Date(), "yyyy-MM") +"-18", new_dists) //ÏÖÔÚ°´updatetimeµ¼³ö + exportBigdataDeal(lastMonthStr + "-01", new_dists) //2022-07-01 + } + + def exportEvaluationRateData() { + def sql = "select gujia_ceft_id,gujia_ceft_tp,gujia_bds_ceft,gujia_bds_seq, gujia_urbn,rmrk_dsc, to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm, gujia_src_co from "+database+".t0831_evaluate_rate_gj_h"; + def allRows = [] + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_ceft_id + data << r.gujia_ceft_tp + data << r.gujia_bds_ceft + data << r.gujia_bds_seq + data << r.gujia_urbn + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + + + def fileName = linux_prefix + "MODEL_000000_000000_EVALUATE_RATE_GJ_ALL_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = win_prefix + "MODEL_000000_000000_EVALUATE_RATE_GJ_ALL_${curDate}_0001.dat" + } + createFileToFtp("EVALUATE_RATE", allRows, fileName, curDate, false) + } + + def exportBigdataPoiData() { + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select urbn_id,gujia_admndiv_id,gujia_fsid,poi_nm,gujia_tp,gujia_tp_ecd,gujia_bds_ltt,gujia_bds_lgt,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+".t0831_bigdata_poi_gj_h where urbn_id='${cityCode}'"; + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.urbn_id + data << r.gujia_admndiv_id + data << r.gujia_fsid + data << r.poi_nm + data << r.gujia_tp + data << r.gujia_tp_ecd + data << r.gujia_bds_ltt + data << r.gujia_bds_lgt + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + } + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; + + def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_POI_GJ_ALL_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = win_prefix + "MODEL_000000_000000_BIGDATA_POI_GJ_ALL_${curDate}_0001.dat" + } + createFileToFtp("BIGDATA_POI_GJ", allRows, fileName, curDate, false) + } + + def exportBigdataDistrictData() { + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select gujia_admndiv_id,gujia_admndiv_nm,gujia_admndiv_nm_cpa,urbn_id,gujia_natstd_cd,gujia_dspl_seq,gujia_admndiv_cgy,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_lgc_admndiv_dsc,gujia_lgc_admndiv_cd,gujia_adiv_cd_val,gujia_bds_data_tm_val from "+database+".t0831_bigdata_district_gj_h where urbn_id='${cityCode}'"; + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_admndiv_id + data << r.gujia_admndiv_nm + data << r.gujia_admndiv_nm_cpa + data << r.urbn_id + data << r.gujia_natstd_cd + data << r.gujia_dspl_seq + data << r.gujia_admndiv_cgy + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + data << r.gujia_lgc_admndiv_dsc + data << r.gujia_lgc_admndiv_cd + data << r.gujia_adiv_cd_val + data << r.gujia_bds_data_tm_val + allRows << data + }); + } + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; + def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_DISTRICT_GJ_ALL_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = win_prefix + "MODEL_000000_000000_BIGDATA_DISTRICT_GJ_ALL_${curDate}_0001.dat" + } + createFileToFtp("BIGDATA_DISTRICT_GJ", allRows, fileName, curDate, false) + } + + def exportWebsiteRate(){ + def sql = "select gujiadatawebst_src_id,gujia_data_webst_src,gujiadatawebstmpng_id,gujia_bds_wgt,gujia_bds_tp,gujia_src_co,urbn_id,gujia_urbn,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm, to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from "+database+".t0831_website_config_gj_h"; + def allRows = [] + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujiadatawebst_src_id + data << r.gujia_data_webst_src + data << r.gujiadatawebstmpng_id + data << r.gujia_bds_wgt + data << r.gujia_bds_tp + data << r.gujia_src_co + data << r.urbn_id + data << r.gujia_urbn + data << r.data_crt_tm + data << r.data_udt_tm + allRows << data + }); + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; + def fileName = linux_prefix + "MODEL_000000_000000_WEBSITE_CONFIG_GJ_ALL_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = win_prefix + "MODEL_000000_000000_WEBSITE_CONFIG_GJ_ALL_${curDate}_0001.dat" + } + createFileToFtp("WEBSITE_CONFIG_GJ", allRows, fileName, curDate, false) + } + + + def exportGuidedPrice() { + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select gujia_fsid,gujia_bds_id,comm_nm,urbn_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,to_char(gujia_drc_dt,'yyyy-mm-dd') as gujia_drc_dt,gujia_bds_drc_prc,gujia_add_psn,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+".t0831_guided_price_gj_h where urbn_id='${cityCode}'"; + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_fsid + data << r.gujia_bds_id + data << r.comm_nm + data << r.urbn_id + data << r.urbn_nm + data << r.gujia_admndiv_id + data << r.gujia_admndiv_nm + data << r.gujia_drc_dt + data << r.gujia_bds_drc_prc + data << r.gujia_add_psn + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + } + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; + def fileName = linux_prefix + "MODEL_000000_000000_GUIDED_PRICE_GJ_ALL_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = win_prefix + "MODEL_000000_000000_GUIDED_PRICE_GJ_ALL_${curDate}_0001.dat" + } + createFileToFtp("GUIDED_PRICE_GJ", allRows, fileName, curDate, false) + } + + def exportCommunityGuidedPrice(def date) { + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select gujia_fsid,gujia_bds_id, comm_nm, urbn_id, urbn_nm, gujia_admndiv_id, gujia_admndiv_nm, gujia_bds_drc_prc, gujia_bds_drc_prc_src, rmrk_dsc, to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm, to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm, gujia_src_co from "+database+".t0831_community_guide_price_gj_h where urbn_id='${cityCode}' and data_crt_tm>=to_date('${date}','yyyyMMdd')"; + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_fsid + data << r.gujia_bds_id + data << r.comm_nm + data << r.urbn_id + data << r.urbn_nm + data << r.gujia_admndiv_id + data << r.gujia_admndiv_nm + data << r.gujia_bds_drc_prc + data << r.gujia_bds_drc_prc_src + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + } + + def fileName = linux_prefix + "MODEL_000000_000000_COMMUNITY_GUIDE_PRICE_GJ_ADD_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = win_prefix + "MODEL_000000_000000_COMMUNITY_GUIDE_PRICE_GJ_ADD_${curDate}_0001.dat" + } + createFileToFtp("COMMUNITY_GUIDE_PRICE_GJ", allRows, fileName, curDate, false) + } + + def exportBigdataCommunity(){ + + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select urbn_id,gujia_admndiv_id,gujia_comm_id,gujia_admndiv_nm,comm_nm,gujia_dtl_adr,gujia_bds_ltt,gujia_bds_lgt,gujiabdsocpoldtotarea,gujiabds_bld_tot_area,gujia_bds_grnrate,gujia_bds_vol_rate,gujia_bds_park_num,gujia_bds_bld_yr_rc,gujia_bds_hs_use_val,totunits,gujia_bds_data_tm_val,gujiabds_udt_flag_val,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_comm_tp_val,gujia_comm_fmnm,gujia_str,gujia_hsno,gujiawthr_new_pan_ind,gujia_comm_intd,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,gujia_src_co,gujia_vlgtwn_str_mng,gujia_lgc_admndiv_cd,gujia_lgc_adiv,gujia_bds_bds_st from "+database+".t0831_bigdata_community_gj_h where urbn_id='${cityCode}' ";//where cityId in (350200,150100) + pgsqlInstance.eachRow(sql,{r-> + def data = [] + data << r.urbn_id + data << r.gujia_admndiv_id + data << r.gujia_comm_id + data << r.gujia_admndiv_nm + data << r.comm_nm + data << r.gujia_dtl_adr + data << r.gujia_bds_ltt + data << r.gujia_bds_lgt + data << r.gujiabdsocpoldtotarea + data << r.gujiabds_bld_tot_area + data << r.gujia_bds_grnrate + data << r.gujia_bds_vol_rate + data << r.gujia_bds_park_num + data << r.gujia_bds_bld_yr_rc + data << r.gujia_bds_hs_use_val + data << r.totunits + data << r.gujia_bds_data_tm_val + data << r.gujiabds_udt_flag_val + data << r.data_udt_tm + data << r.gujia_comm_tp_val + data << r.gujia_comm_fmnm + data << r.gujia_str + data << r.gujia_hsno + data << r.gujiawthr_new_pan_ind + data << r.gujia_comm_intd + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.gujia_src_co + data << r.gujia_vlgtwn_str_mng + data << r.gujia_lgc_admndiv_cd + data << r.gujia_lgc_adiv + data << r.gujia_bds_bds_st + allRows << data + }); + } + def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_COMMUNITY_GJ_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "MODEL_000000_000000_BIGDATA_COMMUNITY_GJ_ALL_${curDate}_0001.dat" + } + createFileToFtp("BIGDATA_COMMUNITY_GJ", allRows, fileName, curDate, false) + } + + def exportCommunityStaging() { + + def allRows = [] + def sql = "select gujia_instm_id,gujia_comm_id,gujiacomm_prim_prd_id,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+".t0831_community_staging_gj_h"; + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_instm_id + data << r.gujia_comm_id + data << r.gujiacomm_prim_prd_id + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + def fileName = linux_prefix + "MODEL_000000_000000_COMMUNITY_STAGING_GJ_ALL_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = win_prefix + "MODEL_000000_000000_COMMUNITY_STAGING_GJ_ALL_${curDate}_0001.dat" + } + createFileToFtp("COMMUNITY_STAGING_GJ", allRows, fileName, curDate, false) + } + + def exportCommunityBuildType() { + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select urbn_id,gujia_comm_id,gujia_bld_tp_val,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_bds_data_tm_val from "+database+".t0831_bigdata_commbuildtype_gj_h where urbn_id='${cityCode}'"; + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.urbn_id + data << r.gujia_comm_id + data << r.gujia_bld_tp_val + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + data << r.gujia_bds_data_tm_val + allRows << data + }); + } + def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_COMMBUILDTYPE_GJ_ALL_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = win_prefix + "MODEL_000000_000000_BIGDATA_COMMBUILDTYPE_GJ_ALL_${curDate}_0001.dat" + } + createFileToFtp("BIGDATA_COMMBUILDTYPE_GJ", allRows, fileName, curDate, false) + } + + def exportThirdPartyPrice2(price_date, new_dists) { + + def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = win_prefix + "MODEL_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" + } + def index = 0 + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def allRows = [] + if(new_dists) { + def newstr = "('"+new_dists.join("','")+"')" + def sql1 = "select gujia_trdpt_avprc_id,urbn_id,gujia_admndiv_id,gujia_bds_id,comm_nm,gujia_dtsr_id,gujia_dtsr_dsc,gujiabds_avprc_dt_val,gujia_bds_comm_avprc,gujiabdscomm_hgst_prc,gujiabdscomm_lwst_prc,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from "+database+".t0831_bigdata_third_party_price_gj_h where " + + "urbn_id='${cityCode}' and gujiabds_avprc_dt_val=${price_date} and gujia_admndiv_id not in ${newstr} "; + def rets1 = getThirdPartyDatas(sql1) + allRows.addAll(rets1) + + def sql2 = "select gujia_trdpt_avprc_id,urbn_id,gujia_admndiv_id,gujia_bds_id,comm_nm,gujia_dtsr_id,gujia_dtsr_dsc,gujiabds_avprc_dt_val,gujia_bds_comm_avprc,gujiabdscomm_hgst_prc,gujiabdscomm_lwst_prc,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from "+database+".t0831_bigdata_third_party_price_gj_h where " + + "urbn_id='${cityCode}' and gujia_admndiv_id in ${newstr} "; + def rets2 = getThirdPartyDatas(sql2) + allRows.addAll(rets2) + }else{ + def sql = "select gujia_trdpt_avprc_id,urbn_id,gujia_admndiv_id,gujia_bds_id,comm_nm,gujia_dtsr_id,gujia_dtsr_dsc,gujiabds_avprc_dt_val,gujia_bds_comm_avprc,gujiabdscomm_hgst_prc,gujiabdscomm_lwst_prc,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from "+database+".t0831_bigdata_third_party_price_gj_h where urbn_id='${cityCode}' and gujiabds_avprc_dt_val='${price_date}' "; + allRows = getThirdPartyDatas(sql) + } + if(allRows && allRows.size()>0){ + index = index + 1 + if(index==1){ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + }else{ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true); + } + } + } + + println "BIGDATA_THIRD_PARTY_PRICE_GJ Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + } + + def getThirdPartyDatas(def sql){ + def allRows = [] + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_trdpt_avprc_id + data << r.urbn_id + data << r.gujia_admndiv_id + data << r.gujia_bds_id + data << r.comm_nm + data << r.gujia_dtsr_id + data << r.gujia_dtsr_dsc + data << r.gujiabds_avprc_dt_val + data << r.gujia_bds_comm_avprc + data << r.gujiabdscomm_hgst_prc + data << r.gujiabdscomm_lwst_prc + data << r.data_udt_tm + allRows << data + }) + return allRows; + } + + + def exportBigdataDeal(def dealDate, def new_dists) { + + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + if(new_dists){ + def newstr = "('"+new_dists.join("','")+"')" + def sql1 = "select urbn_id,gujia_bds_mdl_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_str,gujia_hsno,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_bds_wbt_floor,gujia_lyr_tp_val,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_bds_trdtckt_prc,gujia_bds_mdl_tot_prc,gujia_bds_dcl_tot_prc,gujiabds_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_bds_mdl_cyc,gujiawthrext_lift_ind,gujiabdslndfgrngvarea,gujiabdslutbl_gv_area,gujiabdssuntblgv_area,gujiabdsbayindowgarea,gujiabdstowerfrgvarea,gujia_bds_grg_gv_area,gujiabdsundgdrmgvarea,gujiabds_othr_gv_area,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_bds_mkdam,gujia_bds_data_tm_val " + + "from "+database+".t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and txn_dt>=to_date('${dealDate}','yyyy-MM-dd') and gujia_admndiv_id not in ${newstr}" + def rets1 = dealData(sql1) + + def sql2 = "select urbn_id,gujia_bds_mdl_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_str,gujia_hsno,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_bds_wbt_floor,gujia_lyr_tp_val,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_bds_trdtckt_prc,gujia_bds_mdl_tot_prc,gujia_bds_dcl_tot_prc,gujiabds_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_bds_mdl_cyc,gujiawthrext_lift_ind,gujiabdslndfgrngvarea,gujiabdslutbl_gv_area,gujiabdssuntblgv_area,gujiabdsbayindowgarea,gujiabdstowerfrgvarea,gujia_bds_grg_gv_area,gujiabdsundgdrmgvarea,gujiabds_othr_gv_area,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_bds_mkdam,gujia_bds_data_tm_val " + + "from "+database+".t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and gujia_admndiv_id in ${newstr}" + def rets2 = dealData(sql2) + allRows.addAll(rets1) + allRows.addAll(rets2) + }else{ + def sql = "select urbn_id,gujia_bds_mdl_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_str,gujia_hsno,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_bds_wbt_floor,gujia_lyr_tp_val,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_bds_trdtckt_prc,gujia_bds_mdl_tot_prc,gujia_bds_dcl_tot_prc,gujiabds_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_bds_mdl_cyc,gujiawthrext_lift_ind,gujiabdslndfgrngvarea,gujiabdslutbl_gv_area,gujiabdssuntblgv_area,gujiabdsbayindowgarea,gujiabdstowerfrgvarea,gujia_bds_grg_gv_area,gujiabdsundgdrmgvarea,gujiabds_othr_gv_area,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_bds_mkdam,gujia_bds_data_tm_val " + + "from "+database+".t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and txn_dt>=to_date('${dealDate}','yyyy-MM-dd')"; + allRows.addAll(dealData(sql)) + } + } + + def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = win_prefix + "MODEL_000000_000000_BIGDATA_DEAL_GJ_ADD_${curDate}_0001.dat" + } + createFileToFtp("BIGDATA_DEAL_GJ", allRows, fileName, curDate, false) + } + + + def dealData(def sql){ + def allRows = [] + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.urbn_id + data << r.gujia_bds_mdl_id + data << r.urbn_nm + data << r.gujia_admndiv_id + data << r.gujia_admndiv_nm + data << r.gujia_str + data << r.gujia_hsno + data << r.gujia_comm_id + data << r.comm_nm + data << r.gujia_bld_id + data << r.bld_id + data << r.gujia_bld_nm + data << r.gujia_unit_id + data << r.unit_id + data << r.gujia_unit_nm + data << r.gujia_acc_id + data << r.gujia_dtl_adr + data << r.gujia_bds_bld_yr_rc + data << r.gujia_own_val + data << r.gujia_own_yrlmt_val + data << r.gujia_prd_val + data << r.gujia_bds_wbt_floor + data << r.gujia_lyr_tp_val + data << r.gujiabdstot_floor_num + data << r.gujia_bld_tp_val + data << r.gujia_bld_stc + data << r.guiabconstructionarea + data << r.gujiabdsset_innr_area + data << r.gujia_acc_tp_val + data << r.gujia_bds_room_num + data << r.gujia_bds_dept_num + data << r.gujia_bds_ktch_num + data << r.gujia_bds_hlt_btw_num + data << r.gujia_hs_use + data << r.gujia_indr_stc_val + data << r.gujia_twrd_val + data << r.gujia_dcrt_sttn + data << r.gujia_ases_bt_ln_num + data << r.gujia_bds_trdtckt_prc + data << r.gujia_bds_mdl_tot_prc + data << r.gujia_bds_dcl_tot_prc + data << r.gujiabds_ases_tot_prc + data << r.gujiasigntonlinectrid + data << r.txn_dt + data << r.gujia_txn_tp_val + data << r.gujia_sell_pymtmod + data << r.gujia_bds_mdl_cyc + data << r.gujiawthrext_lift_ind + data << r.gujiabdslndfgrngvarea + data << r.gujiabdslutbl_gv_area + data << r.gujiabdssuntblgv_area + data << r.gujiabdsbayindowgarea + data << r.gujiabdstowerfrgvarea + data << r.gujia_bds_grg_gv_area + data << r.gujiabdsundgdrmgvarea + data << r.gujiabds_othr_gv_area + data << r.gujia_hs_src_dtsrc + data << r.intr_co_id + data << r.intr_co_nm + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + data << r.gujia_bds_mkdam + data << r.gujia_bds_data_tm_val + allRows << data + }); + return allRows + } + + + def exportBigdataForsale(publishDate, new_dists){ + def fileName = linux_prefix + "MODEL_000000_000000_BIGDATA_FORSALE_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "MODEL_000000_000000_BIGDATA_FORSALE_GJ_ADD_${curDate}_0001.dat" + } + def index = 0 + for(def city : citys){ + def cityCode = cityCodeMap.get(city) + + def allRows = [] + if(new_dists){ + def newstr = "('"+new_dists.join("','")+"')" + def sql1 = "select urbn_id,gujia_sell_id,gujia_listg_hs_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_bds_unitprc,gujia_bds_tot_prc,gujia_sell_pymtmod,gujia_bds_wbt_floor,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_indr_stc_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_twrd_val,gujia_dcrt_sttn,gujiawthrext_lift_ind,gujiajiladderjiactval,to_char(anc_tm,'yyyy-mm-dd') as anc_tm,to_char(exdat,'yyyy-mm-dd') as exdat,gujia_wthr_strt,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,gujia_anc_psn,gujia_anc_psn_tel,gujia_dsc_inf_cntnt,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_apd_inf " + + "from "+database+".t0831_bigdata_forsale_gj_h where urbn_id='${cityCode}' and data_udt_tm>=to_date('${publishDate}','yyyy-MM-dd') and gujia_admndiv_id not in ${newstr}"; + def rets1 = getHouseDatas(sql1) + allRows.addAll(rets1) + }else{ + def sql = "select urbn_id,gujia_sell_id,gujia_listg_hs_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_bds_unitprc,gujia_bds_tot_prc,gujia_sell_pymtmod,gujia_bds_wbt_floor,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_indr_stc_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_twrd_val,gujia_dcrt_sttn,gujiawthrext_lift_ind,gujiajiladderjiactval,to_char(anc_tm,'yyyy-mm-dd') as anc_tm,to_char(exdat,'yyyy-mm-dd') as exdat,gujia_wthr_strt,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,gujia_anc_psn,gujia_anc_psn_tel,gujia_dsc_inf_cntnt,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_apd_inf " + + "from "+database+".t0831_bigdata_forsale_gj_h where urbn_id='${cityCode}' and data_udt_tm>=to_date('${publishDate}','yyyy-MM-dd')"; + allRows = getHouseDatas(sql) + } + println city +" "+allRows.size() + if(allRows.size()>0){ + index = index + 1 + if(index == 1){ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + }else{ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true); + } + + } + } + + if(new_dists){//²¹³ä±»ÐÞÇøÓòµÄÊý¾Ý + def newstr = "('"+new_dists.join("','")+"')" + def sql2 = "select urbn_id,gujia_sell_id,gujia_listg_hs_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_bds_unitprc,gujia_bds_tot_prc,gujia_sell_pymtmod,gujia_bds_wbt_floor,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_indr_stc_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_twrd_val,gujia_dcrt_sttn,gujiawthrext_lift_ind,gujiajiladderjiactval,to_char(anc_tm,'yyyy-mm-dd') as anc_tm,to_char(exdat,'yyyy-mm-dd') as exdat,gujia_wthr_strt,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,gujia_anc_psn,gujia_anc_psn_tel,gujia_dsc_inf_cntnt,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_apd_inf " + + "from "+database+".t0831_bigdata_forsale_gj_h where gujia_admndiv_id in ${newstr}" + def rets2 = getHouseDatas(sql2) + if(rets2.size()>0){ + FileUtils.batchCreateFile(rets2, fileName, [], "utf-8", true); + } + } + println "BIGDATA_FORSALE_GJ Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println "BIGDATA_FORSALE_GJ ÉÏ´«FtpÍê³É......" + } + + def getHouseDatas(sql){ + def allRows = [] + def index = 0 + pgsqlInstance.eachRow(sql,{r-> + index = index+1 + def data = [] + data << r.urbn_id + data << r.gujia_sell_id + data << r.gujia_listg_hs_id + data << r.urbn_nm + data << r.gujia_admndiv_id + data << r.gujia_admndiv_nm + data << r.gujia_comm_id + data << r.comm_nm + data << r.gujia_bld_id + data << r.bld_id + data << r.gujia_bld_nm + data << r.gujia_unit_id + data << r.unit_id + data << r.gujia_unit_nm + data << r.gujia_acc_id + data << r.gujia_dtl_adr + data << r.gujia_bds_bld_yr_rc + data << r.gujia_own_val + data << r.gujia_own_yrlmt_val + data << r.gujia_bds_unitprc + data << r.gujia_bds_tot_prc + data << r.gujia_sell_pymtmod + data << r.gujia_bds_wbt_floor + data << r.gujiabdstot_floor_num + data << r.gujia_bld_tp_val + data << r.gujia_indr_stc_val + data << r.gujia_bld_stc + data << r.guiabconstructionarea + data << r.gujiabdsset_innr_area + data << r.gujia_acc_tp_val + data << r.gujia_bds_room_num + data << r.gujia_bds_dept_num + data << r.gujia_bds_ktch_num + data << r.gujia_bds_hlt_btw_num + data << r.gujia_twrd_val + data << r.gujia_dcrt_sttn + data << r.gujiawthrext_lift_ind + data << r.gujiajiladderjiactval + data << r.anc_tm + data << r.exdat + data << r.gujia_wthr_strt + data << r.gujia_hs_src_dtsrc + data << r.intr_co_id + data << r.intr_co_nm + data << r.gujia_anc_psn + data << r.gujia_anc_psn_tel + data << r.gujia_dsc_inf_cntnt + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + data << r.gujia_apd_inf + allRows << data +// if(allRows.size()%200000==0){ +// FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true); +// allRows.clear() +// } + }); + return allRows + } + + + def createFileToFtp(tableName,allRows, fileName, curDate, isAppend){ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", isAppend); + println tableName+" Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println tableName+" ÉÏ´«FtpÍê³É......" + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlEvaluationResult.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlEvaluationResult.groovy new file mode 100644 index 000000000..6686d596f --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlEvaluationResult.groovy @@ -0,0 +1,444 @@ +package com.fangjia.script.ccbevaluation.pgsql + +import com.fangjia.script.ccbevaluation.CcbCommonUtils +import com.fangjia.script.ccbevaluation.CcbFtpTestUtils +import com.fangjia.script.ccbevaluation.CcbFtpUtils +import com.fangjia.script.ccbevaluation.ronghe.SSHHelper +import com.fangjia.script.ccbevaluation.ronghe.SSHHelperTest +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.gj.ccb.FileUtils +import com.fangjia.script.util.DateUtils +import com.jcraft.jsch.ChannelSftp +import groovy.sql.Sql +import org.apache.commons.codec.digest.DigestUtils + +class ExportPgsqlEvaluationResult { + + def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse", + "postgres", "postgres", "org.postgresql.Driver") + def citys = null + def cityCodeMap = CcbCommonUtils.findCityCodeValue() + + def database = "t_app_p9pha_plda." + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; + def linux_prefix = "/home/goojia/ccb_data/evaluation/" + def win_prefix = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\evaluation\\${curDate}\\" + + static main(args) { + def task = new ExportPgsqlEvaluationResult() + task.run(args) + } + + def run(args) { + citys = CcbCommonUtils.getRunningCitys(args) + def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), 0, "yyyyMM")); + + //¼ÆËã½á¹ûÏà¹Ø + exportAvmEvaluationGJNB(curMonth) + exportAVMEvaluationItemGJNB(curMonth) + + exportCityPrice(curMonth) + exportRegionPrice(curMonth) + + exportCommunityBasePrice(curMonth) +// exportCommunityBasePrice1(curMonth) + + exportCommunityPdescribeGj(curMonth) + exportCommCaseDetailGj(curMonth) +// + exportInOk() +// + SSHHelperTest jschCommand = new SSHHelperTest(); + System.out.println(jschCommand.executeCommand("sh /home/ccb_evaluation/output/eval_package.sh ${curDate}")); + + } + + def exportAvmEvaluationGJNB(yearMonth){ + + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select gujia_fsid,urbn_id,urbn_nm,gujia_bds_yrmo,gujia_bds_comm_num,gujiabdsvalmnycommnum,gujia_prc_cvr_rate,gujiabdsmnldpccommnum,gujia_mnl_drc_prc_pct,gujiabdssamp_comm_num,gujiaext_samp_clc_pct,gujiabdsnervetncomnum,gujianervethrunclcpct,gujiabds_tst_case_num,gujiabds_tst_comm_num,gujiatst_comm_num_pct,gujia_ppe15_cvr_rate,gujia_rto_mdn,gujia_rto_lv_san_ceft,gujiabdsmdltstcasenum,gujiabdsmdltstcommnum,gujiamdltstcommnumpct,gujiamdltst_ppe15_pct,gujiamdlrtolvsan_ceft,gujia_mdl_md_bit_rto,gujiabdstrdpttcasenum,gujiabdstrdpttcommnum,gujiatrdpttcommnumpct,gujiatrdpttstppe15pct,gujiatrdptrolvsanceft,gujiatrdpt_md_bit_rto,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+"avm_evaluation_gj_h where gujia_bds_yrmo = ${yearMonth} and urbn_id='${cityCode}'"; + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_fsid + data << r.urbn_id + data << r.urbn_nm + data << r.gujia_bds_yrmo + data << r.gujia_bds_comm_num + data << r.gujiabdsvalmnycommnum + data << r.gujia_prc_cvr_rate + data << r.gujiabdsmnldpccommnum + data << r.gujia_mnl_drc_prc_pct + data << r.gujiabdssamp_comm_num + data << r.gujiaext_samp_clc_pct + data << r.gujiabdsnervetncomnum + data << r.gujianervethrunclcpct + data << r.gujiabds_tst_case_num + data << r.gujiabds_tst_comm_num + data << r.gujiatst_comm_num_pct + data << r.gujia_ppe15_cvr_rate + data << r.gujia_rto_mdn + data << r.gujia_rto_lv_san_ceft + data << r.gujiabdsmdltstcasenum + data << r.gujiabdsmdltstcommnum + data << r.gujiamdltstcommnumpct + data << r.gujiamdltst_ppe15_pct + data << r.gujiamdlrtolvsan_ceft + data << r.gujia_mdl_md_bit_rto + data << r.gujiabdstrdpttcasenum + data << r.gujiabdstrdpttcommnum + data << r.gujiatrdpttcommnumpct + data << r.gujiatrdpttstppe15pct + data << r.gujiatrdptrolvsanceft + data << r.gujiatrdpt_md_bit_rto + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + } + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28"; + def fileName = linux_prefix + "MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat" + def fileName1 = linux_prefix + "MODEL_000000_000000_AVM_EVALUATION_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "MODEL_000000_000000_AVM_EVALUATION_GJNB_ADD_${curDate}_0001.dat" + fileName1 = win_prefix + "MODEL_000000_000000_AVM_EVALUATION_GJ_ADD_${curDate}_0001.dat" + } + createFileToFtp("AVM_EVALUATION_GJNB", allRows, fileName, curDate, false) + createFileToFtp("AVM_EVALUATION_GJ", allRows, fileName1, curDate, false) + } + + def exportAVMEvaluationItemGJNB(yearMonth){ + + def allRows = [] + + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select gujia_fsid,urbn_id,urbn_nm,gujia_rgon_id,gujia_rgon_nm,gujia_comm_id,gujia_comm_nm,gujiabds_clc_yrmo_val,gujia_bds_clc_avprc,gujia_bds_avprc,gujia_bds_clc_tp,gujia_bds_rlb,gujiabds_to_mkprc_mny,to_char(mdl_dt,'yyyy-mm-dd') as mdl_dt,gujiabds_valt_unitprc,gujia_area,gujia_dcrt_val,gujia_twrd_val,gujia_bds_floor_num,gujiabdstot_floor_num,gujia_data_tp,gujia_rto,gujia_mns_rto,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') AS data_crt_tm from "+database+"avm_evaluation_item_gj_h where gujiabds_clc_yrmo_val = ${yearMonth} AND urbn_id='${cityCode}'"; + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_fsid + data << r.urbn_id + data << r.urbn_nm + data << r.gujia_rgon_id + data << r.gujia_rgon_nm + data << r.gujia_comm_id + data << r.gujia_comm_nm + data << r.gujiabds_clc_yrmo_val + data << r.gujia_bds_clc_avprc + data << r.gujia_bds_avprc + data << r.gujia_bds_clc_tp + data << r.gujia_bds_rlb + data << r.gujiabds_to_mkprc_mny + data << r.mdl_dt + data << r.gujiabds_valt_unitprc + data << r.gujia_area + data << r.gujia_dcrt_val + data << r.gujia_twrd_val + data << r.gujia_bds_floor_num + data << r.gujiabdstot_floor_num + data << r.gujia_data_tp + data << r.gujia_rto + data << r.gujia_mns_rto + data << r.data_crt_tm + allRows << data + }); + } + + def fileName = linux_prefix + "MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat" + def fileName1 = linux_prefix + "MODEL_000000_000000_AVM_EVALUATION_ITEM_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "MODEL_000000_000000_AVM_EVALUATION_ITEM_GJNB_ADD_${curDate}_0001.dat" + fileName1 = win_prefix + "MODEL_000000_000000_AVM_EVALUATION_ITEM_GJ_ADD_${curDate}_0001.dat" + } + + createFileToFtp("AVM_EVALUATION_ITEM_GJNB",allRows, fileName, curDate, false) + createFileToFtp("AVM_EVALUATION_ITEM_GJ",allRows, fileName1, curDate, false) + } + + def exportCityPrice(month){ + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select gujia_trdpt_avprc_id,urbn_id,urbn_nm,gujiabds_clc_yrmo_val,gujia_bds_clc_avprc,gujia_bds_urbn_avprc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+"avm_city_price_gj_h where gujiabds_clc_yrmo_val=${month} AND urbn_id='${cityCode}'";// + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_trdpt_avprc_id + data << r.urbn_id + data << r.urbn_nm + data << r.gujiabds_clc_yrmo_val + data << r.gujia_bds_clc_avprc + data << r.gujia_bds_urbn_avprc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + } + + def fileName = linux_prefix + "MODEL_000000_000000_CITY_PRICE_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "MODEL_000000_000000_CITY_PRICE_GJ_ADD_${curDate}_0001.dat" + } + createFileToFtp("CITY_PRICE_GJ",allRows, fileName, curDate, false) + } + + def exportRegionPrice(month){ + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select gujia_trdpt_avprc_id,urbn_id,urbn_nm,gujia_admndiv_id,gxda_admndiv_nm,gujiabds_clc_yrmo_val,gujia_bds_clc_avprc,gujia_bds_urbn_avprc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+"avm_district_price_gj_h where gujiabds_clc_yrmo_val=${month} AND urbn_id='${cityCode}'"; // + + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_trdpt_avprc_id + data << r.urbn_id + data << r.urbn_nm + data << r.gujia_admndiv_id + data << r.gxda_admndiv_nm + data << r.gujiabds_clc_yrmo_val + data << r.gujia_bds_clc_avprc + data << r.gujia_bds_urbn_avprc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + } + def fileName = linux_prefix + "MODEL_000000_000000_DISTRICT_PRICE_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "MODEL_000000_000000_DISTRICT_PRICE_GJ_ADD_${curDate}_0001.dat" + } + + createFileToFtp("DISTRICT_PRICE_GJ",allRows, fileName, curDate, false) + } + + def exportCommunityBasePrice(yearMonth){ + + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select gujia_bss_prc_id,urbn_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_bds_id,comm_nm,gujiabds_clc_yrmo_val,gujia_bds_clc_avprc,gujia_comm_basic_prc,gujia_bds_clmtd,gujiabds_fwd_samp_rto,gujia_bds_mns_grd,gujia_bds_cfdrg,gujiabdsarndcmprccrlt,gujia_bds_cfdc_dgr,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+"avm_community_base_price_gj_h where gujiabds_clc_yrmo_val=${yearMonth} AND urbn_id='${cityCode}'";// + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_bss_prc_id + data << r.urbn_id + data << r.urbn_nm + data << r.gujia_admndiv_id + data << r.gujia_admndiv_nm + data << r.gujia_bds_id + data << r.comm_nm + data << r.gujiabds_clc_yrmo_val + data << r.gujia_bds_clc_avprc + data << r.gujia_comm_basic_prc + data << r.gujia_bds_clmtd + data << r.gujiabds_fwd_samp_rto + data << r.gujia_bds_mns_grd + data << r.gujia_bds_cfdrg + data << r.gujiabdsarndcmprccrlt + data << r.gujia_bds_cfdc_dgr + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + + }); + } + + def fileName = linux_prefix + "MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" + def fileName1 = linux_prefix + "MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" + fileName1 = win_prefix + "MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" + } + createFileToFtp("COMMUNITY_BASE_PRICE_GJNB",allRows, fileName, curDate, false) + createFileToFtp("COMMUNITY_BASE_PRICE_GJ",allRows, fileName1, curDate, false) + } + + + def exportCommunityBasePrice1(yearMonth){ + + def fileName1 = linux_prefix + "MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName1 = win_prefix + "MODEL_000000_000000_COMMUNITY_BASE_PRICE_GJ_ADD_${curDate}_0001.dat" + } + + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select gujia_bss_prc_id,urbn_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_bds_id,comm_nm,gujiabds_clc_yrmo_val,gujia_bds_clc_avprc,gujia_comm_basic_prc,gujia_bds_clmtd,gujiabds_fwd_samp_rto,gujia_bds_mns_grd,gujia_bds_cfdrg,gujiabdsarndcmprccrlt,gujia_bds_cfdc_dgr,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+"avm_community_base_price_gj_h where urbn_id='${cityCode}'";//gujiabds_clc_yrmo_val=${yearMonth} AND + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_bss_prc_id + data << r.urbn_id + data << r.urbn_nm + data << r.gujia_admndiv_id + data << r.gujia_admndiv_nm + data << r.gujia_bds_id + data << r.comm_nm + data << r.gujiabds_clc_yrmo_val + data << r.gujia_bds_clc_avprc + data << r.gujia_comm_basic_prc + data << r.gujia_bds_clmtd + data << r.gujiabds_fwd_samp_rto + data << r.gujia_bds_mns_grd + data << r.gujia_bds_cfdrg + data << r.gujiabdsarndcmprccrlt + data << r.gujia_bds_cfdc_dgr + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + + if(allRows.size()%200000==0){ + FileUtils.batchCreateFile(allRows, fileName1, [], "utf-8", true); + allRows.clear() + } + }); + } + + if(allRows.size()>0){ + FileUtils.batchCreateFile(allRows, fileName1, [], "utf-8", true); + } + } + + def exportCommunityPdescribeGj(month){ + + def fileName = linux_prefix + "MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "MODEL_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" + } + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select gujia_fsid,gujia_comm_id,urbn_id,urbn_nm,admndiv_ecd,gujia_admndiv_nm,comm_nm,gujia_als_dsc,gujia_bds_bss_prc,gujiabds_cfdc_dgr_grd,gujiabdsrt3mlgcasenum,gujiabdslistgclwstprc,gujiabdslistgcaemdval,gujiabdslistgcase_avg,gujiabdslistgcemaxprc,gujia_bds_mo_val,gujiabdsavgwminvalavg,gujiabdsavgwmaxvalavg,gujia_bds_rel_err_val,gujia_dvtdgr_dsc,gujia_als_prc_rng,gujiaprcminandmax_rng,gujia_dsc,gujiabds_lmth_bss_prc,gujiabds_wthr_mnl_val,gujiabds_lmth_fnl_prc,to_char(data_crt_tm,'yyyy-mm-dd') as data_crt_tm,gujiabdsnervetuntwprc,gujia_prc_src,gujiabdsabtjlcmbitval,gujiabdsabtjlgcaseavg,gujia_indx_lbl,gujia_prim_pty_tp,gujia_comm_tp_val,gujiabds_ltst_mdl_prc,to_char(gujia_ltst_mdl_dt,'yyyy-mm-dd') as gujia_ltst_mdl_dt,gujiabdsidxnmo_moonmo,gujiabdsa1yiminmmonmo,gujiabdsidxnyr_moonmo,gujiabdsat1yspdgrscor,gujiabdsarnd1kscavprc from "+database+"avm_community_p_describe_gj_h where gujia_bds_mo_val=${month} AND urbn_id='${cityCode}'"; + + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_fsid + data << r.gujia_comm_id + data << r.urbn_id + data << r.urbn_nm + data << r.admndiv_ecd + data << r.gujia_admndiv_nm + data << r.comm_nm + data << r.gujia_als_dsc + data << r.gujia_bds_bss_prc + data << r.gujiabds_cfdc_dgr_grd + data << r.gujiabdsrt3mlgcasenum + data << r.gujiabdslistgclwstprc + data << r.gujiabdslistgcaemdval + data << r.gujiabdslistgcase_avg + data << r.gujiabdslistgcemaxprc + data << r.gujia_bds_mo_val + data << r.gujiabdsavgwminvalavg + data << r.gujiabdsavgwmaxvalavg + data << r.gujia_bds_rel_err_val + data << r.gujia_dvtdgr_dsc + data << r.gujia_als_prc_rng + data << r.gujiaprcminandmax_rng + data << r.gujia_dsc + data << r.gujiabds_lmth_bss_prc + data << r.gujiabds_wthr_mnl_val + data << r.gujiabds_lmth_fnl_prc + data << r.data_crt_tm + data << r.gujiabdsnervetuntwprc + data << r.gujia_prc_src + data << r.gujiabdsabtjlcmbitval + data << r.gujiabdsabtjlgcaseavg + data << r.gujia_indx_lbl + data << r.gujia_prim_pty_tp + data << r.gujia_comm_tp_val + data << r.gujiabds_ltst_mdl_prc + data << r.gujia_ltst_mdl_dt + data << r.gujiabdsidxnmo_moonmo + data << r.gujiabdsa1yiminmmonmo + data << r.gujiabdsidxnyr_moonmo + data << r.gujiabdsat1yspdgrscor + data << r.gujiabdsarnd1kscavprc + allRows << data + }); + } + createFileToFtp("community_p_describe_gj",allRows, fileName, curDate, false) + } + + def exportCommCaseDetailGj(month){ + def fileName = linux_prefix + "MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "MODEL_000000_000000_COMM_CASE_DETAIL_GJ_ADD_${curDate}_0001.dat" + } +// for(def city : citys){ +// def cityCode = cityCodeMap.get(city) +// def sql = "select gujia_fsid, urbn_id, gujia_comm_id, gujia_case_id,gujia_bds_crterm,to_char(data_crt_tm,'yyyy-mm-dd') as data_crt_tm from "+database+"avm_comm_case_detail_gj_h where urbn_id='${cityCode}' and gujia_bds_crterm=${month}"; +// def allRows = [] +// pgsqlInstance.eachRow(sql,{r-> +// def data = [] +// data << r.gujia_fsid +// data << r.urbn_id +// data << r.gujia_comm_id +// data << r.gujia_case_id +// data << r.gujia_bds_crterm +// data << r.data_crt_tm +// allRows << data +//// if(allRows.size()%200000==0){ +//// FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true); +//// allRows.clear() +//// } +// }); +// +// FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); +// } + FileUtils.batchCreateFile([], fileName, [], "utf-8", false); + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + } + + def exportMd5(){ + Vector files = CcbFtpUtils.listFileNames(curDate) + Iterator fileVec = files.iterator() + def fileRows = [] + while(fileVec.hasNext()){ + ChannelSftp.LsEntry file = fileVec.next() + if(org.apache.commons.lang.StringUtils.isNotBlank(file.getFilename()) && file.getFilename().endsWith(".dat")){ + fileRows << file.getFilename() +":"+ DigestUtils.md5Hex(file.getFilename()) + } + } + def fileName = linux_prefix + "md5.txt" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "md5.txt" + } + createFileToFtp("md5.txt",fileRows, fileName, curDate, false) + } + + + def exportInOk(){ + Vector files = CcbFtpTestUtils.listFileNames(null, curDate) + Iterator fileVec = files.iterator() + def fileRows = [] + while(fileVec.hasNext()){ + ChannelSftp.LsEntry file = fileVec.next() + + if(org.apache.commons.lang.StringUtils.isNotBlank(file.getFilename()) && file.getFilename().endsWith(".dat")){ + fileRows << file.getFilename() +" "+CcbFtpTestUtils.getFileLength(null, file.getFilename(), curDate) + } + } + def fileName = linux_prefix + "/${curDate}.ok" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "${curDate}.ok" + } + + FileUtils.createTxtFile(fileRows, fileName, "utf-8", false); + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println "okÎļþÉÏ´«FtpÍê³É......" + } + + + def createFileToFtp(tableName,allRows, fileName, curDate, isAppend){ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", isAppend); + println tableName+" Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload(null, fileName, curDate) + println tableName+" ÉÏ´«FtpÍê³É......" + } + +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlRonghe.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlRonghe.groovy new file mode 100644 index 000000000..5a4068b7c --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/pgsql/ExportPgsqlRonghe.groovy @@ -0,0 +1,618 @@ +package com.fangjia.script.ccbevaluation.pgsql + +import com.fangjia.script.ccbevaluation.CcbCommonUtils +import com.fangjia.script.ccbevaluation.CcbFtpTestUtils +import com.fangjia.script.ccbevaluation.CcbFtpUtils +import com.fangjia.script.ccbevaluation.ronghe.SSHHelperTest +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.gj.ccb.FileUtils +import com.fangjia.script.util.DateUtils +import com.jcraft.jsch.ChannelSftp +import groovy.sql.Sql + +class ExportPgsqlRonghe { + + def sqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/postgres", + "postgres", "postgres", "org.postgresql.Driver") + + def citys = [] + + def database = "base." + def cityCodeMap = CcbCommonUtils.findCityCodeValue() + + def curDate = DateUtils.formatDateByPattern(new Date()+1, "yyyyMMdd") + def linux_prefix = "/ccb_ronghe/${curDate}/" + def win_prefix = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\" + + static main(args) { + def task = new ExportPgsqlRonghe() + task.run(args) + } + + def run(args) { + def new_dists = [] + citys = CcbCommonUtils.getRunningCitys(args) + //°´Ììµ¼£¨Ã¿ÌìÒ»¸öÎļþ¼Ð£© + exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date() + 1, -1), "yyyy-MM-dd"), new_dists) + if (curDate.toString().endsWith("10")) { + + exportEvaluateRate() + exportBigdataBuildprojFjw() + exportBigdataCommlayoutpicFjw() + + + exportBigdataCommunityGJRH()// + exportBigdataBuildingFJW()// + exportBigdataCommfeeGj()// + + exportBigdataCommbuildstruGJ()// + exportBigdataCommhousetypeGJ()// + exportBigdataCommbuildyearGj()// + exportBigdataCommhouseuseGJ()// + exportBigdataPositionGJ()// + exportBigdataDistrictFJW()// + exportBigdataAliasFJW()// + + + //±¾12.10ÉÏ´«10£¬11ÔÂËùÓÐÊý¾Ý£¬23Äê1ÔÂÐè¸ÄΪËùÓгÇÊа´ÈÕÆÚͬ²½Ò»ÆÚÊý¾Ý + def queryDate = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM").toInteger() +// exportBigdataCityPrice(queryDate) +// exportBigdataDistPrice(queryDate) +// exportBigdataCommPrice(queryDate) + + exportInOk() + +// } + +// SSHHelperTest jschCommand = new SSHHelperTest(); +// System.out.println(jschCommand.executeCommand("sh /home/ccb_ronghe/output/rh_package.sh ${curDate}")); + } + } + + + def exportBigdataDealFJW2(curDate, dealdate, new_dists){ + + def startDateStr = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd") + def endDateStr = DateUtils.formatDateByPattern(DateUtils.getLastDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd") + + def fileName = "FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + } + + def allRows = [] + + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + if(curDate.toString().endsWith("10")){ + if(new_dists){ + def newstr = "('"+new_dists.join("','")+"')" + def sql1 = "select urbn_id,mdl_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_str,gujia_hsno,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_wbt_floor,gujia_lyr_tp_val,gujia_tot_floor_num,gujia_bld_tp_val,gujia_bld_stc,gujiaconstructionarea,gujia_set_innr_area,gujia_acc_tp_val,gujia_room,gujia_dept,gujia_ktch_num,gujia_toliet,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_trdtckt_prc,gujia_mdl_tot_prc,gujia_dcl_tot_prc,gujia_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_mdl_cyc,gujiawthrext_lift_ind,gujiagvlndfargrdnarea,gujia_gv_lu_tbl_area,gujia_gv_sun_tbl_area,gujiagvbaywindow_area,gujiagvarea_tower_flr,gujia_gv_grg_area,gujiagvundgdroom_area,gujia_gv_othr_area,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_mkdam,gujia_data_tm " + + "from "+database+"t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and txn_dt>=to_date('${dealDate}','yyyy-MM-dd') and gujia_admndiv_id not in ${newstr}" + def rets1 = dealData(sql1) + + def sql2 = "select urbn_id,mdl_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_str,gujia_hsno,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_wbt_floor,gujia_lyr_tp_val,gujia_tot_floor_num,gujia_bld_tp_val,gujia_bld_stc,gujiaconstructionarea,gujia_set_innr_area,gujia_acc_tp_val,gujia_room,gujia_dept,gujia_ktch_num,gujia_toliet,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_trdtckt_prc,gujia_mdl_tot_prc,gujia_dcl_tot_prc,gujia_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_mdl_cyc,gujiawthrext_lift_ind,gujiagvlndfargrdnarea,gujia_gv_lu_tbl_area,gujia_gv_sun_tbl_area,gujiagvbaywindow_area,gujiagvarea_tower_flr,gujia_gv_grg_area,gujiagvundgdroom_area,gujia_gv_othr_area,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_mkdam,gujia_data_tm " + + "from "+database+"t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and gujia_admndiv_id in ${newstr}" + def rets2 = dealData(sql2) + allRows.addAll(rets1) + allRows.addAll(rets2) + }else{ + def sql = "select urbn_id,mdl_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_str,gujia_hsno,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_wbt_floor,gujia_lyr_tp_val,gujia_tot_floor_num,gujia_bld_tp_val,gujia_bld_stc,gujiaconstructionarea,gujia_set_innr_area,gujia_acc_tp_val,gujia_room,gujia_dept,gujia_ktch_num,gujia_toliet,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_trdtckt_prc,gujia_mdl_tot_prc,gujia_dcl_tot_prc,gujia_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_mdl_cyc,gujiawthrext_lift_ind,gujiagvlndfargrdnarea,gujia_gv_lu_tbl_area,gujia_gv_sun_tbl_area,gujiagvbaywindow_area,gujiagvarea_tower_flr,gujia_gv_grg_area,gujiagvundgdroom_area,gujia_gv_othr_area,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_mkdam,gujia_data_tm " + + "from "+database+".t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and txn_dt>=to_date('${dealDate}','yyyy-MM-dd')"; + allRows.addAll(dealData(sql)) + } + } + } + createFileToFtp("BIGDATA_DEAL_FJW", allRows, fileName, curDate, false) + } + + + + def dealData(def sql){ + def allRows = [] + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.urbn_id + data << r.urbn_id + data << r.mdl_id + data << r.urbn_nm + data << r.gujia_admndiv_id + data << r.gujia_admndiv_nm + data << r.gujia_str + data << r.gujia_hsno + data << r.gujia_comm_id + data << r.comm_nm + data << r.gujia_bld_id + data << r.bld_id + data << r.gujia_bld_nm + data << r.gujia_unit_id + data << r.unit_id + data << r.gujia_unit_nm + data << r.gujia_acc_id + data << r.gujia_dtl_adr + data << r.gujia_bld_yr_rc + data << r.gujia_own_val + data << r.gujia_own_yrlmt_val + data << r.gujia_prd_val + data << r.gujia_wbt_floor + data << r.gujia_lyr_tp_val + data << r.gujia_tot_floor_num + if(r.gujia_bld_tp_val){ + def arrs = r.gujia_bld_tp_val.replace("[","").replace("]","").split(",") + data << arrs[0].trim() + }else{ + data << '' + } + data << r.gujia_bld_stc + data << r.gujiaconstructionarea + data << r.gujia_set_innr_area + data << r.gujia_acc_tp_val + data << r.gujia_room + data << r.gujia_dept + data << r.gujia_ktch_num + data << r.gujia_toliet + data << r.gujia_hs_use + data << r.gujia_indr_stc_val + data << r.gujia_twrd_val + data << r.gujia_dcrt_sttn + data << r.gujia_ases_bt_ln_num + data << r.gujia_trdtckt_prc + data << r.gujia_mdl_tot_prc + data << r.gujia_dcl_tot_prc + data << r.gujia_ases_tot_prc + data << r.gujiasigntonlinectrid + data << r.txn_dt + data << r.gujia_txn_tp_val + data << r.gujia_sell_pymtmod + data << r.gujia_mdl_cyc + data << r.gujiawthrext_lift_ind + data << r.gujiagvlndfargrdnarea + data << r.gujia_gv_lu_tbl_area + data << r.gujia_gv_sun_tbl_area + data << r.gujiagvbaywindow_area + data << r.gujiagvarea_tower_flr + data << r.gujia_gv_grg_area + data << r.gujiagvundgdroom_area + data << r.gujia_gv_othr_area + data << r.gujia_hs_src_dtsrc + data << r.intr_co_id + data << r.intr_co_nm + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + data << r.gujia_mkdam + data << r.gujia_data_tm + allRows << data + }); + return allRows + } + + def exportEvaluateRate(){ + def sql = "select gujia_ceft_id,gujia_ceft_tp,gujia_ceft,gujia_seq, gujia_urbn,rmrk_dsc, to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm, gujia_src_co from t0831_evaluate_rate_fjw_w"; + def allRows = [] + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.gujia_ceft_id + data << r.gujia_ceft_tp + data << r.gujia_ceft + data << r.gujia_seq + data << r.gujia_urbn + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + def fileName = linux_prefix + "FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat" + } + + createFileToFtp("EVALUATE_RATE_FJW", allRows, fileName, curDate, false) + } + + def exportBigdataBuildprojFjw(){ + def fileName = linux_prefix + "FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat" + } + createFileToFtp("BIGDATA_BUILDPROJ_FJW", [], fileName, curDate, false) + } + + def exportBigdataCommlayoutpicFjw(){ + def fileName = linux_prefix + "FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat" + } + createFileToFtp("BIGDATA_COMMLAYOUTPIC_FJW", [], fileName, curDate, false) + } + + def exportBigdataCommunityGJRH(){ + + def fileName = linux_prefix + "FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" + } + def allRows = [] + for(def city : citys){ + def cityCode = cityCodeMap.get(city) + def sql = "select urbn_id,gujia_comm_id,comm_nm,gujia_comm_fmnm,gujia_admndiv_id,gujia_str,gujia_hsno,gujia_dtl_adr,gujiaocpoflandtotarea,gujia_bld_tot_area,gujia_comm_tp_val,gujiawthr_new_pan_ind,gujia_grnrate,gujia_vol_rate,gujia_park_num,gujia_comm_intd,rmrk_dsc, to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm, to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujiaprhsld_hspty_prc,gujiacomm_tot_rsd_num,gujiacommrntfee_avprc,gujia_comm_avprc from "+database+"t0831_bigdata_community_fjw_w where urbn_id='${cityCode}'"; + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.urbn_id + data << r.gujia_comm_id + data << r.comm_nm + data << r.gujia_comm_fmnm + data << r.gujia_admndiv_id + data << r.gujia_str + data << r.gujia_hsno + data << r.gujia_dtl_adr + data << r.gujiaocpoflandtotarea + data << r.gujia_bld_tot_area + data << r.gujia_comm_tp_val + data << r.gujiawthr_new_pan_ind + data << r.gujia_grnrate + data << r.gujia_vol_rate + data << r.gujia_park_num + data << r.gujia_comm_intd + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + } + + createFileToFtp("BIGDATA_COMMUNITY_FJW", allRows, fileName, curDate, false) + } + + def exportBigdataCommbuildstruGJ(){ + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select urbn_id, gujia_comm_id, gujia_bld_stc, rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm, gujia_src_co from "+database+"t0831_bigdata_commbuildstru_fjw_w where urbn_id='${cityCode}'"; + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.urbn_id + data << r.gujia_comm_id + data << r.gujia_bld_stc + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + } + + def fileName = linux_prefix + "FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" + } + createFileToFtp("BIGDATA_COMMBUILDSTRU_FJW", allRows, fileName, curDate, false) + + } + + def exportBigdataCommfeeGj(){ + + def allRows = [] + for(def city : citys){ + def cityCode = cityCodeMap.get(city) + def sql = "select urbn_id,gujia_comm_id,co_id,gujia_eps_val,gujia_hs_use,gujia_bld_tp_val,gujia_comm_eps_tp,gujia_eps_cmnt,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+"t0831_bigdata_commfee_fjw_w where urbn_id='${cityCode}'"; + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.urbn_id + data << r.gujia_comm_id + data << r.co_id + data << r.gujia_eps_val + data << r.gujia_hs_use + if(r.gujia_bld_tp_val){ + def arrs = r.gujia_bld_tp_val.replace("[","").replace("]","").split(",") + data << arrs[0].trim() + }else{ + data << '' + } + data << r.gujia_comm_eps_tp + data << r.gujia_eps_cmnt + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + } + def fileName = linux_prefix + "FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" + } + createFileToFtp("BIGDATA_COMMFEE_FJW", allRows, fileName, curDate, false) + } + + def exportBigdataCommhousetypeGJ(){ + + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select urbn_id,gujia_comm_id,gujia_comm_hs_tp,rmrk_dsc,to_char(data_crt_tm'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+"t0831_bigdata_commhousetype_fjw_w where urbn_id='${cityCode}'"; + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.urbn_id + data << r.gujia_comm_id + data << r.gujia_comm_hs_tp + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + } + + def fileName = linux_prefix + "FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" + } + createFileToFtp("BIGDATA_COMMHOUSETYPE_FJW", allRows, fileName, curDate, false) + } + + def exportBigdataCommbuildyearGj(){ + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select urbn_id,gujia_comm_id,gujia_bld_yr_rc,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+"t0831_bigdata_commbuildyear_fjw_w where urbn_id='${cityCode}'";// + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.urbn_id + data << r.gujia_comm_id + data << r.gujia_bld_yr_rc + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + } + def fileName = linux_prefix + "FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" + } + createFileToFtp("BIGDATA_COMMBUILDYEAR_FJW", allRows, fileName, curDate, false) + } + + def exportBigdataCommhouseuseGJ(){ + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select urbn_id,gujia_comm_id,gujia_hs_use,gujia_ladder_accnum,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+"t0831_bigdata_commhouseuse_fjw_w where urbn_id='${cityCode}'";// + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.urbn_id + data << r.gujia_comm_id + data << r.gujia_hs_use + data << r.gujia_ladder_accnum + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + } + def fileName = linux_prefix + "FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" + } + createFileToFtp("BIGDATA_COMMHOUSEUSE_FJW", allRows, fileName, curDate, false) + } + + def exportBigdataPositionGJ(){ + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select urbn_id,gujia_obj_tp,gujia_obj_id,gujia_lo_tp,gujia_sn,lgt,ltt,gujia_hignas_val,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+"t0831_bigdata_position_fjw_w where urbn_id='${cityCode}'";// + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.urbn_id + data << r.gujia_obj_tp + data << r.gujia_obj_id + data << r.gujia_lo_tp + data << r.gujia_sn + data << r.lgt + data << r.ltt + data << r.gujia_hignas_val + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + } + def fileName = linux_prefix + "FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" + } + createFileToFtp("BIGDATA_POSITION_FJW", allRows, fileName, curDate, false) + } + + def exportBigdataDistrictFJW(){ + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select gujia_admndiv_id,gujia_admndiv_nm,gujia_admndiv_nm_cpa,urbn_id,gujia_natstd_cd,gujia_dspl_seq,gujia_admndiv_cgy,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from "+database+"t0831_bigdata_district_fjw_w where urbn_id='${cityCode}'";// + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.gujia_admndiv_id + data << r.gujia_admndiv_nm + data << r.gujia_admndiv_nm_cpa + data << r.urbn_id + data << r.gujia_natstd_cd + data << r.gujia_dspl_seq + data << r.gujia_admndiv_cgy + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + } + + def fileName = linux_prefix + "FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" + } + createFileToFtp("BIGDATA_DISTRICT_FJW", allRows, fileName, curDate, false) + } + + def exportBigdataAliasFJW(){ + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select urbn_id,rel_id,gujia_comm_id,comm_nm,gujia_pcsst,gujia_vld_dt,gujia_vrsn_dsc,gujia_wthr_prim_nm,gujia_dtsrc,gujia_dsc,gujia_als_lvl,gujia_adr_tp_ecd,gujia_wthr_adt_ind,gujia_wthr_dspl_ind from "+database+"t0831_address_alias_fjw_w where urbn_id='${cityCode}'";// + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.urbn_id + data << r.rel_id + data << r.gujia_comm_id + data << r.comm_nm + data << r.gujia_pcsst + data << r.gujia_vld_dt + data << r.gujia_vrsn_dsc + data << r.gujia_wthr_prim_nm + data << r.gujia_dtsrc + data << r.gujia_dsc + data << r.gujia_als_lvl + data << r.gujia_adr_tp_ecd + data << r.gujia_wthr_adt_ind + data << r.gujia_wthr_dspl_ind + allRows << data + }); + } + def fileName = linux_prefix + "FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat" + } + createFileToFtp("ADDRESS_ALIAS_FJW", allRows, fileName, curDate, false) + } + + def exportBigdataBuildingFJW(){ + def fileName = linux_prefix + "FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat" + } + def index = 0 + for(def city : citys) { + def allRows = [] + def cityCode = cityCodeMap.get(city) + def sql = "select urbn_id,gujia_bld_id,bld_id,gujia_bld_nm,gujia_bld_als_dsc,gujia_admndiv_id,gujia_comm_id,gujia_bld_yr_rc,gujia_bld_tp_val,gujia_bld_stc,floor_num,gujia_unit_num,gujia_accnum_val,gujiawthrext_lift_ind,gujia_lift_num,gujiajiladderjiactval,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_vld_ind from "+database+"t0831_bigdata_building_fjw_w where urbn_id='${cityCode}'";// + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.urbn_id + data << r.gujia_bld_id + data << r.bld_id + data << r.gujia_bld_nm + data << r.gujia_bld_als_dsc + data << r.gujia_admndiv_id + data << r.gujia_comm_id + data << r.gujia_bld_yr_rc + if(r.gujia_bld_tp_val){ + def arrs = r.gujia_bld_tp_val.replace("[","").replace("]","").split(",") + data << arrs[0].trim() + }else{ + data << '' + } + data << r.gujia_bld_stc + data << r.floor_num + data << r.gujia_unit_num + data << r.gujia_accnum_val + data << r.gujiawthrext_lift_ind + data << r.gujia_lift_num + data << r.gujiajiladderjiactval + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + data << r.gujia_vld_ind + allRows << data + }); + + if(allRows && allRows.size()>0){ + index = index + 1 + if(index == 1){ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + }else{ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true); + } + } + } + + CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) + println "BIGDATA_BUILDING_FJW ÉÏ´«FtpÍê³É......" + } + + def exportBigdataCityPrice(queryDate){ + def fileName = linux_prefix + "FJW_000000_000000_BIGDATA_CITYPRICE_FJW_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "FJW_000000_000000_BIGDATA_CITYPRICE_FJW_ADD_${curDate}_0001.dat" + } + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + // def sql = "select CITYID, YMID, SALEPRICE,RENTPRICE,SALECOUNT,RENTCOUNT, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, HOUSEUSE,SALEBLDGAREA,RENTBLDGAREA,SALETOTALPRICE,RENTTOTALPRICE,DATATYPE,SDATERANGE,RDATERANGE,SOURCECODE from BIGDATA_CITYPRICE where CITYID='${cityCode}' and YMID=${queryDate}";// + def sql = "select CITYID, YMID, SALEPRICE,RENTPRICE,SALECOUNT,RENTCOUNT, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, HOUSEUSE,SALEBLDGAREA,RENTBLDGAREA,SALETOTALPRICE,RENTTOTALPRICE,DATATYPE,SDATERANGE,RDATERANGE,SOURCECODE from t0831_city_price_gj_h where CITYID='${cityCode}'";// + + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.YMID + data << r.SALEPRICE?r.SALEPRICE:'' + data << r.RENTPRICE?r.RENTPRICE:'' + if(r.SALECOUNT>0) { + data << r.SALECOUNT + }else{ + data << '' + } + if(r.RENTCOUNT>0){ + data << r.RENTCOUNT + }else{ + data << '' + } + data << r.UPDATETIME + data << r.HOUSEUSE + data << r.SALEBLDGAREA?r.SALEBLDGAREA:'' + data << r.RENTBLDGAREA?r.RENTBLDGAREA:'' + data << r.SALETOTALPRICE?r.SALETOTALPRICE:'' + data << r.RENTTOTALPRICE?r.RENTTOTALPRICE:'' + data << r.DATATYPE + data << r.SDATERANGE + data << r.RDATERANGE + data << r.SOURCECODE + allRows << data + }); + } + + createFileToFtp("BIGDATA_CITYPRICE", allRows, fileName, curDate, false) + } + + def exportInOk(){ + Vector files = CcbFtpTestUtils.listFileNames("rh", curDate) + Iterator fileVec = files.iterator() + def fileRows = [] + while(fileVec.hasNext()){ + ChannelSftp.LsEntry file = fileVec.next() + + if(org.apache.commons.lang.StringUtils.isNotBlank(file.getFilename()) && file.getFilename().endsWith(".dat")){ + fileRows << file.getFilename() +" "+CcbFtpTestUtils.getFileLength("rh", file.getFilename(), curDate) + } + } + def fileName = linux_prefix+"${curDate}.ok" + if(CommonDatautils.isWindow()){ + fileName = win_prefix + "${curDate}.ok" + } + createFileToFtp("ÈÚºÏͳ¼ÆÎļþ³¤¶ÈokÎļþ", fileRows, fileName, curDate, false) + } + + def createFileToFtp(tableName,allRows, fileName, curDate, isAppend){ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", isAppend); + println tableName+" Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload("rh", fileName, curDate) + println tableName+" ÉÏ´«FtpÍê³É......" + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCitypriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCitypriceBatch.groovy new file mode 100644 index 000000000..5a38c237e --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCitypriceBatch.groovy @@ -0,0 +1,1064 @@ +package com.fangjia.script.ccbevaluation.ronghe + +import com.fangjia.script.BaseBatch +import com.fangjia.script.ccbevaluation.CcbCommonUtils +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.common.DataHandleUtils +import com.fangjia.script.gj.ccb.FileUtils +import com.fangjia.script.util.DateUtils +import com.fangjia.script.util.ElasticUtils +import com.fangjia.script.util.ExcelUtils +import com.mongodb.BasicDBObject +import com.mongodb.DBObject +import groovy.sql.Sql +import org.apache.commons.lang.StringUtils +import org.elasticsearch.index.query.BoolQueryBuilder +import org.elasticsearch.index.query.QueryBuilder +import org.elasticsearch.index.query.QueryBuilders + +import java.util.concurrent.ConcurrentHashMap +import java.util.concurrent.CopyOnWriteArrayList +import java.util.concurrent.CountDownLatch +import java.util.concurrent.ExecutorService +import java.util.concurrent.Executors +import java.util.concurrent.atomic.AtomicLong + +class BigdataCitypriceBatch extends BaseBatch{ + + public static final String[] TAGS = ["¶À¶°", "ÁªÅÅ", "µþ¼Ó", "˫ƴ", "»¨Ô°Ãæ»ý", "Ó¾³Ø", "±ðÊû", "´ø»¨Ô°", "Ñó·¿", "µþÆ´", "¶ÀÔº", "ÁªÌå", "΢Êû", "´óƽÊû"]; + + public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(80) + + def curRunDate = null + + def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse?stringtype=unspecified", + "postgres", "postgres", "org.postgresql.Driver") + + def oracleSqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", + "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") + + public static def cityCodeMap = CcbCommonUtils.findCityCodeValue() + + static main(args) { + runBatch(new BigdataCitypriceBatch(), args) + } + + @Override + void process(Object args) { + + def curDate = new Date() + def citys = CcbCommonUtils.citys_all //CcbCommonUtils.getRunningCitys(args) + if(args){ + def dateStr = args[0] + curDate = DateUtils.parseFromTightByPattern(dateStr,"yyyy-MM-dd")//2022-03-01 + } + + println "args ²ÎÊý£º"+args.toString() +" ³ÇÊÐÊýÁ¿£º"+citys.size()+" curDate: "+ curDate + + curRunDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(curDate,-1), "yyyyMM").toInteger(); + def startDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(curDate,-1), "yyyyMMdd").toInteger(); + def endDate = DateUtils.formatDateByPattern(DateUtils.getLastDayOfMonth(curDate,-1), "yyyyMMdd").toInteger(); + def dealStartDate = DateUtils.addMonth(DateUtils.parseFromTightByPattern(startDate.toString(), "yyyyMMdd"), -1) + + def lastYearDate = DateUtils.addMonth(startDate.toString(),-12, "yyyyMMdd").toInteger(); + cityRun(citys, startDate, endDate, cityCodeMap) + regionRun(citys, startDate, endDate, cityCodeMap) + districtRun(citys, startDate, endDate, dealStartDate, lastYearDate, cityCodeMap) + } + + def cityRun(citys, startDate, endDate, cityCodeDataMap){ + def rets = [] + def index = 0 + for(def city : citys){ + index ++ + def row = createDatas(city, null, startDate, endDate, cityCodeDataMap, null) + if(row){ + rets << row + } + println "[ ${index} ]"+city+" Íê³É " + } + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "10"; + def fileName = "/ccb/MODEL_000000_000000_BIGDATA_CITYPRICE.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_CITYPRICE.dat" + } + def headers = [] + FileUtils.batchCreateFile(rets, fileName, headers, "utf-8", false); + println "txt Éú³É-> BIGDATA_CITYPRICE" + +// saveToPgSqlCityPrice(rets) + } + + def saveToPgSqlCityPrice(rows){ + for(def r : rows) { + for (def i = 0; i < r.size(); i++) { + if("" == r[i]){ + r[i] = null + } + } + r << null + r << DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-1), "yyyyMM")+"-28" + r << null + r << '2999-12-31' + r << null + r << null + r << null + } + + println "start: "+new Date() + def sql = "insert into base.t0831_city_price_gj_h values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)" + + pgsqlInstance.withBatch(1000, sql){ ps-> + for(def r : rows) { + ps.addBatch(r[0], r[1], r[2], r[3], r[4], r[5], r[6], r[7], r[8], r[9], r[10], r[11], r[12], r[13], r[14], r[15]) + ps.toString() + } + } + + println "end: "+new Date() + } + + + def regionRun(citys, startDate, endDate, cityCodeDataMap){ + def regionDatas = [] + for(def c : citys) { + def regionMap = CcbCommonUtils.findAllDistrictCodeValue(c) + regionMap.each{region, regionCodeDataMap-> + regionDatas << [c, region, regionCodeDataMap] + } + } + + def rets = new CopyOnWriteArrayList() + def size = regionDatas.size() + final CountDownLatch latch = new CountDownLatch(size) + def totalCount = new AtomicLong() + for(def i = 0;i BIGDATA_DISTPRICE" +// saveToPgSqlRegionPrice(rets) + } + + def saveToPgSqlRegionPrice(rows){ + for(def r : rows) { + for (def i = 0; i < r.size(); i++) { + if("" == r[i]){ + r[i] = null + } + } + r << null + r << DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-1), "yyyyMM")+"-28" + r << null + r << '2999-12-31' + r << null + r << null + r << null + } + + println "start: "+new Date() + def sql = "insert into base.t0831_district_price_gj_h values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)" + + pgsqlInstance.withBatch(1000, sql){ ps-> + for(def r : rows) { + ps.addBatch(r[0], r[1], r[2], r[3], r[4], r[5], r[6], r[7], r[8], r[9], r[10], r[11], r[12], r[13], r[14], r[15], r[16], r[17]) + ps.toString() + } + } + + println "end: "+new Date() + } + + def districtRun(citys, startDate, endDate, dealStartDate, lastYearDate, cityCodeDataMap){ + def rets = [] + def allDistricts = [] + def allPriceMap = [:] + def allRentMap = [:] + def allDealCountMap = [:] + def allCityRankMap = [:] + def allRegionRankMap = [:] + def allDistCityPreMap = [:] + def allDistRegionPreMap = [:] + def allLastMonthMap = [:] + def allLastYearMap = [:] + for(def city : citys) { + def districts = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city", "region", "name", "lng","estate_type2","name_cat","address", "alias"]); + allDistricts.addAll(districts) + + def priceMap = CommonDatautils.queryDistrictStatByDate(city, startDate, endDate) + allPriceMap = allPriceMap + priceMap + + def rentMap = CommonDatautils.findSqmetreRentByCityAndDate(city, endDate) + allRentMap = allRentMap + rentMap + + def cityCode = cityCodeMap.get(city) + def dealCountMap = findDealDatesByCity(cityCode, dealStartDate, startDate) + allDealCountMap = allDealCountMap + dealCountMap + + + def datas = findCommunityPriceByCity(cityCode, startDate.toString().substring(0,6)) + + def cityRankMap = findCommunityCityRank(datas) + allCityRankMap = allCityRankMap + cityRankMap + + def regionRankMap = findCommunityRegionRank(datas) + allRegionRankMap = allRegionRankMap + regionRankMap + + def cityPrice = findCcbCityPrice(cityCode, startDate.toString().substring(0,6)) + def regionPriceMap = findCcbRegionPrice(cityCode, startDate.toString().substring(0,6)) + + def cityPreMap = districtCityPrictRate(cityPrice, datas) + allDistCityPreMap = allDistCityPreMap + cityPreMap + + def regionPreMap = districtRegionPriceRate(regionPriceMap, datas) + allDistRegionPreMap = allDistRegionPreMap + regionPreMap + + def lastMonthMap = findDistQuotations(cityCode, dealStartDate.replace("-","").substring(0,6)) + allLastMonthMap = allLastMonthMap + lastMonthMap + + def lastYearMonthMap = findDistQuotations(cityCode, lastYearDate.toString().substring(0,6)) + allLastYearMap = allLastYearMap + lastYearMonthMap + } + + def cityLists = districtRunningByCity(allDistricts, startDate, endDate, cityCodeDataMap, allPriceMap, allRentMap, allDealCountMap, allCityRankMap, allRegionRankMap, allDistCityPreMap, allDistRegionPreMap, allLastMonthMap, allLastYearMap) + if(cityLists){ + rets.addAll(cityLists) + } + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "10"; + def fileName = "/ccb/MODEL_000000_000000_BIGDATA_COMMPRICE.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\${curDate}\\MODEL_000000_000000_BIGDATA_COMMPRICE.dat" + } + def headers = [] + FileUtils.batchCreateFile(rets, fileName, headers, "utf-8", false); + println "txt Éú³É->BIGDATA_COMMPRICE" + +// saveToPgSqlDistrictPrice(rets) + } + + + + def districtRunningByCity(districts, startDate, endDate, cityCodeDataMap, allPriceMap, allRentMap, dealCountMap, allCityRankMap, allRegionRankMap, allDistCityPreMap, allDistRegionPreMap, allLastMonthMap, allLastYearMap){ + def totalCount = new AtomicLong() + def distCount = districts.size() + final CountDownLatch latch = new CountDownLatch(distCount) + + def rets = new CopyOnWriteArrayList() + for(def i=0;i + for(def r : rows) { + ps.addBatch(r[0], r[1], r[2], r[3], r[4], r[5], r[6], r[7], r[8], r[9], r[10], r[11], r[12], r[13], r[14], r[15], r[16], r[17]) + ps.toString() + } + } + + println "end: "+new Date() + } + + + def createDistDate(dist, startDate, endDate, cityCodeDataMap, allPriceMap, allRentMap, dealCountMap, allCityRankMap, allRegionRankMap, allDistCityPreMap, allDistRegionPreMap, allLastMonthMap, allLastYearMap){ + def sellDataType = 1 + def rentDataType = 1 + def sellMap = findHouses(dist.city, dist.region, "sell", startDate, endDate, dist.name, dist.alias, dist.estate_type2) + def sell_avg_price = null + def sell_avg_area = null + def sell_avg_total = null + def sellStartDate = null + def sell_count = 0 + if(!sellMap || (sellMap && sellMap.avg_price.size()<3)){ + sellDataType = 3 + sellStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -3), "yyyyMMdd").toInteger(); + sellMap = findHouses(dist.city, dist.region, "sell", sellStartDate, endDate, dist.name, dist.alias, dist.estate_type2) + if(!sellMap || (sellMap && sellMap.avg_price.size()<3)){ + sellDataType = 6 + sellStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -6), "yyyyMMdd").toInteger(); + sellMap = findHouses(dist.city, dist.region, "sell", sellStartDate, endDate, dist.name, dist.alias, dist.estate_type2) + } + } + if(sellMap){ + sell_count = sellMap.avg_price.size() + if(sell_count>3){ + sell_avg_price = avgValue(sellMap.avg_price) + sell_avg_area = avgValue(sellMap.area) + sell_avg_total = avgValue(sellMap.total_price) + }else{ + sell_count = 0 + sellDataType = null + } + } + + def rent_avg_price = null + def rent_avg_area = null + def rent_avg_total = null + def rentStartDate = null + def rent_count = 0 + def rentMap = findHouses(dist.city, dist.region, "rent", startDate, endDate, dist.name, dist.alias, dist.estate_type2) + if(!rentMap || (rentMap && rentMap.avg_price.size()<3)){ + rentDataType = 3 + rentStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -3), "yyyyMMdd").toInteger(); + rentMap = findHouses(dist.city, dist.region, "rent", rentStartDate, endDate, dist.name, dist.alias, dist.estate_type2) + if(!rentMap || (rentMap && rentMap.avg_price.size()<3)){ + rentDataType = 6 + rentStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -6), "yyyyMMdd").toInteger(); + rentMap = findHouses(dist.city, dist.region, "rent", rentStartDate, endDate, dist.name, dist.alias, dist.estate_type2) + } + } + if(rentMap){ + rent_count = rentMap.avg_price.size() + if(rent_count>3){ + rent_avg_price = avgValue(rentMap.avg_price) + rent_avg_area = avgValue(rentMap.area) + rent_avg_total = avgValue(rentMap.total_price) + }else{ + rent_count = 0 + rentDataType = null + } + } + if(!sell_avg_price){ + sell_avg_price = allPriceMap.get(dist.city +"##"+ dist.region +"##"+ dist.name) + } + if(!rent_avg_price){ + rent_avg_price = allRentMap.get(dist.city +"##"+ dist.region +"##"+ dist.name) + } + if (sell_avg_price || rent_avg_price) { + def row = [] + row << cityCodeDataMap.get(dist.city) + row << curRunDate//DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-1), "yyyyMM").toInteger(); + row << dist._id.toString() + + if (sell_avg_price) { + row << sell_avg_price.toInteger() + } else { + row << '' + } + row << sell_count + + if (rent_avg_price) { + row << DataHandleUtils.getDoubleRound(2, rent_avg_price) + } else { + row << '' + } + row << rent_count + + row << DateUtils.formatDateByPattern(new Date(), "yyyyMMdd") + + if (sell_avg_area) { + row << DataHandleUtils.getDoubleRound(2, sell_avg_area) + } else { + row << '' + } + + if (rent_avg_area) { + row << DataHandleUtils.getDoubleRound(2, rent_avg_area) + } else { + row << '' + } + + if (sell_avg_total) { + row << DataHandleUtils.getDoubleRound(2, sell_avg_total) + } else { + row << '' + } + + if (rent_avg_total) { + row << DataHandleUtils.getDoubleRound(2, rent_avg_total) + } else { + row << '' + } + if(dist.estate_type2 && dist.estate_type2=="ÉÌס"){ + row << '11' + }else{ + row << '13' + } + + if(sellDataType){ + row << sellDataType + }else{ + row << '' + } + + if(rentDataType){ + row << rentDataType + }else{ + row << '' + } + + row << 1 + row << 'FJW' + + //³É½»Ñù±¾Á¿,³É½»Ñù±¾Á¿Í¬±È, ³É½»Ñù±¾Á¿»·±È + if(dealCountMap){ + def dealCount = dealCountMap.get(dist._id.toString()) + row << dealCount?dealCount:'' + def dealMarkup = '' + def dealYoy = '' + if(allLastMonthMap){ + def dealMarkupMap = allLastMonthMap.get(dist._id.toString()) + try{ + if(dealCount && dealMarkupMap && dealMarkupMap.deal_count && dealMarkupMap.deal_count>0){ + def markup = (dealCount-dealMarkupMap.deal_count)*100/dealMarkupMap.deal_count + dealMarkup = DataHandleUtils.getDoubleRound(2, markup) + } + }catch(Exception e){ + e.printStackTrace() + } + + } + if(allLastYearMap){ + def dealYoyMap = allLastYearMap.get(dist._id.toString()) + if(dealCount && dealYoyMap && dealYoyMap.deal_count && dealYoyMap.deal_count>0){ + def markup = (dealCount-dealYoyMap.deal_count)*100/dealYoyMap.deal_count + dealYoy = DataHandleUtils.getDoubleRound(2, markup) + } + } + row << dealYoy + row << dealMarkup + + }else{ + row << '' + row << '' + row << '' + } + + //³öÊÛÆ½¾ùµ¥¼ÛµÄͬ±È£¬»·±È + if(sell_avg_price){ + def markup = '' + if(allLastMonthMap){ + def dataMap = allLastMonthMap.get(dist._id.toString()) + if(dataMap && dataMap.saleprice){ + markup = (sell_avg_price - dataMap.saleprice)*100/dataMap.saleprice + markup = DataHandleUtils.getDoubleRound(2, markup) + } + } + def yoy = '' + if(allLastYearMap){ + def dataMap = allLastYearMap.get(dist._id.toString()) + if(dataMap && dataMap.saleprice){ + yoy = (sell_avg_price - dataMap.saleprice)*100/dataMap.saleprice + yoy = DataHandleUtils.getDoubleRound(2, yoy) + } + } + row << yoy + row << markup + }else{ + row << '' + row << '' + } + + //³öÊÛÑù±¾Á¿Í¬±È£¬»·±È + if(sell_count){ + def markup = '' + if(allLastMonthMap){ + def dataMap = allLastMonthMap.get(dist._id.toString()) + if(dataMap && dataMap.salecount){ + markup = (sell_count - dataMap.salecount)*100/dataMap.salecount + markup = DataHandleUtils.getDoubleRound(2, markup) + } + } + def yoy = '' + if(allLastYearMap){ + def dataMap = allLastYearMap.get(dist._id.toString()) + if(dataMap && dataMap.salecount){ + yoy = (sell_count - dataMap.salecount)*100/dataMap.salecount + yoy = DataHandleUtils.getDoubleRound(2, yoy) + } + } + row << yoy + row << markup + }else{ + row << '' + row << '' + } + + //³ö×â·¿Ô´Á¿Í¬±È£¬»·±È + if(rent_count){ + def markup = '' + if(allLastMonthMap){ + def dataMap = allLastMonthMap.get(dist._id.toString()) + if(dataMap && dataMap.salecount && dataMap.rentcount>0){ + markup = (rent_count - dataMap.rentcount)*100/dataMap.rentcount + markup = DataHandleUtils.getDoubleRound(2, markup) + } + } + def yoy = '' + if(allLastYearMap){ + def dataMap = allLastYearMap.get(dist._id.toString()) + if(dataMap && dataMap.salecount && dataMap.rentcount>0){ + yoy = (rent_count - dataMap.rentcount)*100/dataMap.rentcount + yoy = DataHandleUtils.getDoubleRound(2, yoy) + } + } + row << yoy + row << markup + }else{ + row << '' + row << '' + } + //Ð¡Çø¼Û¸ñ³ÇÊÐÅÅÃû + if(allCityRankMap){ + def cityRank = allCityRankMap.get(dist._id.toString()) + if(cityRank){ + row << cityRank + }else{ + row << '' + } + }else{ + row << '' + } + //Ð¡Çø¼Û¸ñÇøÓòÅÅÃû + if(allRegionRankMap){ + def regionRank = allRegionRankMap.get(dist._id.toString()) + if(regionRank){ + row << regionRank + }else{ + row << '' + } + }else{ + row << '' + } + //¸ßÓÚÇøÏØÆ½¾ù¼Û±ÈÂÊ + if(allDistRegionPreMap){ + def regionRadio = allDistRegionPreMap.get(dist._id.toString()) + if(regionRadio){ + row << regionRadio + }else{ + row << '' + } + }else{ + row << '' + } + + //¸ßÓÚ³ÇÊÐÆ½¾ù¼Û±ÈÂÊ + if(allDistCityPreMap){ + def cityRadio = allDistCityPreMap.get(dist._id.toString()) + if(cityRadio){ + row << cityRadio + }else{ + row << '' + } + }else{ + row << '' + } + return row + } + return null + } + + + def createDatas(city, region , startDate, endDate, cityCodeDataMap, regionCodeDataMap) { + def sellDataType = 1 + def rentDataType = 1 + def sell_count = findHouseCountByType(city, region, "sell", startDate, endDate) + def sell_avg_price = null + def sell_avg_area = null + def sell_avg_total = null + def sellStartDate = null + if (sell_count < 10) { + sellDataType = 3 + sellStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -3), "yyyyMMdd").toInteger(); + sell_count = findHouseCountByType(city, region, "sell", sellStartDate, endDate) + if (sell_count < 10) { + sellDataType = 6 + sellStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -6), "yyyyMMdd").toInteger(); + sell_count = findHouseCountByType(city, region, "sell", sellStartDate, endDate) + } + } else { + sellStartDate = startDate + } + if (sell_count) { + sell_avg_price = findHouseAvgByType(city, region, "sell", sellStartDate, endDate,"avg_price") + sell_avg_area = findHouseAvgByType(city, region, "sell", sellStartDate, endDate,"area") + sell_avg_total = findHouseAvgByType(city, region, "sell", sellStartDate, endDate, "total_price") + } + + + def rentStartDate = null + def rent_count = findHouseCountByType(city, region, "rent", startDate, endDate) + if (rent_count < 10) { + rentDataType = 3 + rentStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -3), "yyyyMMdd").toInteger(); + rent_count = findHouseCountByType(city, region, "sell", startDate, endDate) + if (rent_count < 10) { + rentDataType = 6 + rentStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -6), "yyyyMMdd").toInteger(); + rent_count = findHouseCountByType(city, region, "sell", rentStartDate, endDate) + } + } else { + rentStartDate = startDate + } + + def rent_avg_price = null + def rent_avg_area = null + def rent_avg_total = null + if (rent_count>=10) { + rent_avg_price = findHouseAvgByType(city, region, "rent", rentStartDate, endDate, "avg_price") + rent_avg_area = findHouseAvgByType(city, region, "rent", rentStartDate, endDate, "area") + rent_avg_total = findHouseAvgByType(city, region, "rent", rentStartDate, endDate, "total_price") + } + + println city +" "+region +" sell: "+ sell_count +" rent: "+rent_count + + if (sell_avg_price || rent_avg_price) { + def row = [] + row << cityCodeDataMap.get(city) + row << curRunDate//DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-1), "yyyyMM").toInteger(); + + if(region){ + row << regionCodeDataMap.district_code + } + + if (sell_avg_price) { + row << sell_avg_price.toInteger() + } else { + row << '' + } + + if (rent_avg_price) { + row << DataHandleUtils.getDoubleRound(2, rent_avg_price) + } else { + row << '' + } + + row << sell_count + row << rent_count + row << DateUtils.formatDateByPattern(new Date(), "yyyyMMdd") + row << '11' + + if (sell_avg_area) { + row << DataHandleUtils.getDoubleRound(2, sell_avg_area) + } else { + row << '' + } + + if (rent_avg_area) { + row << DataHandleUtils.getDoubleRound(2, rent_avg_area) + } else { + row << '' + } + + if (sell_avg_total) { + row << DataHandleUtils.getDoubleRound(2, sell_avg_total) + } else { + row << '' + } + + if (rent_avg_total) { + row << DataHandleUtils.getDoubleRound(2, rent_avg_total) + } else { + row << '' + } + + row << 1 + row << sellDataType + row << rentDataType + row << 'FJW' + return row + } + + return null + } + + + def avgValue(def datas){ + def avgValue = null + if(datas){ + avgValue = datas.sum()/datas.size() + } + return avgValue; + } + + def findHouseAvgByType(def city, def region, def cat, def startDate, def endDate, def type){ + String sql = "select avg(${type}) as avg_val from latest_seawater where cat='${cat}' and city='${city}' and p_date >= ${startDate} and p_date<=${endDate} " + if(region){ + sql = sql +" and region='${region}'" + } + def val = null + ElasticUtils.executeSqlQuery(sql, { d -> + val = d.avg_val + }) + return val; + } + + def findHouseCountByType(def city, def region, def cat, def startDate, def endDate){ + String sql = "select count(1) as count from latest_seawater where cat='${cat}' and city='${city}' and p_date >= ${startDate} and p_date<=${endDate} " + if(region){ + sql = sql +" and region='${region}'" + } + def val = null + ElasticUtils.executeSqlQuery(sql, { d -> + val = d.count + }) + return val; + } + + def findHouseDetail(def city, def region, def cat, def startDate, def endDate, def estate_type2){ + + String sql = "select estate_type,area,avg_price,total_price,name,height,room c from latest_seawater where cat='${cat}' and city='${city}' and p_date >= ${startDate} and p_date<=${endDate} " + if(region){ + sql = sql +" and region='${region}'" + } + def avgPrices = [] + def areas = [] + def totalPrices = [] + ElasticUtils.executeSqlQuery(sql,{ seawater-> + def flag = true + if(estate_type2 && estate_type2=="ÆÕͨסլ"){ + if(seawater.estate_type && (seawater.estate_type.contains("ÉÌס") || seawater.estate_type.contains("ÉÌÒµ") || seawater.estate_type.contains("ÉÌÎñ"))){ + flag = false + } + + if(seawater.estate_type&& seawater.estate_type.contains("±ðÊû")){ + flag = false + } + + def vallaFlag = isVilla(seawater.area, seawater.name, seawater.height, seawater.room) + if(vallaFlag){ + flag = false + } + } + if(cat == "rent"){ + if(seawater.avg_price && seawater.avg_price>1000){ + flag = false + } + + if(seawater.avg_price && seawater.avg_price<10){ + flag = false + } + } + if(flag){ + avgPrices << seawater.avg_price + areas << seawater.area + totalPrices << seawater.total_price + } + }) + def retMap = [:] + if(areas){ + retMap.avg_price = avgPrices + retMap.area = areas + retMap.total_price = totalPrices + } + return retMap; + } + + + + def findHouses(def city, def region, def cat, def startDate, def endDate, def name, def alias, def estate_type2){ + + QueryBuilder date_range = QueryBuilders.rangeQuery("p_date").from(startDate).to(endDate).includeLower(true).includeUpper(true); + QueryBuilder area_range = QueryBuilders.rangeQuery("area").from(20).to(500).includeLower(true).includeUpper(false); + + QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("city", city)) + .must(QueryBuilders.termQuery("cat", cat)).must(date_range).must(area_range) + + if(region){ + queryBuilder.must(QueryBuilders.termQuery("region", region)) + } + + if(name || alias){ + if(!alias){ + alias = [] + } + if(!alias.contains(name)){ + alias.add(name) + } + + if(name.contains("ÅªÐ¡Çø")){ + def newName = name.replace("ÅªÐ¡Çø","Ū") + if(!alias.contains(newName)){ + alias << newName + } + } + + if(alias && alias.size()>0){ + BoolQueryBuilder inBuilder = QueryBuilders.boolQuery(); + for(def s : alias){ + inBuilder.should(QueryBuilders.matchQuery("district_name", s)); + } + queryBuilder.must(inBuilder) + } + } + + def houses = ElasticUtils.executeSimpleQuery("192.168.0.206", "seawater-20*", queryBuilder); + + def avgPrices = [] + def areas = [] + def totalPrices = [] + + if(houses){ + for (int k=0;k1000){ + continue + } + + if(seawater.avg_price && seawater.avg_price<10){ + continue + } + } + avgPrices << seawater.avg_price + areas << seawater.area + totalPrices << seawater.total_price + } + } + + def retMap = [:] + if(areas){ + retMap.avg_price = avgPrices + retMap.area = areas + retMap.total_price = totalPrices + } + return retMap; + } + + /** + * ÊÇ·ñÊDZðÊû + * @return + */ + public boolean isVilla(area, name, height, room) { + if (area == null) { + return false; + } + if (area >= 150 && StringUtils.indexOfAny(name, TAGS) > -1) { + return true; + } + + boolean ret = false; + if (height != null && room != null) { + if (height <= 3) { + if (area > 200 && room >= 5) { + ret = true; + } + } + } else if (height == null && room != null) { + if (area > 360 && room >= 6) { + ret = true; + } + } else if (height == null && room == null) { + if (area > 500) { + ret = true; + } + } + + return ret; + } + + + def findDealDatesByCity(cityCode, startDate, endDate){ + def sql = "SELECT gujia_comm_id,count(1) from base.t0831_bigdata_deal_gj_h WHERE urbn_id='${cityCode}' and txn_dt>='${startDate}' and txn_dt<'${endDate}' GROUP BY gujia_comm_id"; + def rMap = [:] + pgsqlInstance.eachRow(sql, { r -> + rMap.put(r.gujia_comm_id, r.count) + }) + return rMap; + } + + + def findCommunityCityRank(datas){ + def values = [] + for(def m : datas){ + values << m.avg_price + } + values = values.sort().reverse() + + def resMap = [:] + def total = values.size() + for(def m : datas){ +// def index = 0 +// for(def v : values){ +// index++ +// if(m.avg_price == v){ +// break; +// } +// } + def index = values.indexOf(m.avg_price)+1 + resMap.put(m.comm_id, index+"|"+total) + } + return resMap + } + + def findCommunityRegionRank(datas){ + + def regionMap = [:] + for(def m : datas){ + def prices = regionMap.get(m.region) + if(!prices){ + prices = [] + regionMap.put(m.region, prices) + } + prices << m.avg_price + prices.sort().reverse() + } + + + def resMap = [:] + for(def m : datas){ + def prices = regionMap.get(m.region) + def total = prices.size() + def index = prices.indexOf(m.avg_price)+1 +// for(def v : prices){ +// index++ +// if(m.avg_price == v){ +// break; +// } +// } + resMap.put(m.comm_id, index+"|"+total) + } + return resMap + } + + def findCommunityPriceByCity(cityCode, month){ + def sql = "select gujia_admndiv_nm,gujia_bds_id,gujia_bds_clc_avprc from t_app_p9pha_plda.avm_community_base_price_gj_h where urbn_id='${cityCode}' and gujiabds_clc_yrmo_val=${month}"; + def datas = [] + pgsqlInstance.eachRow(sql, { r -> + datas << ["comm_id":r.gujia_bds_id, "avg_price":r.gujia_bds_clc_avprc, "region":r.gujia_admndiv_nm] + }) + return datas; + } + + def findCcbCityPrice(cityCode, month){ + def sql = "SELECT gujia_bds_clc_avprc from t_app_p9pha_plda.avm_city_price_gj_h where urbn_id='${cityCode}' and gujiabds_clc_yrmo_val=${month}"; + def avgPrice = null + pgsqlInstance.eachRow(sql, { r -> + avgPrice = r.gujia_bds_clc_avprc + }) + return avgPrice; + } + + + + def findCcbRegionPrice(cityCode, month){ + def sql = "SELECT gxda_admndiv_nm,gujia_bds_clc_avprc from t_app_p9pha_plda.avm_district_price_gj_h where urbn_id='${cityCode}' and gujiabds_clc_yrmo_val=${month}"; + def regionPriceMap = [:] + pgsqlInstance.eachRow(sql, { r -> + regionPriceMap.put(r.gxda_admndiv_nm, r.gujia_bds_clc_avprc) + }) + return regionPriceMap; + } + + + def districtCityPrictRate(cityPrice, datas){ + def distCityRateMap = [:] + if(cityPrice){ + for(def m : datas){ + def val = (m.avg_price-cityPrice)*100/cityPrice + distCityRateMap.put(m.comm_id, DataHandleUtils.getDoubleRound(4, val)) + } + } + return distCityRateMap; + } + + + def districtRegionPriceRate(regionPriceMap, datas){ + def distRegionRateMap = [:] + if(regionPriceMap){ + for(def m : datas){ + def regionAvgPrice = regionPriceMap.get(m.region) + if(regionAvgPrice){ + def val = (m.avg_price-regionAvgPrice)*100/regionAvgPrice + distRegionRateMap.put(m.comm_id, DataHandleUtils.getDoubleRound(4, val)) + }else{ + println m.region+" ÎÞÇøÓò¾ù¼Û" + } + } + } + return distRegionRateMap; + } + + def findDistQuotations(cityCode, month){ + def sql = "select commid, deal_count, saleprice,salecount,rentcount from bigdata_commprice_fjw where ymid=${month} and cityid=${cityCode}"; + def markupMap = [:] + oracleSqlInstance.eachRow(sql, { r -> + markupMap.put(r.commid, ["deal_count":r.DEAL_COUNT, "saleprice":r.SALEPRICE,"salecount":r.SALECOUNT,"rentcount":r.RENTCOUNT]) + }) + return markupMap; + } + + + +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCommunityGJRHBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCommunityGJRHBatch.groovy index b8116db22..d2ad41623 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCommunityGJRHBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/BigdataCommunityGJRHBatch.groovy @@ -31,7 +31,6 @@ class BigdataCommunityGJRHBatch extends BaseBatch { public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(80) - def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") @@ -42,7 +41,8 @@ class BigdataCommunityGJRHBatch extends BaseBatch { @Override public void process(Object args) { - def citys = CcbCommonUtils.citys_all; + def citys = CcbCommonUtils.getRunningCitys(args) + def rows = [] def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() // for (def city : citys) { @@ -53,62 +53,62 @@ class BigdataCommunityGJRHBatch extends BaseBatch { // }) // } - addBigdataDistrictFJW() +// addBigdataDistrictFJW() -// def citySeqnoMap = CcbCommonUtils.findDistrictSeqno(); + def citySeqnoMap = CcbCommonUtils.findDistrictSeqno(); + + def index = 0 + for (def city : citys) { + index++ + def districts = CcbCommonUtils.findAllDistrictsByOracle(cityCodeDataMap.get(city)) // -// def index = 0 -// for (def city : citys) { -// index++ -// def districts = CcbCommonUtils.findAllDistrictsByOracle(cityCodeDataMap.get(city)) -//// -//// for(int i=0;i<10;i++){ -//// if(districts.size()==0){ -//// Thread.sleep(1000*60) -//// districts = CcbCommonUtils.findAllDistrictsByOracle(cityCodeDataMap.get(city)) -//// }else{ -//// break -//// } -//// } -// -// def distMap = CommonDatautils.findAllDistricMaptByCity(city, "district", ["address","build_structure","estate_type2","finish_building_date","alias","build_type","estate_charge"]) -// -// for(def dist : districts){ -// def obj = distMap.get(dist.commid)//CommonDatautils.findDistrictFieldById(dist.commid,["build_structure","estate_type2","finish_building_date","alias","build_type","estate_charge","estate_type2"]) -// if(obj){ -// if(obj.alias && obj.alias.size()>0){ -// dist.commalias = obj.alias.get(0) -// }else{ -// dist.commalias = "" -// } -// dist.buildstru = CcbCodeUtils.getBuildStructureCode(obj.build_structure) -// dist.housetype = CcbCodeUtils.getDistHouseTypeCode(obj.estate_type2) -// dist.buildyear = CcbCodeUtils.getBuildYear(obj.finish_building_date); -// dist.houseuse = "11" -// dist.buildtype = CcbCodeUtils.parseBuildType(dist.build_type) -// dist.compid = new ObjectId() //ÎïÒµ¹«Ë¾id -// dist.estatecharge = CcbCodeUtils.processEstateCharge(dist.city, obj.estate_charge, obj.estate_type2) +// for(int i=0;i<10;i++){ +// if(districts.size()==0){ +// Thread.sleep(1000*60) +// districts = CcbCommonUtils.findAllDistrictsByOracle(cityCodeDataMap.get(city)) +// }else{ +// break // } // } -// println index +" "+city +" Ð¡Çø¼ÓÔØÍê³É "+districts.size() -// addBigdataCommunityGJRH(districts, cityCodeDataMap.get(city)) -// println index +" "+city +" 1.Ð¡Çø±íÍê³É" -// addBigdataCommbuildstruGJ(districts, cityCodeDataMap.get(city)) -// println index +" "+city +" 2.Ð¡Çø½¨Öþ½á¹¹±í" -// addBigdataCommhousetypeGJ(districts, cityCodeDataMap.get(city)) -// println index +" "+city +" 3.Ð¡Çø·¿ÎÝÀàÐͱí" -// addBigdataCommbuildyearGj(districts, cityCodeDataMap.get(city)) -// println index +" "+city +" 4.Ð¡Çø½¨ÖþÄê´ú±í" -// addBigdataCommfeeGj(districts, cityCodeDataMap.get(city)) -// println index +" "+city +" 5.Ð¡Çø·ÑÓñí" -// addBigdataCommhouseuseGJ(districts, cityCodeDataMap.get(city)) -// println index +" "+city +" 6.Ð¡Çø·¿ÎÝÓÃ;±í" -// addBigdataPositionGJ(districts, cityCodeDataMap.get(city), citySeqnoMap) -// println index +" "+ city + " 7.µØÀíλÖñí" -// -//// addDealFieldInfo(distMap, cityCodeDataMap.get(city));//Ð޸ijɽ»¼Ç¼housestyle Ò»¶¨ÒªÔËÐÐ -// -// } + + def distMap = CommonDatautils.findAllDistricMaptByCity(city, "district", ["address","build_structure","estate_type2","finish_building_date","alias","build_type","estate_charge"]) + + for(def dist : districts){ + def obj = distMap.get(dist.commid)//CommonDatautils.findDistrictFieldById(dist.commid,["build_structure","estate_type2","finish_building_date","alias","build_type","estate_charge","estate_type2"]) + if(obj){ + if(obj.alias && obj.alias.size()>0){ + dist.commalias = obj.alias.get(0) + }else{ + dist.commalias = "" + } + dist.buildstru = CcbCodeUtils.getBuildStructureCode(obj.build_structure) + dist.housetype = CcbCodeUtils.getDistHouseTypeCode(obj.estate_type2) + dist.buildyear = CcbCodeUtils.getBuildYear(obj.finish_building_date); + dist.houseuse = CcbCodeUtils.getUseTypeCode(obj.estate_type2)//"11" + dist.buildtype = CcbCodeUtils.parseBuildType(dist.build_type) + dist.compid = new ObjectId() //ÎïÒµ¹«Ë¾id + dist.estatecharge = CcbCodeUtils.processEstateCharge(dist.city, obj.estate_charge, obj.estate_type2) + } + } + println index +" "+city +" Ð¡Çø¼ÓÔØÍê³É "+districts.size() + addBigdataCommunityGJRH(districts, cityCodeDataMap.get(city)) + println index +" "+city +" 1.Ð¡Çø±íÍê³É" + addBigdataCommbuildstruGJ(districts, cityCodeDataMap.get(city)) + println index +" "+city +" 2.Ð¡Çø½¨Öþ½á¹¹±í" + addBigdataCommhousetypeGJ(districts, cityCodeDataMap.get(city)) + println index +" "+city +" 3.Ð¡Çø·¿ÎÝÀàÐͱí" + addBigdataCommbuildyearGj(districts, cityCodeDataMap.get(city)) + println index +" "+city +" 4.Ð¡Çø½¨ÖþÄê´ú±í" + addBigdataCommfeeGj(districts, cityCodeDataMap.get(city)) + println index +" "+city +" 5.Ð¡Çø·ÑÓñí" + addBigdataCommhouseuseGJ(districts, cityCodeDataMap.get(city)) + println index +" "+city +" 6.Ð¡Çø·¿ÎÝÓÃ;±í" + addBigdataPositionGJ(districts, cityCodeDataMap.get(city), citySeqnoMap) + println index +" "+ city + " 7.µØÀíλÖñí" + +// addDealFieldInfo(distMap, cityCodeDataMap.get(city));//Ð޸ijɽ»¼Ç¼housestyle Ò»¶¨ÒªÔËÐÐ + + } } def addBigdataCommunityGJRH(def districts, def cityid){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy index 386f96f4b..852f3783a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHe.groovy @@ -4,10 +4,12 @@ import com.fangjia.script.BaseBatch import com.fangjia.script.BatchOwner import com.fangjia.script.Watcher import com.fangjia.script.ccbevaluation.CcbCommonUtils +import com.fangjia.script.ccbevaluation.CcbFtpTestUtils import com.fangjia.script.ccbevaluation.CcbFtpUtils import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.gj.ccb.FileUtils import com.fangjia.script.util.DateUtils +import com.jcraft.jsch.ChannelSftp import groovy.sql.Sql import java.sql.ResultSet @@ -18,6 +20,10 @@ class ExportDistrictRongHe extends BaseBatch{ def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") + + def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse", + "postgres", "postgres", "org.postgresql.Driver") + static main(args) { runBatch(new ExportDistrictRongHe(), args); } @@ -27,11 +33,19 @@ class ExportDistrictRongHe extends BaseBatch{ @Override void process(Object args) { + def queryDate = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM").toInteger() + def houseStartDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -1), "yyyy-MM-dd") + + citys = CcbCommonUtils.getRunningCitys(args) + def lastMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); + def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), 0, "yyyyMM")); def curDate = DateUtils.formatDateByPattern(new Date()+1, "yyyyMMdd") def new_dists = []//["350604","350605","410307","410308","450181"] - //按天导(æ¯�天一个文件夹) - exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-1), "yyyy-MM-dd"), new_dists) + + //°´Ììµ¼£¨Ã¿ÌìÒ»¸öÎļþ¼Ð£© +// exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd"), new_dists) + exportPgBigdataDealFJW(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd"), new_dists) if(curDate.toString().endsWith("10")){ exportBigdataCommunityGJRH()// @@ -49,12 +63,37 @@ class ExportDistrictRongHe extends BaseBatch{ exportBigdataBuildprojFjw() exportBigdataCommlayoutpicFjw() exportEvaluateRate() + + exportBigdataCityPrice(queryDate) + exportBigdataDistPrice(queryDate) + exportBigdataCommPrice(queryDate) + //1ÔÂ10ÈÕ ÐÂÔö5ÕÅ±í£¬µ¼92³Ç£¬ÔöÁ¿Êý¾Ý£¬2ÔÂ10ÈÕµ¼344³Ç£¬ÆäÖÐ252³ÇËùÓÐÀúÊ·Êý¾Ý£¬92³ÇÔöÁ¿£¬3Ôºó¿ÉÄܲ»ÓÃÌṩÊý¾Ý +// exportCommunityBasePrice(lastMonth) +// exportCommunityPdescribeGj(lastMonth) +// exportGuideStatistics(lastMonth) +// exportBigdataSupplierStatistics(lastMonth) +// exportBigdataModelingBase(lastMonth) + + //2ÔÂ8ºÅ ÁÙʱµ¼³öËÕÖÝÒ»ÄêµÄÊý¾Ý + exportPgBigdataForsale(houseStartDate,DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()), "yyyy-MM-dd"),new_dists)//Èںϰ´·¢²¼Ê±¼äµ¼£¬¹ÀÖµ°´updatetimeµ¼³ö } + + if(curDate.toString().endsWith("28")){ + exportPgBigdataSupplierStatistics(curMonth) + //ÒòΪÈÚºÏÔݲ»Çп⣬ËùÒÔÐèÒª¼Ó´«Ò»ÕŵÚÈý·½¾ù¼Û±íµ½ÈÚºÏÖУ¬ ´Ó1ÔÂ10ÈÕ¿ªÊ¼´«Ê䣬³¤ÆÚ¹© + def thirdPartyMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); +// exportThirdPartyPrice2(thirdPartyMonth, new_dists) + exportPgThirdPartyPrice2(thirdPartyMonth, new_dists) + exportPgCommunityBasePrice(curMonth) + exportPgCommunityPdescribeGj(curMonth) + exportPgBigdataModelingBase(curMonth) + exportPgGuideStatistics(curMonth) + } + SSHHelper jschCommand = new SSHHelper(); System.out.println(jschCommand.executeCommand("sh /home/ccb_rh/output/rh_package.sh ${curDate}")); exportOk(curDate) - } // @@ -63,14 +102,14 @@ class ExportDistrictRongHe extends BaseBatch{ // def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() // // -//// //检查ok文件是å�¦ä¸Šä¼  +//// //¼ì²éokÎļþÊÇ·ñÉÏ´« //// exportAllBigdataDealFJW() //// for(def city : citys) { //// def cityCode = cityCodeDataMap.get(city) //// -// //按天导(一个文件夹下) +// //°´Ììµ¼(Ò»¸öÎļþ¼ÐÏÂ) // //exportBigdataDealFJW(DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-2), "yyyy-MM-dd")) -// //按天导(æ¯�天一个文件夹) +// //°´Ììµ¼£¨Ã¿ÌìÒ»¸öÎļþ¼Ð£© // exportBigdataDealFJW2(DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-2), "yyyy-MM-dd")) // //// exportBigdataCommunityGJRH(cityCode) @@ -103,7 +142,7 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\æ•°æ�®\\建行\\房产估值\\æ•°æ�®æ–‡ä»¶\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" } def index = 0 for(def city : citys){ @@ -145,9 +184,9 @@ class ExportDistrictRongHe extends BaseBatch{ } } - println "BIGDATA_COMMUNITY_FJW æ•°æ�®æ–‡ä»¶è¾“出完æˆ�......" + println "BIGDATA_COMMUNITY_FJW Êý¾ÝÎļþÊä³öÍê³É......" CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMUNITY_FJW 上传Ftp完æˆ�......" + println "BIGDATA_COMMUNITY_FJW ÉÏ´«FtpÍê³É......" } def exportBigdataCommbuildstruGJ(){ def allRows = [] @@ -170,11 +209,11 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\æ•°æ�®\\建行\\房产估值\\æ•°æ�®æ–‡ä»¶\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMBUILDSTRU_FJW 上传Ftp完æˆ�......" + println "BIGDATA_COMMBUILDSTRU_FJW ÉÏ´«FtpÍê³É......" } def exportBigdataCommhousetypeGJ(){ @@ -199,11 +238,11 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\æ•°æ�®\\建行\\房产估值\\æ•°æ�®æ–‡ä»¶\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMHOUSETYPE_FJW 上传Ftp完æˆ�......" + println "BIGDATA_COMMHOUSETYPE_FJW ÉÏ´«FtpÍê³É......" } def exportBigdataCommbuildyearGj(){ @@ -227,11 +266,11 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\æ•°æ�®\\建行\\房产估值\\æ•°æ�®æ–‡ä»¶\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh", fileName, curDate) - println "BIGDATA_COMMBUILDYEAR_FJW 上传Ftp完æˆ�......" + println "BIGDATA_COMMBUILDYEAR_FJW ÉÏ´«FtpÍê³É......" } def exportBigdataCommfeeGj(){ @@ -265,11 +304,11 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\æ•°æ�®\\建行\\房产估值\\æ•°æ�®æ–‡ä»¶\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMFEE_FJW 上传Ftp完æˆ�......" + println "BIGDATA_COMMFEE_FJW ÉÏ´«FtpÍê³É......" } @@ -295,11 +334,11 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\æ•°æ�®\\建行\\房产估值\\æ•°æ�®æ–‡ä»¶\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMHOUSEUSE_FJW 上传Ftp完æˆ�......" + println "BIGDATA_COMMHOUSEUSE_FJW ÉÏ´«FtpÍê³É......" } def exportBigdataPositionGJ(){ @@ -328,11 +367,11 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\æ•°æ�®\\建行\\房产估值\\æ•°æ�®æ–‡ä»¶\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_POSITION_FJW 上传Ftp完æˆ�......" + println "BIGDATA_POSITION_FJW ÉÏ´«FtpÍê³É......" } def exportBigdataDistrictFJW(){ @@ -360,11 +399,11 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\æ•°æ�®\\建行\\房产估值\\æ•°æ�®æ–‡ä»¶\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh", fileName, curDate) - println "BIGDATA_DISTRICT_FJW 上传Ftp完æˆ�......" + println "BIGDATA_DISTRICT_FJW ÉÏ´«FtpÍê³É......" } def exportBigdataAliasFJW(){ @@ -395,11 +434,11 @@ class ExportDistrictRongHe extends BaseBatch{ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\æ•°æ�®\\建行\\房产估值\\æ•°æ�®æ–‡ä»¶\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "ADDRESS_ALIAS_FJW 上传Ftp完æˆ�......" + println "ADDRESS_ALIAS_FJW ÉÏ´«FtpÍê³É......" } def exportBigdataDealFJW(dealdate){ @@ -419,7 +458,7 @@ class ExportDistrictRongHe extends BaseBatch{ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\æ•°æ�®\\建行\\房产估值\\æ•°æ�®æ–‡ä»¶\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat" } def allRows = [] @@ -504,7 +543,7 @@ class ExportDistrictRongHe extends BaseBatch{ } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh", fileName, curDate) - println "BIGDATA_DEAL_FJW 上传Ftp完æˆ�......${curStartStr}" + println "BIGDATA_DEAL_FJW ÉÏ´«FtpÍê³É......${curStartStr}" def curEndStr = DateUtils.add(curStartStr, 1) curStartDateStr = curEndStr } @@ -519,14 +558,14 @@ class ExportDistrictRongHe extends BaseBatch{ def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\æ•°æ�®\\建行\\房产估值\\æ•°æ�®æ–‡ä»¶\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" } def allRows = [] for(def city : citys) { def cityCode = cityCodeMap.get(city) - if(curDate.toString().endsWith("28")){ + if(curDate.toString().endsWith("10")){ if(new_dists){ def newstr = "('"+new_dists.join("','")+"')" def sql1 = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ " + @@ -541,14 +580,54 @@ class ExportDistrictRongHe extends BaseBatch{ allRows.addAll(rets2) }else{ def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ where CITYID='${cityCode}' and dealdate>=to_date('${startDateStr}','yyyy-MM-dd') and dealdate<=to_date('${endDateStr}','yyyy-MM-dd')";// - allRows = createDeal(sql) + allRows.addAll(createDeal(sql)) } } } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_DEAL_FJW 上传Ftp完æˆ�......${endDateStr}" + println "BIGDATA_DEAL_FJW ÉÏ´«FtpÍê³É......${endDateStr}" + } + + def exportPgBigdataDealFJW(curDate, dealdate, new_dists){ + + def startDateStr = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd") + def endDateStr = DateUtils.formatDateByPattern(DateUtils.getLastDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd") + + + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + } + + def allRows = [] + + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + if(curDate.toString().endsWith("10")){ + if(new_dists){ + def newstr = "('"+new_dists.join("','")+"')" + def sql1 = "select urbn_id,gujia_bds_mdl_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_str,gujia_hsno,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_bds_wbt_floor,gujia_lyr_tp_val,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_bds_trdtckt_prc,gujia_bds_mdl_tot_prc,gujia_bds_dcl_tot_prc,gujiabds_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_bds_mdl_cyc,gujiawthrext_lift_ind,gujiabdslndfgrngvarea,gujiabdslutbl_gv_area,gujiabdssuntblgv_area,gujiabdsbayindowgarea,gujiabdstowerfrgvarea,gujia_bds_grg_gv_area,gujiabdsundgdrmgvarea,gujiabds_othr_gv_area,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_bds_mkdam,gujia_bds_data_tm_val " + + "from base.t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and txn_dt>=to_date('${dealdate}','yyyy-MM-dd') and gujia_admndiv_id not in ${newstr}" + def rets1 = dealData(sql1) + + def sql2 = "select urbn_id,gujia_bds_mdl_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_str,gujia_hsno,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_bds_wbt_floor,gujia_lyr_tp_val,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_bds_trdtckt_prc,gujia_bds_mdl_tot_prc,gujia_bds_dcl_tot_prc,gujiabds_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_bds_mdl_cyc,gujiawthrext_lift_ind,gujiabdslndfgrngvarea,gujiabdslutbl_gv_area,gujiabdssuntblgv_area,gujiabdsbayindowgarea,gujiabdstowerfrgvarea,gujia_bds_grg_gv_area,gujiabdsundgdrmgvarea,gujiabds_othr_gv_area,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_bds_mkdam,gujia_bds_data_tm_val " + + "from base.t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and gujia_admndiv_id in ${newstr}" + def rets2 = dealData(sql2) + allRows.addAll(rets1) + allRows.addAll(rets2) + }else{ + def sql = "select urbn_id,gujia_bds_mdl_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_str,gujia_hsno,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_bds_wbt_floor,gujia_lyr_tp_val,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_bds_trdtckt_prc,gujia_bds_mdl_tot_prc,gujia_bds_dcl_tot_prc,gujiabds_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_bds_mdl_cyc,gujiawthrext_lift_ind,gujiabdslndfgrngvarea,gujiabdslutbl_gv_area,gujiabdssuntblgv_area,gujiabdsbayindowgarea,gujiabdstowerfrgvarea,gujia_bds_grg_gv_area,gujiabdsundgdrmgvarea,gujiabds_othr_gv_area,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_bds_mkdam,gujia_bds_data_tm_val " + + "from base.t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and txn_dt>='${dealdate}'"; + allRows.addAll(dealData(sql)) + } + } + } + + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpUtils.ftpUpload("rh",fileName, curDate) + println "BIGDATA_DEAL_FJW ÉÏ´«FtpÍê³É......${endDateStr}" } def createDeal(sql){ @@ -630,6 +709,87 @@ class ExportDistrictRongHe extends BaseBatch{ return allRows; } + def dealData(def sql){ + def allRows = [] + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.urbn_id + data << r.gujia_bds_mdl_id + data << r.urbn_nm + data << r.gujia_admndiv_id + data << r.gujia_admndiv_nm + data << r.gujia_str + data << r.gujia_hsno + data << r.gujia_comm_id + data << r.comm_nm + data << r.gujia_bld_id + data << r.bld_id + data << r.gujia_bld_nm + data << r.gujia_unit_id + data << r.unit_id + data << r.gujia_unit_nm + data << r.gujia_acc_id + data << r.gujia_dtl_adr + data << r.gujia_bds_bld_yr_rc + data << r.gujia_own_val + data << r.gujia_own_yrlmt_val + data << r.gujia_prd_val + data << r.gujia_bds_wbt_floor + data << r.gujia_lyr_tp_val + data << r.gujiabdstot_floor_num + if(r.gujia_bld_tp_val){ + def arrs = r.gujia_bld_tp_val.replace("[","").replace("]","").split(",") + data << arrs[0].trim() + }else{ + data << '' + } + + data << r.gujia_bld_stc + data << r.guiabconstructionarea + data << r.gujiabdsset_innr_area + data << r.gujia_acc_tp_val + data << r.gujia_bds_room_num + data << r.gujia_bds_dept_num + data << r.gujia_bds_ktch_num + data << r.gujia_bds_hlt_btw_num + data << r.gujia_hs_use + data << r.gujia_indr_stc_val + data << r.gujia_twrd_val + data << r.gujia_dcrt_sttn + data << r.gujia_ases_bt_ln_num + data << r.gujia_bds_trdtckt_prc + data << r.gujia_bds_mdl_tot_prc + data << r.gujia_bds_dcl_tot_prc + data << r.gujiabds_ases_tot_prc + data << r.gujiasigntonlinectrid + data << r.txn_dt + data << r.gujia_txn_tp_val + data << r.gujia_sell_pymtmod + data << r.gujia_bds_mdl_cyc + data << r.gujiawthrext_lift_ind + data << r.gujiabdslndfgrngvarea + data << r.gujiabdslutbl_gv_area + data << r.gujiabdssuntblgv_area + data << r.gujiabdsbayindowgarea + data << r.gujiabdstowerfrgvarea + data << r.gujia_bds_grg_gv_area + data << r.gujiabdsundgdrmgvarea + data << r.gujiabds_othr_gv_area + data << r.gujia_hs_src_dtsrc + data << r.intr_co_id + data << r.intr_co_nm + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co +// data << r.gujia_bds_mkdam + data << r.gujia_bds_data_tm_val + allRows << data + }); + return allRows + } + + def exportAllBigdataDealFJW(){ def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ where DEALDATE0){ + index = index + 1 + if(index==1){ + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + }else{ + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true); + } + } + } + + println "BIGDATA_THIRD_PARTY_PRICE_GJ Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpUtils.ftpUpload('rh', fileName, curDate) + } + + + def exportPgThirdPartyPrice2(price_date, new_dists){ + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM") + "28"; + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" + if (CommonDatautils.isWindow()) { + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_THIRD_PARTY_PRICE_GJ_ADD_${curDate}_0001.dat" + } + def headers = [] + def index = 0 + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def allRows = [] + if(new_dists) { + def newstr = "('"+new_dists.join("','")+"')" + def sql1 = "select gujia_trdpt_avprc_id,urbn_id,gujia_admndiv_id,gujia_bds_id,comm_nm,gujia_dtsr_id,gujia_dtsr_dsc,gujiabds_avprc_dt_val,gujia_bds_comm_avprc,gujiabdscomm_hgst_prc,gujiabdscomm_lwst_prc,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from base.t0831_bigdata_third_party_price_gj_h where " + + "urbn_id='${cityCode}' and gujiabds_avprc_dt_val=${price_date} and gujia_admndiv_id not in ${newstr} "; + def rets1 = getPgThirdPartyDatas(sql1) + allRows.addAll(rets1) + + def sql2 = "select gujia_trdpt_avprc_id,urbn_id,gujia_admndiv_id,gujia_bds_id,comm_nm,gujia_dtsr_id,gujia_dtsr_dsc,gujiabds_avprc_dt_val,gujia_bds_comm_avprc,gujiabdscomm_hgst_prc,gujiabdscomm_lwst_prc,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from base.t0831_bigdata_third_party_price_gj_h where " + + "urbn_id='${cityCode}' and gujia_admndiv_id in ${newstr} "; + def rets2 = getPgThirdPartyDatas(sql2) + allRows.addAll(rets2) + }else{ + def sql = "select gujia_trdpt_avprc_id,urbn_id,gujia_admndiv_id,gujia_bds_id,comm_nm,gujia_dtsr_id,gujia_dtsr_dsc,gujiabds_avprc_dt_val,gujia_bds_comm_avprc,gujiabdscomm_hgst_prc,gujiabdscomm_lwst_prc,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm from base.t0831_bigdata_third_party_price_gj_h where urbn_id='${cityCode}' and gujiabds_avprc_dt_val='${price_date}' "; + allRows = getPgThirdPartyDatas(sql) + } + if(allRows && allRows.size()>0){ + index = index + 1 + if(index==1){ + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + }else{ + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true); + } + } + } + + println "BIGDATA_THIRD_PARTY_PRICE_GJ Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpUtils.ftpUpload('rh', fileName, curDate) + } + + def getPgThirdPartyDatas(def sql){ + def allRows = [] + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_trdpt_avprc_id + data << r.urbn_id + data << r.gujia_admndiv_id + data << r.gujia_bds_id + data << r.comm_nm + data << r.gujia_dtsr_id + data << r.gujia_dtsr_dsc + data << r.gujiabds_avprc_dt_val + data << r.gujia_bds_comm_avprc + data << r.gujiabdscomm_hgst_prc + data << r.gujiabdscomm_lwst_prc + data << r.data_udt_tm + allRows << data + }) + return allRows; + } + + + def getThirdPartyDatas(def sql){ + def allRows = [] + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.ID + data << r.CITYID + data << r.DISTID + data << r.COMMID + data << r.COMMNAME + data << r.DATA_SOURCE_ID + data << r.DATA_SOURCE + data << r.PRICE_DATE + data << r.COMMUNITY_PRICE + data << r.COMMUNITY_MAX_PRICE + data << r.COMMUNITY_MIN_PRICE + data << r.UPDATETIME + allRows << data + }) + return allRows; } def exportBigdataBuildprojFjw(){ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\æ•°æ�®\\建行\\房产估值\\æ•°æ�®æ–‡ä»¶\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile([], fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_BUILDPROJ_FJW 上传Ftp完æˆ�......" + println "BIGDATA_BUILDPROJ_FJW ÉÏ´«FtpÍê³É......" } + def exportCommunityBasePrice(yearMonth){ + + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = null; + if(CcbCommonUtils.citys_92.contains(city)){ + sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, COMMID, COMMNAME, YEAR_MONTH, CALC_AVG_PRICE, AVG_PRICE, CALC_TYPE, FAKE_RATE, DIFF_RATE, CONFI_RATE, CORR_RATE, CONFIDENCE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from community_base_price_gj where year_month=${yearMonth} AND CITYID='${cityCode}'"; + }else{ + sql = "select ID, CITYID, CITYNAME, DISTID, DISTNAME, COMMID, COMMNAME, YEAR_MONTH, CALC_AVG_PRICE, AVG_PRICE, CALC_TYPE, FAKE_RATE, DIFF_RATE, CONFI_RATE, CORR_RATE, CONFIDENCE, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from community_base_price_gj where CITYID='${cityCode}'"; + } + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.ID + data << r.CITYID + data << r.CITYNAME + data << r.DISTID + data << r.DISTNAME + data << r.COMMID + data << r.COMMNAME + data << r.YEAR_MONTH + data << r.CALC_AVG_PRICE + data << r.AVG_PRICE + data << r.CALC_TYPE + data << r.FAKE_RATE + data << r.DIFF_RATE + data << r.CONFI_RATE + data << r.CORR_RATE + data << r.CONFIDENCE + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + } + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" + } + def headers = [] + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + println "COMMUNITY_BASE_PRICE_GJNB Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpUtils.ftpUpload("rh", fileName, curDate) + println "COMMUNITY_BASE_PRICE_GJNB ÉÏ´«FtpÍê³É......" + } + + def exportPgCommunityBasePrice(yearMonth){ + + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select gujia_bss_prc_id,urbn_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_bds_id,comm_nm,gujiabds_clc_yrmo_val,gujia_bds_clc_avprc,gujia_comm_basic_prc,gujia_bds_clmtd,gujiabds_fwd_samp_rto,gujia_bds_mns_grd,gujia_bds_cfdrg,gujiabdsarndcmprccrlt,gujia_bds_cfdc_dgr,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co from t_app_p9pha_plda.avm_community_base_price_gj_h where gujiabds_clc_yrmo_val=${yearMonth} AND urbn_id='${cityCode}'";// + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_bss_prc_id + data << r.urbn_id + data << r.urbn_nm + data << r.gujia_admndiv_id + data << r.gujia_admndiv_nm + data << r.gujia_bds_id + data << r.comm_nm + data << r.gujiabds_clc_yrmo_val + data << r.gujia_bds_clc_avprc + data << r.gujia_comm_basic_prc + data << r.gujia_bds_clmtd + data << r.gujiabds_fwd_samp_rto + data << r.gujia_bds_mns_grd + data << r.gujia_bds_cfdrg + data << r.gujiabdsarndcmprccrlt + data << r.gujia_bds_cfdc_dgr + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co + allRows << data + }); + } + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_COMMUNITY_BASE_PRICE_GJNB_ADD_${curDate}_0001.dat" + } + def headers = [] + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + println "COMMUNITY_BASE_PRICE_GJNB Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpUtils.ftpUpload("rh", fileName, curDate) + println "COMMUNITY_BASE_PRICE_GJNB ÉÏ´«FtpÍê³É......" + } + + + def exportCommunityPdescribeGj(month){ + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" + } + def headers = [] + def allRows = [] + + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = null; + if(CcbCommonUtils.citys_92.contains(city)){ + sql = "select ID,COMMUNITY_ID,CITYID ,CITY_NAME,DISTRICT_CODE ,DISTRICT_NAME,COMMUNITY_NAME,PQ_NAME,BASE_PRICE,CONFIDENCE_LEVEL,CNT,MIN_PRICE,MEDIANPRICE,MEANPRICE,MAX_PRICE,TIME,FIRSTDATAT,THIRDDATA,RELATIVEERROR,SKEWNESS,PQ_PRICE_RANGE,DISTRICT_PRICE_RANGE ,DESCRIPTION,PRIV_BASE_PRICE,IS_ARTTFICIAL,PRIV_FINAL_PRICE,to_char(CREATE_DATE,'yyyy-mm-dd') as CREATE_DATE,PRICE,PRICE_SOURCE,CASE_MD_PRICE,CASE_AVG_PRICE,INDEX_LABEL,MAIN_PROPERTY,COMMTYPE,NEW_DEAL_PRICE,to_char(NEW_DEAL_DATE,'yyyy-mm-dd') as NEW_DEAL_DATE,PRICE_MOM_RATIO,MAX_MOM_RATIO,PRICE_YOY_RATIO ,SATUR_RATIO,NEIGHBOR_PRICE from community_p_describe_gj where time=${month} AND CITYID='${cityCode}'"; + }else{ + sql = "select ID,COMMUNITY_ID,CITYID ,CITY_NAME,DISTRICT_CODE ,DISTRICT_NAME,COMMUNITY_NAME,PQ_NAME,BASE_PRICE,CONFIDENCE_LEVEL,CNT,MIN_PRICE,MEDIANPRICE,MEANPRICE,MAX_PRICE,TIME,FIRSTDATAT,THIRDDATA,RELATIVEERROR,SKEWNESS,PQ_PRICE_RANGE,DISTRICT_PRICE_RANGE ,DESCRIPTION,PRIV_BASE_PRICE,IS_ARTTFICIAL,PRIV_FINAL_PRICE,to_char(CREATE_DATE,'yyyy-mm-dd') as CREATE_DATE,PRICE,PRICE_SOURCE,CASE_MD_PRICE,CASE_AVG_PRICE,INDEX_LABEL,MAIN_PROPERTY,COMMTYPE,NEW_DEAL_PRICE,to_char(NEW_DEAL_DATE,'yyyy-mm-dd') as NEW_DEAL_DATE,PRICE_MOM_RATIO,MAX_MOM_RATIO,PRICE_YOY_RATIO ,SATUR_RATIO,NEIGHBOR_PRICE from community_p_describe_gj where CITYID='${cityCode}'"; + } + + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.ID + data << r.COMMUNITY_ID + data << r.CITYID + data << r.CITY_NAME + data << r.DISTRICT_CODE + data << r.DISTRICT_NAME + data << r.COMMUNITY_NAME + data << r.PQ_NAME + data << r.BASE_PRICE + data << r.CONFIDENCE_LEVEL + data << r.CNT + data << r.MIN_PRICE + data << r.MEDIANPRICE + data << r.MEANPRICE + data << r.MAX_PRICE + data << r.TIME + data << r.FIRSTDATAT + data << r.THIRDDATA + data << r.RELATIVEERROR + data << r.SKEWNESS + data << r.PQ_PRICE_RANGE + data << r.DISTRICT_PRICE_RANGE + data << r.DESCRIPTION + data << r.PRIV_BASE_PRICE + data << r.IS_ARTTFICIAL + data << r.PRIV_FINAL_PRICE + data << r.CREATE_DATE + data << r.PRICE + data << r.PRICE_SOURCE + data << r.CASE_MD_PRICE + data << r.CASE_AVG_PRICE + data << r.INDEX_LABEL + data << r.MAIN_PROPERTY + data << r.COMMTYPE + data << r.NEW_DEAL_PRICE + data << r.NEW_DEAL_DATE + data << r.PRICE_MOM_RATIO + data << r.MAX_MOM_RATIO + data << r.PRICE_YOY_RATIO + data << r.SATUR_RATIO + data << r.NEIGHBOR_PRICE + allRows << data + }); + } + println allRows.size() + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + + println "community_p_describe_gj Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpUtils.ftpUpload("rh", fileName, curDate) + println "community_p_describe_gj ÉÏ´«FtpÍê³É......" + } + + + def exportPgCommunityPdescribeGj(month){ + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_COMMUNITY_P_DESCRIBE_GJ_ADD_${curDate}_0001.dat" + } + def headers = [] + def allRows = [] + + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select gujia_fsid,gujia_comm_id,urbn_id,urbn_nm,admndiv_ecd,gujia_admndiv_nm,comm_nm,gujia_als_dsc,gujia_bds_bss_prc,gujiabds_cfdc_dgr_grd,gujiabdsrt3mlgcasenum,gujiabdslistgclwstprc,gujiabdslistgcaemdval,gujiabdslistgcase_avg,gujiabdslistgcemaxprc,gujia_bds_mo_val,gujiabdsavgwminvalavg,gujiabdsavgwmaxvalavg,gujia_bds_rel_err_val,gujia_dvtdgr_dsc,gujia_als_prc_rng,gujiaprcminandmax_rng,gujia_dsc,gujiabds_lmth_bss_prc,gujiabds_wthr_mnl_val,gujiabds_lmth_fnl_prc,to_char(data_crt_tm,'yyyy-mm-dd') as data_crt_tm,gujiabdsnervetuntwprc,gujia_prc_src,gujiabdsabtjlcmbitval,gujiabdsabtjlgcaseavg,gujia_indx_lbl,gujia_prim_pty_tp,gujia_comm_tp_val,gujiabds_ltst_mdl_prc,to_char(gujia_ltst_mdl_dt,'yyyy-mm-dd') as gujia_ltst_mdl_dt,gujiabdsidxnmo_moonmo,gujiabdsa1yiminmmonmo,gujiabdsidxnyr_moonmo,gujiabdsat1yspdgrscor,gujiabdsarnd1kscavprc from t_app_p9pha_plda.avm_community_p_describe_gj_h where gujia_bds_mo_val=${month} AND urbn_id='${cityCode}'"; + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_fsid + data << r.gujia_comm_id + data << r.urbn_id + data << r.urbn_nm + data << r.admndiv_ecd + data << r.gujia_admndiv_nm + data << r.comm_nm + data << r.gujia_als_dsc + data << r.gujia_bds_bss_prc + data << r.gujiabds_cfdc_dgr_grd + data << r.gujiabdsrt3mlgcasenum + data << r.gujiabdslistgclwstprc + data << r.gujiabdslistgcaemdval + data << r.gujiabdslistgcase_avg + data << r.gujiabdslistgcemaxprc + data << r.gujia_bds_mo_val + data << r.gujiabdsavgwminvalavg + data << r.gujiabdsavgwmaxvalavg + data << r.gujia_bds_rel_err_val + data << r.gujia_dvtdgr_dsc + data << r.gujia_als_prc_rng + data << r.gujiaprcminandmax_rng + data << r.gujia_dsc + data << r.gujiabds_lmth_bss_prc + data << r.gujiabds_wthr_mnl_val + data << r.gujiabds_lmth_fnl_prc + data << r.data_crt_tm + data << r.gujiabdsnervetuntwprc + data << r.gujia_prc_src + data << r.gujiabdsabtjlcmbitval + data << r.gujiabdsabtjlgcaseavg + data << r.gujia_indx_lbl + data << r.gujia_prim_pty_tp + data << r.gujia_comm_tp_val + data << r.gujiabds_ltst_mdl_prc + data << r.gujia_ltst_mdl_dt + data << r.gujiabdsidxnmo_moonmo + data << r.gujiabdsa1yiminmmonmo + data << r.gujiabdsidxnyr_moonmo + data << r.gujiabdsat1yspdgrscor + data << r.gujiabdsarnd1kscavprc + allRows << data + }); + } + println allRows.size() + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + + println "community_p_describe_gj Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpUtils.ftpUpload("rh", fileName, curDate) + println "community_p_describe_gj ÉÏ´«FtpÍê³É......" + } + + def exportGuideStatistics(time){ + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_GUIDE_STATISTICS_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_GUIDE_STATISTICS_ADD_${curDate}_0001.dat" + } + def headers = [] + def allRows = [] + + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = null; + if(CcbCommonUtils.citys_92.contains(city)){ + sql = "select MODEL_TYPE,CITYID,CITYNAME,YEAR_MONTH,COMM_SUM_COUNT,COMM_COUNT,RATIO,TYPE from GUIDE_STATISTICS where cityid='${cityCode}' and year_month=${time}"; + }else{ + sql = "select MODEL_TYPE,CITYID,CITYNAME,YEAR_MONTH,COMM_SUM_COUNT,COMM_COUNT,RATIO,TYPE from GUIDE_STATISTICS where cityid='${cityCode}'"; + } + + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.MODEL_TYPE + data << r.CITYID + data << r.CITYNAME + data << r.YEAR_MONTH + data << r.COMM_SUM_COUNT + data << r.COMM_COUNT + data << r.RATIO + data << r.TYPE + allRows << data + }); + } + println allRows.size() + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + + println "guide_statistics Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpUtils.ftpUpload("rh", fileName, curDate) + println "guide_statistics ÉÏ´«FtpÍê³É......" + } + + + def exportPgGuideStatistics(time){ + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_GUIDE_STATISTICS_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_GUIDE_STATISTICS_ADD_${curDate}_0001.dat" + } + def headers = [] + def allRows = [] + + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "SELECT * FROM t_app_p9pha_plda.avm_guide_statistics where gujia_clc_yrmo='${time}' and urbn_id='${cityCode}'"; + + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.gujia_model_type + data << r.urbn_id + data << r.urbn_nm + data << r.gujia_clc_yrmo + data << r.gujia_comm_sum_count + data << r.gujia_comm_count + data << r.gujia_ratio + data << r.gujia_type + allRows << data + }); + } + println allRows.size() + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + + println "guide_statistics Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpUtils.ftpUpload("rh", fileName, curDate) + println "guide_statistics ÉÏ´«FtpÍê³É......" + } + + + def exportPgBigdataSupplierStatistics(time){ + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_SUPPLIER_STATISTICS_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_SUPPLIER_STATISTICS_ADD_${curDate}_0001.dat" + } + def headers = [] + def allRows = [] + + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "SELECT * FROM t_app_p9pha_plda.avm_bigdata_supplier_statistics WHERE gujia_clc_yrmo='${time}' and urbn_id='${cityCode}'"; + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.urbn_id + data << r.urbn_nm + data << r.gujia_clc_yrmo + data << r.gujia_data_sour + data << r.gujia_third_comm_count + data << r.gujia_model_type + allRows << data + }); + } + println allRows.size() + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + + println "bigdata_supplier_statistics Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpUtils.ftpUpload("rh", fileName, curDate) + println "bigdata_supplier_statistics ÉÏ´«FtpÍê³É......" + } + + + def exportBigdataSupplierStatistics(time){ + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_SUPPLIER_STATISTICS_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_SUPPLIER_STATISTICS_ADD_${curDate}_0001.dat" + } + def headers = [] + def allRows = [] + + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = null; + if(CcbCommonUtils.citys_92.contains(city)){ + sql = "select CITYID,CITYNAME,YEAR_MONTH,DATA_SOURCE,THIRD_COMM_COUNT,MODEL_TYPE from BIGDATA_SUPPLIER_STATISTICS where cityid='${cityCode}' and year_month=${time}"; + }else{ + sql = "select CITYID,CITYNAME,YEAR_MONTH,DATA_SOURCE,THIRD_COMM_COUNT,MODEL_TYPE from BIGDATA_SUPPLIER_STATISTICS where cityid='${cityCode}'"; + } + + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.CITYID + data << r.CITYNAME + data << r.YEAR_MONTH + data << r.DATA_SOURCE + data << r.THIRD_COMM_COUNT + data << r.MODEL_TYPE + allRows << data + }); + } + println allRows.size() + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + + println "bigdata_supplier_statistics Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpUtils.ftpUpload("rh", fileName, curDate) + println "bigdata_supplier_statistics ÉÏ´«FtpÍê³É......" + } + + + def exportBigdataModelingBase(time){ + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_MODELING_BASE_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_MODELING_BASE_ADD_${curDate}_0001.dat" + } + def headers = [] + def allRows = [] + + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = null; + if(CcbCommonUtils.citys_92.contains(city)){ + sql = "select CITY_CODE,CITYNAME,YEAR_MONTH,ESTIMATE_DEAL_COUNT,ESTIMATE_COMM_COUNT,DEAL_COUNT,DEAL_COMM_COUNT,SALE_COUNT,SALE_COMM_COUNT,MODEL_TYPE,TYPE from BIGDATA_MODELING_BASE where city_code='${cityCode}' and year_month=${time}"; + }else{ + sql = "select CITY_CODE,CITYNAME,YEAR_MONTH,ESTIMATE_DEAL_COUNT,ESTIMATE_COMM_COUNT,DEAL_COUNT,DEAL_COMM_COUNT,SALE_COUNT,SALE_COMM_COUNT,MODEL_TYPE,TYPE from BIGDATA_MODELING_BASE where city_code='${cityCode}'"; + } + + sqlInstance.eachRow(sql, { r -> + def data = [] + data << r.CITY_CODE + data << r.CITYNAME + data << r.YEAR_MONTH + data << r.ESTIMATE_DEAL_COUNT + data << r.ESTIMATE_COMM_COUNT + data << r.DEAL_COUNT + data << r.DEAL_COMM_COUNT + data << r.SALE_COUNT + data << r.SALE_COMM_COUNT + data << r.MODEL_TYPE + data << r.TYPE + allRows << data + }); + } + println allRows.size() + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + + println "bigdata_modeling_base Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpUtils.ftpUpload("rh", fileName, curDate) + println "bigdata_modeling_base ÉÏ´«FtpÍê³É......" + } + + def exportPgBigdataModelingBase(time){ + + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"28" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_MODELING_BASE_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_MODELING_BASE_ADD_${curDate}_0001.dat" + } + def headers = [] + def allRows = [] + + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select * from t_app_p9pha_plda.avm_bigdata_modeling_base_gj where gujia_clc_yrmo='${time}' and urbn_id='${cityCode}'"; + + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.urbn_id + data << r.urbn_nm + data << r.gujia_clc_yrmo + data << r.gujia_esti_deal_ct + data << r.gujia_esti_comm_ct + data << r.gujia_deal_ct + data << r.gujia_deal_comm_ct + data << r.gujia_sale_ct + data << r.gujia_sale_comm_ct + data << r.gujia_model_type + data << r.gujia_clean_type + allRows << data + }); + } + println allRows.size() + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + + println "bigdata_modeling_base Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpUtils.ftpUpload("rh", fileName, curDate) + println "bigdata_modeling_base ÉÏ´«FtpÍê³É......" + } + + def exportBigdataCityPrice(queryDate){ + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_CITYPRICE_FJW_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_CITYPRICE_FJW_ADD_${curDate}_0001.dat" + } + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + // def sql = "select CITYID, YMID, SALEPRICE,RENTPRICE,SALECOUNT,RENTCOUNT, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, HOUSEUSE,SALEBLDGAREA,RENTBLDGAREA,SALETOTALPRICE,RENTTOTALPRICE,DATATYPE,SDATERANGE,RDATERANGE,SOURCECODE from BIGDATA_CITYPRICE where CITYID='${cityCode}' and YMID=${queryDate}";// + def sql = "select CITYID, YMID, SALEPRICE,RENTPRICE,SALECOUNT,RENTCOUNT, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, HOUSEUSE,SALEBLDGAREA,RENTBLDGAREA,SALETOTALPRICE,RENTTOTALPRICE,DATATYPE,SDATERANGE,RDATERANGE,SOURCECODE from BIGDATA_CITYPRICE_FJW where CITYID='${cityCode}' and YMID=${queryDate}";// + + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.YMID + data << r.SALEPRICE?r.SALEPRICE:'' + data << r.RENTPRICE?r.RENTPRICE:'' + if(r.SALECOUNT>0) { + data << r.SALECOUNT + }else{ + data << '' + } + if(r.RENTCOUNT>0){ + data << r.RENTCOUNT + }else{ + data << '' + } + data << r.UPDATETIME + data << r.HOUSEUSE + data << r.SALEBLDGAREA?r.SALEBLDGAREA:'' + data << r.RENTBLDGAREA?r.RENTBLDGAREA:'' + data << r.SALETOTALPRICE?r.SALETOTALPRICE:'' + data << r.RENTTOTALPRICE?r.RENTTOTALPRICE:'' + data << r.DATATYPE + data << r.SDATERANGE + data << r.RDATERANGE + data << r.SOURCECODE + allRows << data + }); + } + + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpUtils.ftpUpload("rh",fileName, curDate) + println "BIGDATA_CITYPRICE ÉÏ´«FtpÍê³É......" + } + + + def exportBigdataDistPrice(queryDate){ + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DISTPRICE_FJW_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DISTPRICE_FJW_ADD_${curDate}_0001.dat" + } + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select CITYID,DISTID, YMID, SALEPRICE,RENTPRICE,SALECOUNT,RENTCOUNT, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, HOUSEUSE,SALEBLDGAREA,RENTBLDGAREA,SALETOTALPRICE,RENTTOTALPRICE,DATATYPE,SDATERANGE,RDATERANGE,SOURCECODE from BIGDATA_DISTPRICE_FJW where CITYID='${cityCode}' and YMID=${queryDate}";// and YMID=${queryDate} + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.YMID + data << r.DISTID + data << r.SALEPRICE?r.SALEPRICE:'' + data << r.RENTPRICE?r.RENTPRICE:'' + if(r.SALECOUNT>0) { + data << r.SALECOUNT + }else{ + data << '' + } + if(r.RENTCOUNT>0){ + data << r.RENTCOUNT + }else{ + data << '' + } + data << r.UPDATETIME + data << r.HOUSEUSE + data << r.SALEBLDGAREA?r.SALEBLDGAREA:'' + data << r.RENTBLDGAREA?r.RENTBLDGAREA:'' + data << r.SALETOTALPRICE?r.SALETOTALPRICE:'' + data << r.RENTTOTALPRICE?r.RENTTOTALPRICE:'' + data << r.DATATYPE + data << r.SDATERANGE + data << r.RDATERANGE + data << r.SOURCECODE + allRows << data + }); + } + + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpUtils.ftpUpload("rh",fileName, curDate) + println "BIGDATA_DISTPRICE ÉÏ´«FtpÍê³É......" + } + + + def exportBigdataCommPrice(queryDate){ + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMPRICE_FJW_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMPRICE_FJW_ADD_${curDate}_0001.dat" + } + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select CITYID, YMID,COMMID, SALEPRICE,RENTPRICE,SALECOUNT,RENTCOUNT, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, HOUSEUSE,SALEBLDGAREA,RENTBLDGAREA,SALETOTALPRICE,RENTTOTALPRICE,DATATYPE,SDATERANGE,RDATERANGE,SOURCECODE,DEAL_COUNT,DEAL_COUNT_YOY,DEAL_COUNT_MOM,NETLIST_PRICE_YOY,NETLIST_PRICE_MOM,NETLIST_COUNT_YOY,NETLIST_COUNT_MOM,RENT_COUNT_YOY,RENT_COUNT_MOM,CITY_RANK,AREA_RANK,DISTRICT_PRICE_THAN,CITY_PRICE_THAN from BIGDATA_COMMPRICE_FJW where CITYID='${cityCode}' and YMID=${queryDate} ";// + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.YMID + data << r.COMMID + data << r.SALEPRICE?r.SALEPRICE:'' + if(r.SALECOUNT>0) { + data << r.SALECOUNT + }else{ + data << '' + } + data << r.RENTPRICE?r.RENTPRICE:'' + if(r.RENTCOUNT>0){ + data << r.RENTCOUNT + }else{ + data << '' + } + data << r.UPDATETIME + data << r.SALEBLDGAREA?r.SALEBLDGAREA:'' + data << r.RENTBLDGAREA?r.RENTBLDGAREA:'' + data << r.SALETOTALPRICE?r.SALETOTALPRICE:'' + data << r.RENTTOTALPRICE?r.RENTTOTALPRICE:'' + data << r.HOUSEUSE + data << r.SDATERANGE + data << r.RDATERANGE + data << r.DATATYPE + data << r.SOURCECODE + data << r.DEAL_COUNT + data << r.DEAL_COUNT_YOY + data << r.DEAL_COUNT_MOM + data << r.NETLIST_PRICE_YOY + data << r.NETLIST_PRICE_MOM + data << r.NETLIST_COUNT_YOY + data << r.NETLIST_COUNT_MOM + data << r.RENT_COUNT_YOY + data << r.RENT_COUNT_MOM + data << r.CITY_RANK + data << r.AREA_RANK + data << r.DISTRICT_PRICE_THAN + data << r.CITY_PRICE_THAN + allRows << data + }); + } + + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpUtils.ftpUpload("rh",fileName, curDate) + println "BIGDATA_COMMPRICE ÉÏ´«FtpÍê³É......" + } + + + def exportBigdataCommlayoutpicFjw(){ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\æ•°æ�®\\建行\\房产估值\\æ•°æ�®æ–‡ä»¶\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile([], fileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_COMMLAYOUTPIC_FJW 上传Ftp完æˆ�......" + println "BIGDATA_COMMLAYOUTPIC_FJW ÉÏ´«FtpÍê³É......" } - def exportOk(curDate){ + def exportBigdataForsale(publishDate, new_dists){ + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_FORSALE_FJW_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_FORSALE_FJW_ADD_${curDate}_0001.dat" + } + def headers = []//["³ÇÊÐID","³öÊÛID","¹ÒÅÆ·¿ÎÝID","³ÇÊÐÃû³Æ","ÐÐÕþÇøID","ÐÐÕþÇøÃû³Æ","Ð¡ÇøID","Ð¡ÇøÃû³Æ","Â¥¶°ID","Â¥¶°±àºÅ","Â¥¶°Ãû³Æ","µ¥ÔªID","µ¥Ôª±àºÅ","µ¥ÔªÃû³Æ","»§ID","ÏêϸµØÖ·","½¨ÖþÄê´ú","ȨÊô","ȨÊôÄêÏÞ","µ¥¼Û","×ܼÛ","³öÊÛ¸¶¿î·½Ê½","ËùÔÚÂ¥²ã","×ÜÂ¥²ã","½¨ÖþÀàÐÍ","ÊÒÄڽṹ","½¨Öþ½á¹¹","½¨ÖþÃæ»ý","Ì×ÄÚÃæ»ý","»§ÐÍ","ÊÒ","Ìü","³ø","ÎÀ","³¯Ïò","×°ÐÞÇé¿ö","ÊÇ·ñÓеçÌÝ","¼¸Ìݼ¸»§","·¢²¼Ê±¼ä","µ½ÆÚʱ¼ä","ÊÇ·ñÊ×·¢","·¿Ô´Êý¾ÝÀ´Ô´","Öн鹫˾ID","Öн鹫˾Ãû³Æ","·¢²¼ÈË","·¢²¼È˵绰","ÃèÊöÐÅÏ¢","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾","¸½¼ÓÐÅÏ¢"] + def index = 0 + for(def city : citys){ + def cityCode = cityCodeMap.get(city) + if(city=="ËÕÖÝ"){ + continue + } + + def allRows = [] + if(new_dists){ + def newstr = "('"+new_dists.join("','")+"')" + def sql1 = "select CITYID,FORSALEID,PROPCODE,CITYNAME,DISTID,DISTNAME,COMMID,COMMNAME, BUILDID,BUILDNO, BUILDNAME,UNITID,UNITNO,UNITNAME,HOUSEID,ADDRESS,BUILDYEAR,PROPTYPE,PROPYEARS,UNITPRICE,TOTALPRICE,PAYTYPE,FLOORNUM,FLOORCNT,\n" + + " BUILDTYPE, HOUSESTRU,BUILDSTRU,BUILDAREA,LIVINGAREA,HOUSESTYLE,ROOMCNT,LIVINGROOMCNT,KITCHENCNT, BATHROOMCNT,HOUSEASPECT,FITMENT,IFELEVATOR,ELEVATORHOUSE,to_char(PUBLISHTIME,'yyyy-mm-dd hh24:mi:ss') as PUBLISHTIME,to_char(EXPIRETIME,'yyyy-mm-dd hh24:mi:ss') as EXPIRETIME,\n" + + " IFFIRST,DATASOURCE,AGENCYID,AGENCYNAME,PUBLISHER,PHONE,DESCRIPTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE,ATTACH from bigdata_forsale_gj " + + "where cityId='${cityCode}' and updatetime>=to_date('${publishDate}','yyyy-MM-dd') and distid not in ${newstr}"; + def rets1 = getHouseDatas(sql1) + allRows.addAll(rets1) + }else{ + def sql = "select CITYID,FORSALEID,PROPCODE,CITYNAME,DISTID,DISTNAME,COMMID,COMMNAME, BUILDID,BUILDNO, BUILDNAME,UNITID,UNITNO,UNITNAME,HOUSEID,ADDRESS,BUILDYEAR,PROPTYPE,PROPYEARS,UNITPRICE,TOTALPRICE,PAYTYPE,FLOORNUM,FLOORCNT,\n" + + " BUILDTYPE, HOUSESTRU,BUILDSTRU,BUILDAREA,LIVINGAREA,HOUSESTYLE,ROOMCNT,LIVINGROOMCNT,KITCHENCNT, BATHROOMCNT,HOUSEASPECT,FITMENT,IFELEVATOR,ELEVATORHOUSE,to_char(PUBLISHTIME,'yyyy-mm-dd hh24:mi:ss') as PUBLISHTIME,to_char(EXPIRETIME,'yyyy-mm-dd hh24:mi:ss') as EXPIRETIME,\n" + + " IFFIRST,DATASOURCE,AGENCYID,AGENCYNAME,PUBLISHER,PHONE,DESCRIPTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE,ATTACH from bigdata_forsale_gj where cityId='${cityCode}' and updatetime>=to_date('${publishDate}','yyyy-MM-dd')"; + allRows = getHouseDatas(sql) + } + if(allRows.size()>0){ + index = index + 1 + if(index == 1){ + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + }else{ + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true); + } + + } + } + + if(new_dists){//²¹³ä±»ÐÞÇøÓòµÄÊý¾Ý + def newstr = "('"+new_dists.join("','")+"')" + def sql2 = "select CITYID,FORSALEID,PROPCODE,CITYNAME,DISTID,DISTNAME,COMMID,COMMNAME, BUILDID,BUILDNO, BUILDNAME,UNITID,UNITNO,UNITNAME,HOUSEID,ADDRESS,BUILDYEAR,PROPTYPE,PROPYEARS,UNITPRICE,TOTALPRICE,PAYTYPE,FLOORNUM,FLOORCNT,\n" + + " BUILDTYPE, HOUSESTRU,BUILDSTRU,BUILDAREA,LIVINGAREA,HOUSESTYLE,ROOMCNT,LIVINGROOMCNT,KITCHENCNT, BATHROOMCNT,HOUSEASPECT,FITMENT,IFELEVATOR,ELEVATORHOUSE,to_char(PUBLISHTIME,'yyyy-mm-dd hh24:mi:ss') as PUBLISHTIME,to_char(EXPIRETIME,'yyyy-mm-dd hh24:mi:ss') as EXPIRETIME,\n" + + " IFFIRST,DATASOURCE,AGENCYID,AGENCYNAME,PUBLISHER,PHONE,DESCRIPTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE,ATTACH " + + "from bigdata_forsale_gj where distid in ${newstr}" + def rets2 = getHouseDatas(sql2) + if(rets2.size()>0){ + FileUtils.batchCreateFile(rets2, fileName, headers, "utf-8", true); + } + } + println "ÈÚºÏ BIGDATA_FORSALE_GJ Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpUtils.ftpUpload("rh",fileName, curDate) + println "ÈÚºÏ BIGDATA_FORSALE_GJ ÉÏ´«FtpÍê³É......" + } + + + def exportPgBigdataForsale(publishDate,endDate, new_dists){ + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_FORSALE_FJW_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_FORSALE_FJW_ADD_${curDate}_0001.dat" + } + def headers = []//["³ÇÊÐID","³öÊÛID","¹ÒÅÆ·¿ÎÝID","³ÇÊÐÃû³Æ","ÐÐÕþÇøID","ÐÐÕþÇøÃû³Æ","Ð¡ÇøID","Ð¡ÇøÃû³Æ","Â¥¶°ID","Â¥¶°±àºÅ","Â¥¶°Ãû³Æ","µ¥ÔªID","µ¥Ôª±àºÅ","µ¥ÔªÃû³Æ","»§ID","ÏêϸµØÖ·","½¨ÖþÄê´ú","ȨÊô","ȨÊôÄêÏÞ","µ¥¼Û","×ܼÛ","³öÊÛ¸¶¿î·½Ê½","ËùÔÚÂ¥²ã","×ÜÂ¥²ã","½¨ÖþÀàÐÍ","ÊÒÄڽṹ","½¨Öþ½á¹¹","½¨ÖþÃæ»ý","Ì×ÄÚÃæ»ý","»§ÐÍ","ÊÒ","Ìü","³ø","ÎÀ","³¯Ïò","×°ÐÞÇé¿ö","ÊÇ·ñÓеçÌÝ","¼¸Ìݼ¸»§","·¢²¼Ê±¼ä","µ½ÆÚʱ¼ä","ÊÇ·ñÊ×·¢","·¿Ô´Êý¾ÝÀ´Ô´","Öн鹫˾ID","Öн鹫˾Ãû³Æ","·¢²¼ÈË","·¢²¼È˵绰","ÃèÊöÐÅÏ¢","±¸×¢","´´½¨Ê±¼ä","¸üÐÂʱ¼ä","À´Ô´¹«Ë¾","¸½¼ÓÐÅÏ¢"] + def index = 0 + for(def city : citys){ + def cityCode = cityCodeMap.get(city) + def allRows = [] + if(new_dists){ + def newstr = "('"+new_dists.join("','")+"')" + def sql1 = "select urbn_id,gujia_sell_id,gujia_listg_hs_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_bds_unitprc,gujia_bds_tot_prc,gujia_sell_pymtmod,gujia_bds_wbt_floor,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_indr_stc_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_twrd_val,gujia_dcrt_sttn,gujiawthrext_lift_ind,gujiajiladderjiactval,to_char(anc_tm,'yyyy-mm-dd') as anc_tm,to_char(exdat,'yyyy-mm-dd') as exdat,gujia_wthr_strt,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,gujia_anc_psn,gujia_anc_psn_tel,gujia_dsc_inf_cntnt,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_apd_inf " + + "from base.t0831_bigdata_forsale_gj_h where urbn_id='${cityCode}' and Anc_Tm>='${publishDate}' and Anc_Tm<'${endDate}' and gujia_admndiv_id not in ${newstr}"; + def rets1 = getPgHouseDatas(sql1) + allRows.addAll(rets1) + }else{ + def sql = "select urbn_id,gujia_sell_id,gujia_listg_hs_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_bds_unitprc,gujia_bds_tot_prc,gujia_sell_pymtmod,gujia_bds_wbt_floor,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_indr_stc_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_twrd_val,gujia_dcrt_sttn,gujiawthrext_lift_ind,gujiajiladderjiactval,to_char(anc_tm,'yyyy-mm-dd') as anc_tm,to_char(exdat,'yyyy-mm-dd') as exdat,gujia_wthr_strt,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,gujia_anc_psn,gujia_anc_psn_tel,gujia_dsc_inf_cntnt,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_apd_inf " + + "from base.t0831_bigdata_forsale_gj_h where urbn_id='${cityCode}' and Anc_Tm>='${publishDate}' and Anc_Tm<'${endDate}'"; + allRows = getPgHouseDatas(sql) + } + if(allRows.size()>0){ + index = index + 1 + if(index == 1){ + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", false); + }else{ + FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true); + } + + } + } + + if(new_dists){//²¹³ä±»ÐÞÇøÓòµÄÊý¾Ý + def newstr = "('"+new_dists.join("','")+"')" + def sql2 = "select urbn_id,gujia_sell_id,gujia_listg_hs_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_bds_unitprc,gujia_bds_tot_prc,gujia_sell_pymtmod,gujia_bds_wbt_floor,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_indr_stc_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_twrd_val,gujia_dcrt_sttn,gujiawthrext_lift_ind,gujiajiladderjiactval,to_char(anc_tm,'yyyy-mm-dd') as anc_tm,to_char(exdat,'yyyy-mm-dd') as exdat,gujia_wthr_strt,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,gujia_anc_psn,gujia_anc_psn_tel,gujia_dsc_inf_cntnt,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_apd_inf " + + "from base.t0831_bigdata_forsale_gj_h where gujia_admndiv_id in ${newstr}" + def rets2 = getPgHouseDatas(sql2) + if(rets2.size()>0){ + FileUtils.batchCreateFile(rets2, fileName, headers, "utf-8", true); + } + } + println "ÈÚºÏ BIGDATA_FORSALE_GJ Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpUtils.ftpUpload("rh",fileName, curDate) + println "ÈÚºÏ BIGDATA_FORSALE_GJ ÉÏ´«FtpÍê³É......" + } + + def getHouseDatas(sql){ + def allRows = [] + def index = 0 + sqlInstance.eachRow(sql,{r-> + index = index+1 + println r.CITYNAME +" "+index + def data = [] + data << r.CITYID + data << r.FORSALEID + data << r.PROPCODE + data << r.CITYNAME + data << r.DISTID + data << r.DISTNAME + data << r.COMMID + data << r.COMMNAME + data << r.BUILDID + data << r.BUILDNO + data << r.BUILDNAME + data << r.UNITID + data << r.UNITNO + data << r.UNITNAME + data << r.HOUSEID + data << r.ADDRESS + data << r.BUILDYEAR + data << r.PROPTYPE + data << r.PROPYEARS + data << r.UNITPRICE + data << r.TOTALPRICE + data << r.PAYTYPE + data << r.FLOORNUM + data << r.FLOORCNT + data << r.BUILDTYPE + data << r.HOUSESTRU + data << r.BUILDSTRU + data << r.BUILDAREA + data << r.LIVINGAREA + data << r.HOUSESTYLE + data << r.ROOMCNT + data << r.LIVINGROOMCNT + data << r.KITCHENCNT + data << r.BATHROOMCNT + data << r.HOUSEASPECT + data << r.FITMENT + data << r.IFELEVATOR + data << r.ELEVATORHOUSE + data << r.PUBLISHTIME + data << r.EXPIRETIME + data << r.IFFIRST + data << r.DATASOURCE + data << r.AGENCYID + data << r.AGENCYNAME + data << r.PUBLISHER + data << r.PHONE + data << "" + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE +// data << r.ATTACH //ÈںϷ¿Ô´Ã»ÓÐÕâ¸ö×Ö¶Î + allRows << data +// if(allRows.size()%200000==0){ +// FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true); +// allRows.clear() +// } + }); + return allRows + } + + + def getPgHouseDatas(def sql){ + def allRows = [] + def index = 0 + pgsqlInstance.eachRow(sql,{r-> + index = index+1 + println r.urbn_nm +" "+index + def data = [] + data << r.urbn_id + data << r.gujia_sell_id + data << r.gujia_listg_hs_id + data << r.urbn_nm + data << r.gujia_admndiv_id + data << r.gujia_admndiv_nm + data << r.gujia_comm_id + data << r.comm_nm + data << r.gujia_bld_id + data << r.bld_id + data << r.gujia_bld_nm + data << r.gujia_unit_id + data << r.unit_id + data << r.gujia_unit_nm + data << r.gujia_acc_id + data << r.gujia_dtl_adr + data << r.gujia_bds_bld_yr_rc + data << r.gujia_own_val + data << r.gujia_own_yrlmt_val + data << r.gujia_bds_unitprc + data << r.gujia_bds_tot_prc + data << r.gujia_sell_pymtmod + data << r.gujia_bds_wbt_floor + data << r.gujiabdstot_floor_num + data << r.gujia_bld_tp_val + data << r.gujia_indr_stc_val + data << r.gujia_bld_stc + data << r.guiabconstructionarea + data << r.gujiabdsset_innr_area + data << r.gujia_acc_tp_val + data << r.gujia_bds_room_num + data << r.gujia_bds_dept_num + data << r.gujia_bds_ktch_num + data << r.gujia_bds_hlt_btw_num + data << r.gujia_twrd_val + data << r.gujia_dcrt_sttn + data << r.gujiawthrext_lift_ind + data << r.gujiajiladderjiactval + data << r.anc_tm + data << r.exdat + data << r.gujia_wthr_strt + data << r.gujia_hs_src_dtsrc + data << r.intr_co_id + data << r.intr_co_nm + data << r.gujia_anc_psn + data << r.gujia_anc_psn_tel + data << r.gujia_dsc_inf_cntnt + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co +// data << r.ATTACH //ÈںϷ¿Ô´Ã»ÓÐÕâ¸ö×Ö¶Î + allRows << data +// if(allRows.size()%200000==0){ +// FileUtils.batchCreateFile(allRows, fileName, headers, "utf-8", true); +// allRows.clear() +// } + }); + return allRows + } + + + def exportOk(curDate){ // def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMMdd") def dataCodeFileName = "/ccb_rh/${curDate}/${curDate}.ok" if(CommonDatautils.isWindow()){ - dataCodeFileName = "D:\\æ•°æ�®\\建行\\房产估值\\æ•°æ�®æ–‡ä»¶\\txt\\ccb_rh\\${curDate}\\${curDate}.ok" + dataCodeFileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\${curDate}.ok" } FileUtils.batchCreateFile([], dataCodeFileName, [], "utf-8", false); CcbFtpUtils.ftpUpload("rh",dataCodeFileName, curDate) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHeTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHeTest.groovy index 11270dab3..66f2cc491 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHeTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/ExportDistrictRongHeTest.groovy @@ -5,178 +5,175 @@ import com.fangjia.script.BatchOwner import com.fangjia.script.Watcher import com.fangjia.script.ccbevaluation.CcbCommonUtils import com.fangjia.script.ccbevaluation.CcbFtpTestUtils - +import com.fangjia.script.ccbevaluation.CcbFtpUtils import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.gj.ccb.FileUtils import com.fangjia.script.util.DateUtils +import com.jcraft.jsch.ChannelSftp import groovy.sql.Sql -import java.sql.ResultSet -import java.sql.ResultSetMetaData - @BatchOwner(Watcher.GaoJuan) class ExportDistrictRongHeTest extends BaseBatch{ + def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse", + "postgres", "postgres", "org.postgresql.Driver") + def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") static main(args) { runBatch(new ExportDistrictRongHeTest(), args); } + def citys = [] + def cityCodeMap = CcbCommonUtils.findCityCodeValue() + @Override void process(Object args) { - def curDate = 20220310//DateUtils.formatDateByPattern(new Date()+1, "yyyyMMdd") - def fileName = "/ccb_rh/${curDate}" -// if(CommonDatautils.isWindow()){ -// fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}" -// } - CcbFtpTestUtils.delete(fileName) + citys = CcbCommonUtils.getRunningCitys(args) + def curDate = DateUtils.formatDateByPattern(new Date()+1, "yyyyMMdd") + def new_dists = []//["350604","350605","410307","410308","450181"] + //°´Ììµ¼£¨Ã¿ÌìÒ»¸öÎļþ¼Ð£© +// exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-1), "yyyy-MM-dd"), new_dists) + exportPgBigdataDealFJW(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd"), new_dists) - exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd")) + if(curDate.toString().endsWith("10")){ - exportBigdataCommunityGJRH() - exportBigdataBuildingFJW() - exportBigdataCommfeeGj() + exportEvaluateRate() + exportBigdataBuildprojFjw() + exportBigdataCommlayoutpicFjw() - exportBigdataCommbuildstruGJ() - exportBigdataCommhousetypeGJ() - exportBigdataCommbuildyearGj() - exportBigdataCommhouseuseGJ() - exportBigdataPositionGJ() - exportBigdataDistrictFJW() - exportBigdataAliasFJW() - exportBigdataBuildprojFjw() - exportBigdataCommlayoutpicFjw() - exportEvaluateRate() + exportBigdataCommunityGJRH()/ + exportBigdataBuildingFJW()// + exportBigdataCommfeeGj()// - SSHHelper jschCommand = new SSHHelper(); - System.out.println(jschCommand.executeCommand("sh /home/ccb_rh/output/rh_package.sh ${curDate}")); + exportBigdataCommbuildstruGJ()// + exportBigdataCommhousetypeGJ()// + exportBigdataCommbuildyearGj()// + exportBigdataCommhouseuseGJ()// + exportBigdataPositionGJ()// + exportBigdataDistrictFJW()// + exportBigdataAliasFJW()// - exportOk(curDate) + //±¾12.10ÉÏ´«10£¬11ÔÂËùÓÐÊý¾Ý£¬23Äê1ÔÂÐè¸ÄΪËùÓгÇÊа´ÈÕÆÚͬ²½Ò»ÆÚÊý¾Ý + def queryDate = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM").toInteger() + exportBigdataCityPrice(queryDate) + exportBigdataDistPrice(queryDate) + exportBigdataCommPrice(queryDate) + + exportInOk() + + } + + SSHHelperTest jschCommand = new SSHHelperTest(); + System.out.println(jschCommand.executeCommand("sh /home/ccb_ronghe/output/rh_package.sh ${curDate}")); } -// -// def runByCity(){ -// def citys = CcbCommonUtils.citys; -// def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() -// -// -//// //¼ì²éokÎļþÊÇ·ñÉÏ´« -//// exportAllBigdataDealFJW() -//// for(def city : citys) { -//// def cityCode = cityCodeDataMap.get(city) -//// -// //°´Ììµ¼(Ò»¸öÎļþ¼ÐÏÂ) -// //exportBigdataDealFJW(DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-2), "yyyy-MM-dd")) -// //°´Ììµ¼£¨Ã¿ÌìÒ»¸öÎļþ¼Ð£© -// exportBigdataDealFJW2(DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-2), "yyyy-MM-dd")) -// -//// exportBigdataCommunityGJRH(cityCode) -//// exportBigdataBuildingFJW(cityCode) -//// exportBigdataCommfeeGj(cityCode) -//// -//// exportBigdataCommbuildstruGJ(cityCode) -//// exportBigdataCommhousetypeGJ(cityCode) -//// exportBigdataCommbuildyearGj(cityCode) -//// exportBigdataCommhouseuseGJ(cityCode) -//// exportBigdataPositionGJ(cityCode) -//// exportBigdataDistrictFJW(cityCode) -//// exportBigdataAliasFJW(cityCode) -//// -//// exportBigdataBuildprojFjw(cityCode) -//// exportBigdataCommlayoutpicFjw(cityCode) -//// } -//// exportEvaluateRate() -// -//// -// def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMMdd") -// SSHHelper jschCommand = new SSHHelper(); -// System.out.println(jschCommand.executeCommand("sh /home/ccb_rh/output/rh_package.sh ${curDate}")); -// -// exportOk() -// } - def exportBigdataCommunityGJRH(cityCode){ - def sql = "select CITYID,DISTID,COMMID,COMMNAME,ADDRESS,LANDAREA,BUILDAREA,GREENINGRATE,PLOTRATIO,PARKINGCNT,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,COMMTYPE,COMMALIAS,STREET,STREETNO,IFNEW,INTRODUCTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,SOURCECODE from BIGDATA_COMMUNITY_FJW";// where CITYID='${cityCode}' - def allRows = [] - sqlInstance.eachRow(sql,{r-> - def data = [] - data << r.CITYID - data << r.COMMID - data << r.COMMNAME - data << r.COMMALIAS - data << r.DISTID - data << r.STREET - data << r.STREETNO - data << r.ADDRESS - data << r.LANDAREA - data << r.BUILDAREA - data << r.COMMTYPE - data << r.IFNEW - data << r.GREENINGRATE - data << r.PLOTRATIO - data << r.PARKINGCNT - data << '' - data << r.REMARK - data << r.CREATETIME - data << r.UPDATETIME - data << r.SOURCECODE - allRows << data - }); + + def exportBigdataCommunityGJRH(){ + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" + def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" + } + def index = 0 + for(def city : citys){ + def allRows = [] + def cityCode = cityCodeMap.get(city) + def sql = "select CITYID,DISTID,COMMID,COMMNAME,ADDRESS,LANDAREA,BUILDAREA,GREENINGRATE,PLOTRATIO,PARKINGCNT,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,COMMTYPE,COMMALIAS,STREET,STREETNO,IFNEW,INTRODUCTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,SOURCECODE from BIGDATA_COMMUNITY_FJW where CITYID='${cityCode}'"; + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.COMMID + data << r.COMMNAME + data << r.COMMALIAS + data << r.DISTID + data << r.STREET + data << r.STREETNO + data << r.ADDRESS + data << r.LANDAREA + data << r.BUILDAREA + data << r.COMMTYPE + data << r.IFNEW + data << r.GREENINGRATE + data << r.PLOTRATIO + data << r.PARKINGCNT + data << '' + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + + if(allRows && allRows.size()>0){ + index = index + 1 + if(index == 1){ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + }else{ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true); + } + } + } - FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); println "BIGDATA_COMMUNITY_FJW Êý¾ÝÎļþÊä³öÍê³É......" CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) println "BIGDATA_COMMUNITY_FJW ÉÏ´«FtpÍê³É......" } def exportBigdataCommbuildstruGJ(){ - def sql = "select CITYID,COMMID,BUILDSTRU,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMBUILDSTRU_FJW";// where CITYID='${cityCode}' def allRows = [] - sqlInstance.eachRow(sql,{r-> - def data = [] - data << r.CITYID - data << r.COMMID - data << r.BUILDSTRU - data << r.REMARK - data << r.CREATETIME - data << r.UPDATETIME - data << r.SOURCECODE - allRows << data - }); + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select CITYID,COMMID,BUILDSTRU,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMBUILDSTRU_FJW where CITYID='${cityCode}'"; + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.COMMID + data << r.BUILDSTRU + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + } + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" + def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) println "BIGDATA_COMMBUILDSTRU_FJW ÉÏ´«FtpÍê³É......" } - def exportBigdataCommhousetypeGJ(cityCode){ - def sql = "select CITYID,COMMID,HOUSETYPE,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMHOUSETYPE_FJW";// where CITYID='${cityCode}' + def exportBigdataCommhousetypeGJ(){ + def allRows = [] - sqlInstance.eachRow(sql,{r-> - def data = [] - data << r.CITYID - data << r.COMMID - data << r.HOUSETYPE - data << r.REMARK - data << r.CREATETIME - data << r.UPDATETIME - data << r.SOURCECODE - allRows << data - }); + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select CITYID,COMMID,HOUSETYPE,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMHOUSETYPE_FJW where CITYID='${cityCode}'"; + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.COMMID + data << r.HOUSETYPE + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + } + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" + def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) @@ -184,23 +181,27 @@ class ExportDistrictRongHeTest extends BaseBatch{ } def exportBigdataCommbuildyearGj(){ - def sql = "select CITYID,COMMID,BUILDYEAR,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMBUILDYEAR_FJW";// where CITYID='${cityCode}' def allRows = [] - sqlInstance.eachRow(sql,{r-> - def data = [] - data << r.CITYID - data << r.COMMID - data << r.BUILDYEAR - data << r.REMARK - data << r.CREATETIME - data << r.UPDATETIME - data << r.SOURCECODE - allRows << data - }); + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select CITYID,COMMID,BUILDYEAR,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMBUILDYEAR_FJW where CITYID='${cityCode}'";// + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.COMMID + data << r.BUILDYEAR + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + } + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" + def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh", fileName, curDate) @@ -208,33 +209,37 @@ class ExportDistrictRongHeTest extends BaseBatch{ } def exportBigdataCommfeeGj(){ - def sql = "select CITYID,COMMID,COMPID,FEE,HOUSEUSE,BUILDTYPE,FEETYPE,NOTE,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMFEE_FJW";//where CITYID='${cityCode}' + def allRows = [] - sqlInstance.eachRow(sql,{r-> - def data = [] - data << r.CITYID - data << r.COMMID - data << r.COMPID - data << r.FEE - data << r.HOUSEUSE - if(r.BUILDTYPE){ - def arrs = r.BUILDTYPE.replace("[","").replace("]","").split(",") - data << arrs[0].trim() - }else{ - data << '' - } - data << r.FEETYPE - data << r.NOTE - data << r.REMARK - data << r.CREATETIME - data << r.UPDATETIME - data << r.SOURCECODE - allRows << data - }); + for(def city : citys){ + def cityCode = cityCodeMap.get(city) + def sql = "select CITYID,COMMID,COMPID,FEE,HOUSEUSE,BUILDTYPE,FEETYPE,NOTE,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMFEE_FJW where CITYID='${cityCode}'"; + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.COMMID + data << r.COMPID + data << r.FEE + data << r.HOUSEUSE + if(r.BUILDTYPE){ + def arrs = r.BUILDTYPE.replace("[","").replace("]","").split(",") + data << arrs[0].trim() + }else{ + data << '' + } + data << r.FEETYPE + data << r.NOTE + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + } def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" + def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) @@ -243,24 +248,28 @@ class ExportDistrictRongHeTest extends BaseBatch{ def exportBigdataCommhouseuseGJ(){ - def sql = "select CITYID,COMMID,HOUSEUSE,HOUSECNT,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMHOUSEUSE_FJW";// where CITYID='${cityCode}' def allRows = [] - sqlInstance.eachRow(sql,{r-> - def data = [] - data << r.CITYID - data << r.COMMID - data << r.HOUSEUSE - data << r.HOUSECNT - data << r.REMARK - data << r.CREATETIME - data << r.UPDATETIME - data << r.SOURCECODE - allRows << data - }); + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select CITYID,COMMID,HOUSEUSE,HOUSECNT,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMHOUSEUSE_FJW where CITYID='${cityCode}'";// + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.COMMID + data << r.HOUSEUSE + data << r.HOUSECNT + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + } + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" + def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) @@ -268,28 +277,32 @@ class ExportDistrictRongHeTest extends BaseBatch{ } def exportBigdataPositionGJ(){ - def sql = "select CITYID,OBJECTTYPE,OBJECTID,POSITIONTYPE,SEQNO,LONGITUDE,LATITUDE,ALTITUDE,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_POSITION_FJW";// where CITYID='${cityCode}' def allRows = [] - sqlInstance.eachRow(sql,{r-> - def data = [] - data << r.CITYID - data << r.OBJECTTYPE - data << r.OBJECTID - data << r.POSITIONTYPE - data << r.SEQNO - data << r.LONGITUDE - data << r.LATITUDE - data << r.ALTITUDE - data << r.REMARK - data << r.CREATETIME - data << r.UPDATETIME - data << r.SOURCECODE - allRows << data - }); + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select CITYID,OBJECTTYPE,OBJECTID,POSITIONTYPE,SEQNO,LONGITUDE,LATITUDE,ALTITUDE,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_POSITION_FJW where CITYID='${cityCode}'";// + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.OBJECTTYPE + data << r.OBJECTID + data << r.POSITIONTYPE + data << r.SEQNO + data << r.LONGITUDE + data << r.LATITUDE + data << r.ALTITUDE + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + } + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" + def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) @@ -297,27 +310,31 @@ class ExportDistrictRongHeTest extends BaseBatch{ } def exportBigdataDistrictFJW(){ - def sql = "select DISTID,DISTNAME,DISTSPELL,CITYID,DISTCODE,SEQ,DISTTYPE,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_DISTRICT_FJW";// where CITYID='${cityCode}' def allRows = [] - sqlInstance.eachRow(sql,{r-> - def data = [] - data << r.DISTID - data << r.DISTNAME - data << r.DISTSPELL - data << r.CITYID - data << r.DISTCODE - data << r.SEQ - data << r.DISTTYPE - data << r.REMARK - data << r.CREATETIME - data << r.UPDATETIME - data << r.SOURCECODE - allRows << data - }); + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select DISTID,DISTNAME,DISTSPELL,CITYID,DISTCODE,SEQ,DISTTYPE,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_DISTRICT_FJW where CITYID='${cityCode}'";// + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.DISTID + data << r.DISTNAME + data << r.DISTSPELL + data << r.CITYID + data << r.DISTCODE + data << r.SEQ + data << r.DISTTYPE + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + } + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" + def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh", fileName, curDate) @@ -325,30 +342,34 @@ class ExportDistrictRongHeTest extends BaseBatch{ } def exportBigdataAliasFJW(){ - def sql = "select city_id, ca_id,address_id,address_name, status, exp_dt, version, is_key_name, data_source, description,alias_grade,addr_type_cd,ifexamine,ifdisplay from ADDRESS_ALIAS_FJW";// where city_id='${cityCode}' def allRows = [] - sqlInstance.eachRow(sql,{r-> - def data = [] - data << r.city_id - data << r.ca_id - data << r.address_id - data << r.address_name - data << r.status - data << r.exp_dt - data << r.version - data << r.is_key_name - data << r.data_source - data << r.description - data << r.alias_grade - data << r.addr_type_cd - data << r.ifexamine - data << r.ifdisplay - allRows << data - }); + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select city_id, ca_id,address_id,address_name, status, exp_dt, version, is_key_name, data_source, description,alias_grade,addr_type_cd,ifexamine,ifdisplay from ADDRESS_ALIAS_FJW where city_id='${cityCode}'";// + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.city_id + data << r.ca_id + data << r.address_id + data << r.address_name + data << r.status + data << r.exp_dt + data << r.version + data << r.is_key_name + data << r.data_source + data << r.description + data << r.alias_grade + data << r.addr_type_cd + data << r.ifexamine + data << r.ifdisplay + allRows << data + }); + } + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat" + def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) @@ -370,9 +391,9 @@ class ExportDistrictRongHeTest extends BaseBatch{ index++ def curStartStr = curStartDateStr - def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat" + def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat" } def allRows = [] @@ -456,7 +477,7 @@ class ExportDistrictRongHeTest extends BaseBatch{ stop = true } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); - CcbFtpTestUtils.ftpUpload("rh", fileName, curDate) + CcbFtpTestUtils.ftpUpload("ccb_ronghe", fileName, curDate) println "BIGDATA_DEAL_FJW ÉÏ´«FtpÍê³É......${curStartStr}" def curEndStr = DateUtils.add(curStartStr, 1) curStartDateStr = curEndStr @@ -464,19 +485,100 @@ class ExportDistrictRongHeTest extends BaseBatch{ } - def exportBigdataDealFJW2(curDate, dealdate){ + def exportBigdataDealFJW2(curDate, dealdate, new_dists){ def startDateStr = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd") def endDateStr = DateUtils.formatDateByPattern(DateUtils.getLastDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd") // def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMMdd") - def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" } def allRows = [] - def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ where dealdate>=to_date('${startDateStr}','yyyy-MM-dd') and dealdate<=to_date('${endDateStr}','yyyy-MM-dd')";//CITYID='${cityCode}' and + +// for(def city : citys) { +// def cityCode = cityCodeMap.get(city) +// if(curDate.toString().endsWith("28")){ +// if(new_dists){ +// def newstr = "('"+new_dists.join("','")+"')" +// def sql1 = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ " + +// "where CITYID='${cityCode}' and dealdate>=to_date('${startDateStr}','yyyy-MM-dd') and dealdate<=to_date('${endDateStr}','yyyy-MM-dd') and" + +// " distid not in ${newstr} ";//CITYID='${cityCode}' and +// def rets1 = createDeal(sql1) +// +// def sql2 = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ " + +// " where CITYID='${cityCode}' and distid in ${newstr}" +// def rets2 = createDeal(sql2) +// allRows.addAll(rets1) +// allRows.addAll(rets2) +// }else{ +// def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ where CITYID='${cityCode}' and dealdate>=to_date('${startDateStr}','yyyy-MM-dd') and dealdate<=to_date('${endDateStr}','yyyy-MM-dd')";// +// allRows.addAll(createDeal(sql)) +// } +// } +// } + + for(def city : citys) { + if(CcbCommonUtils.citys_252.contains(city)){ + def cityCode = cityCodeMap.get(city) + def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ where CITYID='${cityCode}'"; + allRows.addAll(createDeal(sql)) + } + } + + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) + println "BIGDATA_DEAL_FJW ÉÏ´«FtpÍê³É......${endDateStr}" + } + + + + def exportPgBigdataDealFJW(curDate, dealdate, new_dists){ + + def startDateStr = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd") + def endDateStr = DateUtils.formatDateByPattern(DateUtils.getLastDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd") + + + def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + } + + + def allRows = [] + + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + if(curDate.toString().endsWith("10")){ + if(new_dists){ + def newstr = "('"+new_dists.join("','")+"')" + def sql1 = "select urbn_id,gujia_bds_mdl_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_str,gujia_hsno,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_bds_wbt_floor,gujia_lyr_tp_val,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_bds_trdtckt_prc,gujia_bds_mdl_tot_prc,gujia_bds_dcl_tot_prc,gujiabds_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_bds_mdl_cyc,gujiawthrext_lift_ind,gujiabdslndfgrngvarea,gujiabdslutbl_gv_area,gujiabdssuntblgv_area,gujiabdsbayindowgarea,gujiabdstowerfrgvarea,gujia_bds_grg_gv_area,gujiabdsundgdrmgvarea,gujiabds_othr_gv_area,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_bds_mkdam,gujia_bds_data_tm_val " + + "from base.t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and txn_dt>=to_date('${dealdate}','yyyy-MM-dd') and gujia_admndiv_id not in ${newstr}" + def rets1 = dealData(sql1) + + def sql2 = "select urbn_id,gujia_bds_mdl_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_str,gujia_hsno,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_bds_wbt_floor,gujia_lyr_tp_val,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_bds_trdtckt_prc,gujia_bds_mdl_tot_prc,gujia_bds_dcl_tot_prc,gujiabds_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_bds_mdl_cyc,gujiawthrext_lift_ind,gujiabdslndfgrngvarea,gujiabdslutbl_gv_area,gujiabdssuntblgv_area,gujiabdsbayindowgarea,gujiabdstowerfrgvarea,gujia_bds_grg_gv_area,gujiabdsundgdrmgvarea,gujiabds_othr_gv_area,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_bds_mkdam,gujia_bds_data_tm_val " + + "from base.t0831_bigdata_deal_gj_h where urbn_id='${cityCode}' and gujia_admndiv_id in ${newstr}" + def rets2 = dealData(sql2) + allRows.addAll(rets1) + allRows.addAll(rets2) + }else{ + def sql = "select urbn_id,gujia_bds_mdl_id,urbn_nm,gujia_admndiv_id,gujia_admndiv_nm,gujia_str,gujia_hsno,gujia_comm_id,comm_nm,gujia_bld_id,bld_id,gujia_bld_nm,gujia_unit_id,unit_id,gujia_unit_nm,gujia_acc_id,gujia_dtl_adr,gujia_bds_bld_yr_rc,gujia_own_val,gujia_own_yrlmt_val,gujia_prd_val,gujia_bds_wbt_floor,gujia_lyr_tp_val,gujiabdstot_floor_num,gujia_bld_tp_val,gujia_bld_stc,guiabconstructionarea,gujiabdsset_innr_area,gujia_acc_tp_val,gujia_bds_room_num,gujia_bds_dept_num,gujia_bds_ktch_num,gujia_bds_hlt_btw_num,gujia_hs_use,gujia_indr_stc_val,gujia_twrd_val,gujia_dcrt_sttn,gujia_ases_bt_ln_num,gujia_bds_trdtckt_prc,gujia_bds_mdl_tot_prc,gujia_bds_dcl_tot_prc,gujiabds_ases_tot_prc,gujiasigntonlinectrid,to_char(txn_dt,'yyyy-mm-dd') as txn_dt,gujia_txn_tp_val,gujia_sell_pymtmod,gujia_bds_mdl_cyc,gujiawthrext_lift_ind,gujiabdslndfgrngvarea,gujiabdslutbl_gv_area,gujiabdssuntblgv_area,gujiabdsbayindowgarea,gujiabdstowerfrgvarea,gujia_bds_grg_gv_area,gujiabdsundgdrmgvarea,gujiabds_othr_gv_area,gujia_hs_src_dtsrc,intr_co_id,intr_co_nm,rmrk_dsc,to_char(data_crt_tm,'yyyy-mm-dd hh24:mi:ss') as data_crt_tm,to_char(data_udt_tm,'yyyy-mm-dd hh24:mi:ss') as data_udt_tm,gujia_src_co,gujia_bds_mkdam,gujia_bds_data_tm_val " + + "from base.t0831_bigdata_deal_gj_h where urbn_id='${cityCode}'";// and txn_dt>='${dealdate}' + allRows.addAll(dealData(sql)) + } + } + } + + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) + println "BIGDATA_DEAL_FJW ÉÏ´«FtpÍê³É......${endDateStr}" + } + + + def createDeal(sql){ + def allRows = [] sqlInstance.eachRow(sql,{r-> def data = [] data << r.CITYID @@ -550,9 +652,89 @@ class ExportDistrictRongHeTest extends BaseBatch{ data << r.WORKDATE allRows << data }); - FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); - CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) - println "BIGDATA_DEAL_FJW ÉÏ´«FtpÍê³É......${endDateStr}" + + return allRows; + } + + + def dealData(def sql){ + def allRows = [] + pgsqlInstance.eachRow(sql, { r -> + def data = [] + data << r.urbn_id + data << r.gujia_bds_mdl_id + data << r.urbn_nm + data << r.gujia_admndiv_id + data << r.gujia_admndiv_nm + data << r.gujia_str + data << r.gujia_hsno + data << r.gujia_comm_id + data << r.comm_nm + data << r.gujia_bld_id + data << r.bld_id + data << r.gujia_bld_nm + data << r.gujia_unit_id + data << r.unit_id + data << r.gujia_unit_nm + data << r.gujia_acc_id + data << r.gujia_dtl_adr + data << r.gujia_bds_bld_yr_rc + data << r.gujia_own_val + data << r.gujia_own_yrlmt_val + data << r.gujia_prd_val + data << r.gujia_bds_wbt_floor + data << r.gujia_lyr_tp_val + data << r.gujiabdstot_floor_num + if(r.gujia_bld_tp_val){ + def arrs = r.gujia_bld_tp_val.replace("[","").replace("]","").split(",") + data << arrs[0].trim() + }else{ + data << '' + } + + data << r.gujia_bld_stc + data << r.guiabconstructionarea + data << r.gujiabdsset_innr_area + data << r.gujia_acc_tp_val + data << r.gujia_bds_room_num + data << r.gujia_bds_dept_num + data << r.gujia_bds_ktch_num + data << r.gujia_bds_hlt_btw_num + data << r.gujia_hs_use + data << r.gujia_indr_stc_val + data << r.gujia_twrd_val + data << r.gujia_dcrt_sttn + data << r.gujia_ases_bt_ln_num + data << r.gujia_bds_trdtckt_prc + data << r.gujia_bds_mdl_tot_prc + data << r.gujia_bds_dcl_tot_prc + data << r.gujiabds_ases_tot_prc + data << r.gujiasigntonlinectrid + data << r.txn_dt + data << r.gujia_txn_tp_val + data << r.gujia_sell_pymtmod + data << r.gujia_bds_mdl_cyc + data << r.gujiawthrext_lift_ind + data << r.gujiabdslndfgrngvarea + data << r.gujiabdslutbl_gv_area + data << r.gujiabdssuntblgv_area + data << r.gujiabdsbayindowgarea + data << r.gujiabdstowerfrgvarea + data << r.gujia_bds_grg_gv_area + data << r.gujiabdsundgdrmgvarea + data << r.gujiabds_othr_gv_area + data << r.gujia_hs_src_dtsrc + data << r.intr_co_id + data << r.intr_co_nm + data << r.rmrk_dsc + data << r.data_crt_tm + data << r.data_udt_tm + data << r.gujia_src_co +// data << r.gujia_bds_mkdam + data << r.gujia_bds_data_tm_val + allRows << data + }); + return allRows } def exportAllBigdataDealFJW(){ @@ -632,58 +814,213 @@ class ExportDistrictRongHeTest extends BaseBatch{ allRows << data }); def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); println "BIGDATA_DEAL_FJW µ¼³öÍê³É......" } - def exportBigdataBuildingFJW(cityCode){ - def sql = "select CITYID, BUILDID, BUILDNO, BUILDNAME, BUILDALIAS, DISTID, COMMID, BUILDYEAR, BUILDTYPE, BUILDSTRU, FLOORCNT, UNITCNT, HOUSECNT, IFELEVATOR, ELEVATORCNT, ELEVATORHOUSE, REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE, VALID_FLAG from BIGDATA_BUILDING_FJW";//where CITYID='${cityCode}' - def allRows = [] - sqlInstance.eachRow(sql,{r-> - def data = [] - data << r.CITYID - data << r.BUILDID - data << r.BUILDNO - data << r.BUILDNAME - data << r.BUILDALIAS - data << r.DISTID - data << r.COMMID - data << r.BUILDYEAR - if(r.BUILDTYPE){ - def arrs = r.BUILDTYPE.replace("[","").replace("]","").split(",") - data << arrs[0].trim() - }else{ - data << '' - } - data << r.BUILDSTRU - data << r.FLOORCNT - data << r.UNITCNT - data << r.HOUSECNT - data << r.IFELEVATOR - data << r.ELEVATORCNT - data << r.ELEVATORHOUSE - data << r.REMARK - data << r.CREATETIME - data << r.UPDATETIME - data << r.SOURCECODE - data << r.VALID_FLAG - allRows << data - }); + def exportBigdataBuildingFJW(){ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat" + def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat" } - FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + def index = 0 + for(def city : citys) { + + def allRows = [] + def cityCode = cityCodeMap.get(city) + def sql = "select CITYID, BUILDID, BUILDNO, BUILDNAME, BUILDALIAS, DISTID, COMMID, BUILDYEAR, BUILDTYPE, BUILDSTRU, FLOORCNT, UNITCNT, HOUSECNT, IFELEVATOR, ELEVATORCNT, ELEVATORHOUSE, REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE, VALID_FLAG from BIGDATA_BUILDING_FJW where CITYID='${cityCode}'";// + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.BUILDID + data << r.BUILDNO + data << r.BUILDNAME + data << r.BUILDALIAS + data << r.DISTID + data << r.COMMID + data << r.BUILDYEAR + if(r.BUILDTYPE){ + def arrs = r.BUILDTYPE.replace("[","").replace("]","").split(",") + data << arrs[0].trim() + }else{ + data << '' + } + data << r.BUILDSTRU + data << r.FLOORCNT + data << r.UNITCNT + data << r.HOUSECNT + data << r.IFELEVATOR + data << r.ELEVATORCNT + data << r.ELEVATORHOUSE + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + data << r.VALID_FLAG + allRows << data + }); + + if(allRows && allRows.size()>0){ + index = index + 1 + if(index == 1){ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + }else{ + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", true); + } + } + } + CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) println "BIGDATA_BUILDING_FJW ÉÏ´«FtpÍê³É......" } + def exportBigdataCityPrice(queryDate){ + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_CITYPRICE_FJW_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_CITYPRICE_FJW_ADD_${curDate}_0001.dat" + } + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + // def sql = "select CITYID, YMID, SALEPRICE,RENTPRICE,SALECOUNT,RENTCOUNT, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, HOUSEUSE,SALEBLDGAREA,RENTBLDGAREA,SALETOTALPRICE,RENTTOTALPRICE,DATATYPE,SDATERANGE,RDATERANGE,SOURCECODE from BIGDATA_CITYPRICE where CITYID='${cityCode}' and YMID=${queryDate}";// + def sql = "select CITYID, YMID, SALEPRICE,RENTPRICE,SALECOUNT,RENTCOUNT, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, HOUSEUSE,SALEBLDGAREA,RENTBLDGAREA,SALETOTALPRICE,RENTTOTALPRICE,DATATYPE,SDATERANGE,RDATERANGE,SOURCECODE from BIGDATA_CITYPRICE_FJW where CITYID='${cityCode}'";// + + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.YMID + data << r.SALEPRICE?r.SALEPRICE:'' + data << r.RENTPRICE?r.RENTPRICE:'' + if(r.SALECOUNT>0) { + data << r.SALECOUNT + }else{ + data << '' + } + if(r.RENTCOUNT>0){ + data << r.RENTCOUNT + }else{ + data << '' + } + data << r.UPDATETIME + data << r.HOUSEUSE + data << r.SALEBLDGAREA?r.SALEBLDGAREA:'' + data << r.RENTBLDGAREA?r.RENTBLDGAREA:'' + data << r.SALETOTALPRICE?r.SALETOTALPRICE:'' + data << r.RENTTOTALPRICE?r.RENTTOTALPRICE:'' + data << r.DATATYPE + data << r.SDATERANGE + data << r.RDATERANGE + data << r.SOURCECODE + allRows << data + }); + } + + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) + println "BIGDATA_CITYPRICE ÉÏ´«FtpÍê³É......" + } + + + def exportBigdataDistPrice(queryDate){ + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_DISTPRICE_FJW_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_DISTPRICE_FJW_ADD_${curDate}_0001.dat" + } + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select CITYID,DISTID, YMID, SALEPRICE,RENTPRICE,SALECOUNT,RENTCOUNT, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, HOUSEUSE,SALEBLDGAREA,RENTBLDGAREA,SALETOTALPRICE,RENTTOTALPRICE,DATATYPE,SDATERANGE,RDATERANGE,SOURCECODE from BIGDATA_DISTPRICE_FJW where CITYID='${cityCode}'";// and YMID=${queryDate} + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.YMID + data << r.DISTID + data << r.SALEPRICE?r.SALEPRICE:'' + data << r.RENTPRICE?r.RENTPRICE:'' + if(r.SALECOUNT>0) { + data << r.SALECOUNT + }else{ + data << '' + } + if(r.RENTCOUNT>0){ + data << r.RENTCOUNT + }else{ + data << '' + } + data << r.UPDATETIME + data << r.HOUSEUSE + data << r.SALEBLDGAREA?r.SALEBLDGAREA:'' + data << r.RENTBLDGAREA?r.RENTBLDGAREA:'' + data << r.SALETOTALPRICE?r.SALETOTALPRICE:'' + data << r.RENTTOTALPRICE?r.RENTTOTALPRICE:'' + data << r.DATATYPE + data << r.SDATERANGE + data << r.RDATERANGE + data << r.SOURCECODE + allRows << data + }); + } + + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) + println "BIGDATA_DISTPRICE ÉÏ´«FtpÍê³É......" + } + + + def exportBigdataCommPrice(queryDate){ + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_COMMPRICE_FJW_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMPRICE_FJW_ADD_${curDate}_0001.dat" + } + def allRows = [] + for(def city : citys) { + def cityCode = cityCodeMap.get(city) + def sql = "select CITYID, YMID,COMMID, SALEPRICE,RENTPRICE,SALECOUNT,RENTCOUNT, to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME, HOUSEUSE,SALEBLDGAREA,RENTBLDGAREA,SALETOTALPRICE,RENTTOTALPRICE,DATATYPE,SDATERANGE,RDATERANGE,SOURCECODE from BIGDATA_COMMPRICE_FJW where CITYID='${cityCode}' and YMID>=202210";// and YMID=${queryDate} + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.YMID + data << r.COMMID + data << r.SALEPRICE?r.SALEPRICE:'' + if(r.SALECOUNT>0) { + data << r.SALECOUNT + }else{ + data << '' + } + data << r.RENTPRICE?r.RENTPRICE:'' + if(r.RENTCOUNT>0){ + data << r.RENTCOUNT + }else{ + data << '' + } + data << r.UPDATETIME + data << r.SALEBLDGAREA?r.SALEBLDGAREA:'' + data << r.RENTBLDGAREA?r.RENTBLDGAREA:'' + data << r.SALETOTALPRICE?r.SALETOTALPRICE:'' + data << r.RENTTOTALPRICE?r.RENTTOTALPRICE:'' + data << r.HOUSEUSE + data << r.SDATERANGE + data << r.RDATERANGE + data << r.DATATYPE + data << r.SOURCECODE + allRows << data + }); + } + + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) + println "BIGDATA_COMMPRICE ÉÏ´«FtpÍê³É......" + } + def exportEvaluateRate(){ @@ -703,9 +1040,9 @@ class ExportDistrictRongHeTest extends BaseBatch{ allRows << data }); def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat" + def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) @@ -714,9 +1051,9 @@ class ExportDistrictRongHeTest extends BaseBatch{ def exportBigdataBuildprojFjw(){ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat" + def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile([], fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) @@ -725,23 +1062,35 @@ class ExportDistrictRongHeTest extends BaseBatch{ def exportBigdataCommlayoutpicFjw(){ def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" - def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat" + def fileName = "/ccb_ronghe/${curDate}/FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat" if(CommonDatautils.isWindow()){ - fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat" + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat" } FileUtils.batchCreateFile([], fileName, [], "utf-8", false); CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) println "BIGDATA_COMMLAYOUTPIC_FJW ÉÏ´«FtpÍê³É......" } - def exportOk(curDate){ -// def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMMdd") - def dataCodeFileName = "/ccb_rh/${curDate}/${curDate}.ok" - if(CommonDatautils.isWindow()){ - dataCodeFileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\${curDate}.ok" + + def exportInOk(){ + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + Vector files = CcbFtpTestUtils.listFileNames("rh", curDate) + Iterator fileVec = files.iterator() + def fileRows = [] + while(fileVec.hasNext()){ + ChannelSftp.LsEntry file = fileVec.next() + + if(org.apache.commons.lang.StringUtils.isNotBlank(file.getFilename()) && file.getFilename().endsWith(".dat")){ + fileRows << file.getFilename() +" "+CcbFtpTestUtils.getFileLength("rh", file.getFilename(), curDate) + } } - FileUtils.batchCreateFile([], dataCodeFileName, [], "utf-8", false); - CcbFtpTestUtils.ftpUpload("rh",dataCodeFileName, curDate) + def fileName = "/ccb_ronghe/${curDate}/${curDate}.ok" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_ronghe\\${curDate}\\${curDate}.ok" + } + FileUtils.createTxtFile(fileRows, fileName, "utf-8", false); + CcbFtpTestUtils.ftpUpload("rh", fileName, curDate) + println "ÈÚºÏͳ¼ÆÎļþ³¤¶ÈokÎļþ ÉÏ´«FtpÍê³É......" } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/NoFenCity.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/NoFenCity.groovy new file mode 100644 index 000000000..11270dab3 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/NoFenCity.groovy @@ -0,0 +1,747 @@ +package com.fangjia.script.ccbevaluation.ronghe + +import com.fangjia.script.BaseBatch +import com.fangjia.script.BatchOwner +import com.fangjia.script.Watcher +import com.fangjia.script.ccbevaluation.CcbCommonUtils +import com.fangjia.script.ccbevaluation.CcbFtpTestUtils + +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.gj.ccb.FileUtils +import com.fangjia.script.util.DateUtils +import groovy.sql.Sql + +import java.sql.ResultSet +import java.sql.ResultSetMetaData + +@BatchOwner(Watcher.GaoJuan) +class ExportDistrictRongHeTest extends BaseBatch{ + + def sqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", + "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") + static main(args) { + runBatch(new ExportDistrictRongHeTest(), args); + } + + @Override + void process(Object args) { + def curDate = 20220310//DateUtils.formatDateByPattern(new Date()+1, "yyyyMMdd") + def fileName = "/ccb_rh/${curDate}" +// if(CommonDatautils.isWindow()){ +// fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}" +// } + CcbFtpTestUtils.delete(fileName) + + exportBigdataDealFJW2(curDate, DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()+1,-2), "yyyy-MM-dd")) + + exportBigdataCommunityGJRH() + exportBigdataBuildingFJW() + exportBigdataCommfeeGj() + + exportBigdataCommbuildstruGJ() + exportBigdataCommhousetypeGJ() + exportBigdataCommbuildyearGj() + exportBigdataCommhouseuseGJ() + exportBigdataPositionGJ() + exportBigdataDistrictFJW() + exportBigdataAliasFJW() + + exportBigdataBuildprojFjw() + exportBigdataCommlayoutpicFjw() + exportEvaluateRate() + + SSHHelper jschCommand = new SSHHelper(); + System.out.println(jschCommand.executeCommand("sh /home/ccb_rh/output/rh_package.sh ${curDate}")); + + exportOk(curDate) + + } + +// +// def runByCity(){ +// def citys = CcbCommonUtils.citys; +// def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() +// +// +//// //¼ì²éokÎļþÊÇ·ñÉÏ´« +//// exportAllBigdataDealFJW() +//// for(def city : citys) { +//// def cityCode = cityCodeDataMap.get(city) +//// +// //°´Ììµ¼(Ò»¸öÎļþ¼ÐÏÂ) +// //exportBigdataDealFJW(DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-2), "yyyy-MM-dd")) +// //°´Ììµ¼£¨Ã¿ÌìÒ»¸öÎļþ¼Ð£© +// exportBigdataDealFJW2(DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(),-2), "yyyy-MM-dd")) +// +//// exportBigdataCommunityGJRH(cityCode) +//// exportBigdataBuildingFJW(cityCode) +//// exportBigdataCommfeeGj(cityCode) +//// +//// exportBigdataCommbuildstruGJ(cityCode) +//// exportBigdataCommhousetypeGJ(cityCode) +//// exportBigdataCommbuildyearGj(cityCode) +//// exportBigdataCommhouseuseGJ(cityCode) +//// exportBigdataPositionGJ(cityCode) +//// exportBigdataDistrictFJW(cityCode) +//// exportBigdataAliasFJW(cityCode) +//// +//// exportBigdataBuildprojFjw(cityCode) +//// exportBigdataCommlayoutpicFjw(cityCode) +//// } +//// exportEvaluateRate() +// +//// +// def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMMdd") +// SSHHelper jschCommand = new SSHHelper(); +// System.out.println(jschCommand.executeCommand("sh /home/ccb_rh/output/rh_package.sh ${curDate}")); +// +// exportOk() +// } + + def exportBigdataCommunityGJRH(cityCode){ + def sql = "select CITYID,DISTID,COMMID,COMMNAME,ADDRESS,LANDAREA,BUILDAREA,GREENINGRATE,PLOTRATIO,PARKINGCNT,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,COMMTYPE,COMMALIAS,STREET,STREETNO,IFNEW,INTRODUCTION,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,SOURCECODE from BIGDATA_COMMUNITY_FJW";// where CITYID='${cityCode}' + def allRows = [] + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.COMMID + data << r.COMMNAME + data << r.COMMALIAS + data << r.DISTID + data << r.STREET + data << r.STREETNO + data << r.ADDRESS + data << r.LANDAREA + data << r.BUILDAREA + data << r.COMMTYPE + data << r.IFNEW + data << r.GREENINGRATE + data << r.PLOTRATIO + data << r.PARKINGCNT + data << '' + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMUNITY_FJW_ALL_${curDate}_0001.dat" + } + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + println "BIGDATA_COMMUNITY_FJW Êý¾ÝÎļþÊä³öÍê³É......" + CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) + println "BIGDATA_COMMUNITY_FJW ÉÏ´«FtpÍê³É......" + } + def exportBigdataCommbuildstruGJ(){ + def sql = "select CITYID,COMMID,BUILDSTRU,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMBUILDSTRU_FJW";// where CITYID='${cityCode}' + def allRows = [] + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.COMMID + data << r.BUILDSTRU + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDSTRU_FJW_ALL_${curDate}_0001.dat" + } + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) + println "BIGDATA_COMMBUILDSTRU_FJW ÉÏ´«FtpÍê³É......" + } + + def exportBigdataCommhousetypeGJ(cityCode){ + def sql = "select CITYID,COMMID,HOUSETYPE,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMHOUSETYPE_FJW";// where CITYID='${cityCode}' + def allRows = [] + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.COMMID + data << r.HOUSETYPE + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSETYPE_FJW_ALL_${curDate}_0001.dat" + } + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) + println "BIGDATA_COMMHOUSETYPE_FJW ÉÏ´«FtpÍê³É......" + } + + def exportBigdataCommbuildyearGj(){ + def sql = "select CITYID,COMMID,BUILDYEAR,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMBUILDYEAR_FJW";// where CITYID='${cityCode}' + def allRows = [] + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.COMMID + data << r.BUILDYEAR + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMBUILDYEAR_FJW_ALL_${curDate}_0001.dat" + } + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpTestUtils.ftpUpload("rh", fileName, curDate) + println "BIGDATA_COMMBUILDYEAR_FJW ÉÏ´«FtpÍê³É......" + } + + def exportBigdataCommfeeGj(){ + def sql = "select CITYID,COMMID,COMPID,FEE,HOUSEUSE,BUILDTYPE,FEETYPE,NOTE,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMFEE_FJW";//where CITYID='${cityCode}' + def allRows = [] + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.COMMID + data << r.COMPID + data << r.FEE + data << r.HOUSEUSE + if(r.BUILDTYPE){ + def arrs = r.BUILDTYPE.replace("[","").replace("]","").split(",") + data << arrs[0].trim() + }else{ + data << '' + } + data << r.FEETYPE + data << r.NOTE + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMFEE_FJW_ALL_${curDate}_0001.dat" + } + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) + println "BIGDATA_COMMFEE_FJW ÉÏ´«FtpÍê³É......" + } + + + def exportBigdataCommhouseuseGJ(){ + def sql = "select CITYID,COMMID,HOUSEUSE,HOUSECNT,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_COMMHOUSEUSE_FJW";// where CITYID='${cityCode}' + def allRows = [] + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.COMMID + data << r.HOUSEUSE + data << r.HOUSECNT + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMHOUSEUSE_FJW_ALL_${curDate}_0001.dat" + } + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) + println "BIGDATA_COMMHOUSEUSE_FJW ÉÏ´«FtpÍê³É......" + } + + def exportBigdataPositionGJ(){ + def sql = "select CITYID,OBJECTTYPE,OBJECTID,POSITIONTYPE,SEQNO,LONGITUDE,LATITUDE,ALTITUDE,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_POSITION_FJW";// where CITYID='${cityCode}' + def allRows = [] + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.OBJECTTYPE + data << r.OBJECTID + data << r.POSITIONTYPE + data << r.SEQNO + data << r.LONGITUDE + data << r.LATITUDE + data << r.ALTITUDE + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_POSITION_FJW_ALL_${curDate}_0001.dat" + } + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) + println "BIGDATA_POSITION_FJW ÉÏ´«FtpÍê³É......" + } + + def exportBigdataDistrictFJW(){ + def sql = "select DISTID,DISTNAME,DISTSPELL,CITYID,DISTCODE,SEQ,DISTTYPE,REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from BIGDATA_DISTRICT_FJW";// where CITYID='${cityCode}' + def allRows = [] + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.DISTID + data << r.DISTNAME + data << r.DISTSPELL + data << r.CITYID + data << r.DISTCODE + data << r.SEQ + data << r.DISTTYPE + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DISTRICT_FJW_ALL_${curDate}_0001.dat" + } + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpTestUtils.ftpUpload("rh", fileName, curDate) + println "BIGDATA_DISTRICT_FJW ÉÏ´«FtpÍê³É......" + } + + def exportBigdataAliasFJW(){ + def sql = "select city_id, ca_id,address_id,address_name, status, exp_dt, version, is_key_name, data_source, description,alias_grade,addr_type_cd,ifexamine,ifdisplay from ADDRESS_ALIAS_FJW";// where city_id='${cityCode}' + def allRows = [] + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.city_id + data << r.ca_id + data << r.address_id + data << r.address_name + data << r.status + data << r.exp_dt + data << r.version + data << r.is_key_name + data << r.data_source + data << r.description + data << r.alias_grade + data << r.addr_type_cd + data << r.ifexamine + data << r.ifdisplay + allRows << data + }); + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_ADDRESS_ALIAS_FJW_ALL_${curDate}_0001.dat" + } + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) + println "ADDRESS_ALIAS_FJW ÉÏ´«FtpÍê³É......" + } + + def exportBigdataDealFJW(dealdate){ + + def startDateStr = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd") + def endDateStr = DateUtils.formatDateByPattern(DateUtils.getLastDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd") + def stop = false + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def index = 0 + + def curStartDateStr = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date()),"yyyy-MM-dd") + def curSndDateStr = DateUtils.formatDateByPattern(DateUtils.getLastDayOfMonth(new Date()),"yyyy-MM-dd") + + while(!stop){ + index++ + def curStartStr = curStartDateStr + + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curStartStr.replace("-","")}_0001.dat" + } + + def allRows = [] + if(index==1){ + def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ where dealdate>=to_date('${startDateStr}','yyyy-MM-dd') and dealdate<=to_date('${endDateStr}','yyyy-MM-dd')";//CITYID='${cityCode}' and + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.DEALID + data << r.CITYNAME + data << r.DISTID + data << r.DISTNAME + data << r.STREET + data << r.STREETNO + data << r.COMMID + data << r.COMMNAME + data << r.BUILDID + data << r.BUILDNO + data << r.BUILDNAME + data << r.UNITID + data << r.UNITNO + data << r.UNITNAME + data << r.HOUSEID + data << r.ADDRESS + data << r.BUILDYEAR + data << r.PROPTYPE + data << r.PROPYEARS + data << r.PERIODNUM + data << r.FLOORNUM + data << r.FLOORTYPE + data << r.FLOORCNT + if(r.BUILDTYPE){ + def arrs = r.BUILDTYPE.replace("[","").replace("]","").split(",") + data << arrs[0].trim() + }else{ + data << '' + } + data << r.BUILDSTRU + data << r.BUILDAREA + data << r.LIVINGAREA + data << r.HOUSESTYLE + data << r.ROOMCNT + data << r.LIVINGROOMCNT + data << r.KITCHENCNT + data << r.BATHROOMCNT + data << r.HOUSEUSE + data << r.HOUSESTRU + data << r.HOUSEASPECT + data << r.FITMENT + data << r.EVALUATENO + data << r.DEALUNITPRICE + data << r.DEALTOTALPRICE + data << r.DECLAREPRICE + data << r.EVALUATEPRICE + data << r.CONTRACTNO + data << r.DEALDATE + data << r.DEALTYPE + data << r.PAYTYPE + data << r.DEALPERIOD + data << r.IFELEVATOR + data << r.COMPAREAGARDEN + data << r.COMPAREATERRACE + data << r.COMPAREABALCONY + data << r.COMPAREABAYWINDOW + data << r.COMPAREAATTIC + data << r.COMPAREAGARAGE + data << r.COMPAREABASEMENT + data << r.COMPAREAOTHER + data << r.DATASOURCE + data << r.AGENCYID + data << r.AGENCYNAME + data << r.REMARK + data << r.CREATETIME1 + data << r.UPDATETIME1 + data << r.SOURCECODE + data << r.WORKDATE + allRows << data + }); + } + if(curStartDateStr == curSndDateStr){ + stop = true + } + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpTestUtils.ftpUpload("rh", fileName, curDate) + println "BIGDATA_DEAL_FJW ÉÏ´«FtpÍê³É......${curStartStr}" + def curEndStr = DateUtils.add(curStartStr, 1) + curStartDateStr = curEndStr + } + } + + + def exportBigdataDealFJW2(curDate, dealdate){ + + def startDateStr = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd") + def endDateStr = DateUtils.formatDateByPattern(DateUtils.getLastDayOfMonth(DateUtils.parseFromTightYYYYMMDD(dealdate)), "yyyy-MM-dd") +// def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMMdd") + + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + } + + def allRows = [] + def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ where dealdate>=to_date('${startDateStr}','yyyy-MM-dd') and dealdate<=to_date('${endDateStr}','yyyy-MM-dd')";//CITYID='${cityCode}' and + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.DEALID + data << r.CITYNAME + data << r.DISTID + data << r.DISTNAME + data << r.STREET + data << r.STREETNO + data << r.COMMID + data << r.COMMNAME + data << r.BUILDID + data << r.BUILDNO + data << r.BUILDNAME + data << r.UNITID + data << r.UNITNO + data << r.UNITNAME + data << r.HOUSEID + data << r.ADDRESS + data << r.BUILDYEAR + data << r.PROPTYPE + data << r.PROPYEARS + data << r.PERIODNUM + data << r.FLOORNUM + data << r.FLOORTYPE + data << r.FLOORCNT + if(r.BUILDTYPE){ + def arrs = r.BUILDTYPE.replace("[","").replace("]","").split(",") + data << arrs[0].trim() + }else{ + data << '' + } + data << r.BUILDSTRU + data << r.BUILDAREA + data << r.LIVINGAREA + data << r.HOUSESTYLE + data << r.ROOMCNT + data << r.LIVINGROOMCNT + data << r.KITCHENCNT + data << r.BATHROOMCNT + data << r.HOUSEUSE + data << r.HOUSESTRU + data << r.HOUSEASPECT + data << r.FITMENT + data << r.EVALUATENO + data << r.DEALUNITPRICE + data << r.DEALTOTALPRICE + data << r.DECLAREPRICE + data << r.EVALUATEPRICE + data << r.CONTRACTNO + data << r.DEALDATE + data << r.DEALTYPE + data << r.PAYTYPE + data << r.DEALPERIOD + data << r.IFELEVATOR + data << r.COMPAREAGARDEN + data << r.COMPAREATERRACE + data << r.COMPAREABALCONY + data << r.COMPAREABAYWINDOW + data << r.COMPAREAATTIC + data << r.COMPAREAGARAGE + data << r.COMPAREABASEMENT + data << r.COMPAREAOTHER + data << r.DATASOURCE + data << r.AGENCYID + data << r.AGENCYNAME + data << r.REMARK + data << r.CREATETIME1 + data << r.UPDATETIME1 + data << r.SOURCECODE + data << r.WORKDATE + allRows << data + }); + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) + println "BIGDATA_DEAL_FJW ÉÏ´«FtpÍê³É......${endDateStr}" + } + + def exportAllBigdataDealFJW(){ + def sql = "select CITYID, DEALID, CITYNAME, DISTID, DISTNAME, STREET, STREETNO, COMMID, COMMNAME, BUILDID, BUILDNO, BUILDNAME, UNITID, UNITNO, UNITNAME, HOUSEID, ADDRESS, BUILDYEAR, PROPTYPE, PROPYEARS, PERIODNUM, FLOORNUM, FLOORTYPE, FLOORCNT, BUILDTYPE, BUILDSTRU, BUILDAREA, LIVINGAREA, HOUSESTYLE, ROOMCNT, LIVINGROOMCNT, KITCHENCNT, BATHROOMCNT, HOUSEUSE, HOUSESTRU, HOUSEASPECT, FITMENT, EVALUATENO, DEALUNITPRICE, DEALTOTALPRICE, DECLAREPRICE, EVALUATEPRICE, CONTRACTNO, to_char(DEALDATE,'yyyy-mm-dd') as DEALDATE, DEALTYPE, PAYTYPE, DEALPERIOD, IFELEVATOR, COMPAREAGARDEN, COMPAREATERRACE, COMPAREABALCONY, COMPAREABAYWINDOW, COMPAREAATTIC, COMPAREAGARAGE, COMPAREABASEMENT, COMPAREAOTHER, DATASOURCE, AGENCYID, AGENCYNAME, REMARK, CREATETIME, UPDATETIME, to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME1,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME1,SOURCECODE,WORKDATE from BIGDATA_DEAL_GJ where DEALDATE + def data = [] + data << r.CITYID + data << r.DEALID + data << r.CITYNAME + data << r.DISTID + data << r.DISTNAME + data << r.STREET + data << r.STREETNO + data << r.COMMID + data << r.COMMNAME + data << r.BUILDID + data << r.BUILDNO + data << r.BUILDNAME + data << r.UNITID + data << r.UNITNO + data << r.UNITNAME + data << r.HOUSEID + data << r.ADDRESS + data << r.BUILDYEAR + data << r.PROPTYPE + data << r.PROPYEARS + data << r.PERIODNUM + data << r.FLOORNUM + data << r.FLOORTYPE + data << r.FLOORCNT + if(r.BUILDTYPE){ + def arrs = r.BUILDTYPE.replace("[","").replace("]","").split(",") + data << arrs[0].trim() + }else{ + data << '' + } + data << r.BUILDSTRU + data << r.BUILDAREA + data << r.LIVINGAREA + data << r.HOUSESTYLE + data << r.ROOMCNT + data << r.LIVINGROOMCNT + data << r.KITCHENCNT + data << r.BATHROOMCNT + data << r.HOUSEUSE + data << r.HOUSESTRU + data << r.HOUSEASPECT + data << r.FITMENT + data << r.EVALUATENO + data << r.DEALUNITPRICE + data << r.DEALTOTALPRICE + data << r.DECLAREPRICE + data << r.EVALUATEPRICE + data << r.CONTRACTNO + data << r.DEALDATE + data << r.DEALTYPE + data << r.PAYTYPE + data << r.DEALPERIOD + data << r.IFELEVATOR + data << r.COMPAREAGARDEN + data << r.COMPAREATERRACE + data << r.COMPAREABALCONY + data << r.COMPAREABAYWINDOW + data << r.COMPAREAATTIC + data << r.COMPAREAGARAGE + data << r.COMPAREABASEMENT + data << r.COMPAREAOTHER + data << r.DATASOURCE + data << r.AGENCYID + data << r.AGENCYNAME + data << r.REMARK + data << r.CREATETIME1 + data << r.UPDATETIME1 + data << r.SOURCECODE + data << r.WORKDATE + allRows << data + }); + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_DEAL_FJW_ADD_${curDate}_0001.dat" + } + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + println "BIGDATA_DEAL_FJW µ¼³öÍê³É......" + } + + + def exportBigdataBuildingFJW(cityCode){ + def sql = "select CITYID, BUILDID, BUILDNO, BUILDNAME, BUILDALIAS, DISTID, COMMID, BUILDYEAR, BUILDTYPE, BUILDSTRU, FLOORCNT, UNITCNT, HOUSECNT, IFELEVATOR, ELEVATORCNT, ELEVATORHOUSE, REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE, VALID_FLAG from BIGDATA_BUILDING_FJW";//where CITYID='${cityCode}' + def allRows = [] + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.CITYID + data << r.BUILDID + data << r.BUILDNO + data << r.BUILDNAME + data << r.BUILDALIAS + data << r.DISTID + data << r.COMMID + data << r.BUILDYEAR + if(r.BUILDTYPE){ + def arrs = r.BUILDTYPE.replace("[","").replace("]","").split(",") + data << arrs[0].trim() + }else{ + data << '' + } + data << r.BUILDSTRU + data << r.FLOORCNT + data << r.UNITCNT + data << r.HOUSECNT + data << r.IFELEVATOR + data << r.ELEVATORCNT + data << r.ELEVATORHOUSE + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + data << r.VALID_FLAG + allRows << data + }); + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDING_FJW_ALL_${curDate}_0001.dat" + } + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) + println "BIGDATA_BUILDING_FJW ÉÏ´«FtpÍê³É......" + } + + + + def exportEvaluateRate(){ + def sql = "select ID, RATE_TYPE, RATE, RANK, CITY, REMARK,to_char(CREATETIME,'yyyy-mm-dd hh24:mi:ss') as CREATETIME,to_char(UPDATETIME,'yyyy-mm-dd hh24:mi:ss') as UPDATETIME,SOURCECODE from EVALUATE_RATE_FJW"; + def allRows = [] + sqlInstance.eachRow(sql,{r-> + def data = [] + data << r.ID + data << r.RATE_TYPE + data << r.RATE + data << r.RANK + data << r.CITY + data << r.REMARK + data << r.CREATETIME + data << r.UPDATETIME + data << r.SOURCECODE + allRows << data + }); + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_EVALUATE_RATE_FJW_ALL_${curDate}_0001.dat" + } + FileUtils.batchCreateFile(allRows, fileName, [], "utf-8", false); + CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) + println "EVALUATE_RATE_FJW ÉÏ´«FtpÍê³É......" + } + + def exportBigdataBuildprojFjw(){ + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_BUILDPROJ_FJW_ALL_${curDate}_0001.dat" + } + FileUtils.batchCreateFile([], fileName, [], "utf-8", false); + CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) + println "BIGDATA_BUILDPROJ_FJW ÉÏ´«FtpÍê³É......" + } + + def exportBigdataCommlayoutpicFjw(){ + def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMM")+"10" + def fileName = "/ccb_rh/${curDate}/FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat" + if(CommonDatautils.isWindow()){ + fileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\FJW_000000_000000_BIGDATA_COMMLAYOUTPIC_FJW_ALL_${curDate}_0001.dat" + } + FileUtils.batchCreateFile([], fileName, [], "utf-8", false); + CcbFtpTestUtils.ftpUpload("rh",fileName, curDate) + println "BIGDATA_COMMLAYOUTPIC_FJW ÉÏ´«FtpÍê³É......" + } + + def exportOk(curDate){ +// def curDate = DateUtils.formatDateByPattern(new Date(), "yyyyMMdd") + def dataCodeFileName = "/ccb_rh/${curDate}/${curDate}.ok" + if(CommonDatautils.isWindow()){ + dataCodeFileName = "D:\\Êý¾Ý\\½¨ÐÐ\\·¿²ú¹ÀÖµ\\Êý¾ÝÎļþ\\txt\\ccb_rh\\${curDate}\\${curDate}.ok" + } + FileUtils.batchCreateFile([], dataCodeFileName, [], "utf-8", false); + CcbFtpTestUtils.ftpUpload("rh",dataCodeFileName, curDate) + } + +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/SSHHelperTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/SSHHelperTest.groovy index 0e94c9551..07d453ef7 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/SSHHelperTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/SSHHelperTest.groovy @@ -16,7 +16,7 @@ class SSHHelperTest { private Session session = null; private Channel channel = null; - private String sftpHost = "192.168.0.86"; + private String sftpHost = "192.168.0.45"; private int sftpPort = 17495; private String sftpUserName = "ccb"; private String sftpPassword = "ccb!@#"; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/UpdateCommPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/UpdateCommPrice.groovy new file mode 100644 index 000000000..a69e66d8f --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/ccbevaluation/ronghe/UpdateCommPrice.groovy @@ -0,0 +1,74 @@ +package com.fangjia.script.ccbevaluation.ronghe + +import com.fangjia.script.ccbevaluation.CcbCommonUtils +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.util.DateUtils +import groovy.sql.Sql + +class UpdateCommPrice { + + def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse?stringtype=unspecified", + "postgres", "postgres", "org.postgresql.Driver") + + def oracleSqlInstance = Sql.newInstance("jdbc:oracle:thin:@192.168.0.236:1521:orcl", + "GOOJIA", "GOOJIA", "oracle.jdbc.driver.OracleDriver") + + public static def cityCodeMap = CcbCommonUtils.findCityCodeValue() + + static main(args) { + def task = new UpdateCommPrice() + task.run(args) + } + + def run(Object args){ + def citys = CcbCommonUtils.citys_all + def curDate = new Date() + if(args){ + def dateStr = args[0] + curDate = DateUtils.parseFromTightByPattern(dateStr,"yyyy-MM-dd")//2022-03-01 + } + def curRunDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(curDate,-1), "yyyyMM").toInteger(); + def startDate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(curDate,-1), "yyyyMMdd").toInteger(); + def dealStartDate = DateUtils.addMonth(DateUtils.parseFromTightByPattern(startDate.toString(), "yyyyMMdd"), -1) + + process(citys, dealStartDate, startDate, curRunDate) + + } + + def process(citys, dealStartDate, startDate, curRunDate){ + def rets = [] + def allDistricts = [] + def allDealCountMap = [:] + for(def city : citys) { + def districts = CcbCommonUtils.findAllDistrictByCity(city, "district", ["city", "region", "name", "lng", "estate_type2", "name_cat", "address", "alias"]); + allDistricts.addAll(districts) + + def cityCode = cityCodeMap.get(city) + def dealCountMap = findDealDatesByCity(cityCode, dealStartDate, startDate) + allDealCountMap = allDealCountMap + dealCountMap + } + + for(def i=0;i + rMap.put(r.gujia_comm_id, r.count) + }) + return rMap; + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/CzMatchDistrict.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/CzMatchDistrict.groovy new file mode 100644 index 000000000..399a4615f --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/CzMatchDistrict.groovy @@ -0,0 +1,56 @@ +package com.fangjia.script.chongqing + +import com.fangjia.script.util.ExcelUtils +import com.fangjia.script.util.OpenApiClient + +class CzMatchDistrict { + + static main(args) { + def task = new CzMatchDistrict(); + task.run(); + } + + def run(){ +// match("C:\\Users\\gaojuan\\Desktop\\ÓÐÑù±¾Ð¡Çø .xlsx") + addFlag("C:\\Users\\gaojuan\\Desktop\\ÓÐÑù±¾Ð¡Çø .xlsx") + } + + def addFlag(path){ + ExcelUtils.multiThreadingModify(path, { row -> + if(row['B'] && row['G'] && row['B']==row['G']) { +// if(row['C'] && row['C'].contains("(")){ +// def newValue = row['C'].replace("(","").replace(")","") +// row['J'] = newValue +// if(newValue == row['H'] && row['B'] == row['G']){ +// row['K'] = "¼Ó±ðÃû1" +// } +// } + if (!row['K'] && row['C'].toString().endsWith("»¨Ô°") && row['H']) { + def newValue = row['C'].replace("»¨Ô°", "") + if (newValue && newValue == row['H']) { + row['K'] = "¼Ó±ðÃû3" + } + } + } + }) + + } + + def match(path){ + ExcelUtils.multiThreadingModify(path, { row -> + if(row['C']){ + def city = row['A'] + def name = row['C'] + def region = row['B'] + println "[match] city:"+city+" region:"+region+" name:"+name + def jsonObject = OpenApiClient.addressMatch(city, name, "property", false, region, name) + if(jsonObject != null && jsonObject.precise!=-1) { + row['G'] = jsonObject.get("district") + row['H'] = jsonObject.get("name") + row['I'] = jsonObject.get("id") + + } + } + }) + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/Des3.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/Des3.groovy new file mode 100644 index 000000000..012ddd921 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/Des3.groovy @@ -0,0 +1,82 @@ +package com.fangjia.script.chongqing +import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.apache.commons.lang3.StringUtils; + +import javax.crypto.Cipher; +import javax.crypto.SecretKeyFactory; +import javax.crypto.spec.DESedeKeySpec; +import javax.crypto.spec.IvParameterSpec; +import java.security.Key; + +class Des3 { + private final static String encoding = "UTF-8"; + + static main(args) { + def task = new Des3() + task.run() + } + def run(){ + try { + String key = "111036369260679051122113"; + String iv = "23235645";//IV length must be 8 bytes long + //¼ÓÃÜ + String encryptStr = "Lk+AtbEWoNF0eQNrSsGoNJjRFuvnCaRKaypcAnaRvGpHtc2KmMOMbufut+JDWP5Rq/4qNAWsEch0iZgE5z2CTnAwCjoRTUl0"//encode("test", key, iv); + System.out.println("ÃÜÎÄ: " + encryptStr); + //½âÃÜ + String decryptStr = decode(encryptStr, key, iv); + System.out.println("Ã÷ÎÄ: " + decryptStr); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * ·½·¨ÃèÊö£º3DES¼ÓÃÜ + * @author hyang + * + * @param plainText Ã÷ÎÄ + * @param secretKey ÃÜÔ¿ + * @param iv ¼ÓÃÜÏòÁ¿ + * @return String ÃÜÎÄ + * @throws Exception + */ + public static String encode(String plainText, String secretKey, String iv) + throws Exception { + Key deskey = null; + DESedeKeySpec spec = new DESedeKeySpec(secretKey.getBytes()); + SecretKeyFactory keyfactory = SecretKeyFactory.getInstance("desede"); + deskey = keyfactory.generateSecret(spec); + Cipher cipher = Cipher.getInstance("desede/CBC/PKCS5Padding"); + IvParameterSpec ips = new IvParameterSpec(iv.getBytes()); + cipher.init(Cipher.ENCRYPT_MODE, deskey, ips); + byte[] encryptData = cipher.doFinal(plainText.getBytes(encoding)); + return Base64.encode(encryptData); + } + + /** + * ·½·¨ÃèÊö£º 3DES½âÃÜ + * @author hyang + * + * @param encryptText ÃÜÎÄ + * @param secretKey ÃÜÔ¿ + * @param iv ¼ÓÃÜÏòÁ¿ + * @return String Ã÷ÎÄ + * @throws Exception + */ + public static String decode(String encryptText, String secretKey, String iv) + throws Exception { + if (StringUtils.isBlank(encryptText) || StringUtils.isBlank(secretKey)) { + return ""; + } + Key deskey = null; + DESedeKeySpec spec = new DESedeKeySpec(secretKey.getBytes()); + SecretKeyFactory keyfactory = SecretKeyFactory.getInstance("desede"); + deskey = keyfactory.generateSecret(spec); + Cipher cipher = Cipher.getInstance("desede/CBC/NoPadding"); //desede/CBC/NoPadding ÎÞÌî³ä desede/CBC/PKCS5Padding ¼ÓÃÜÐèÒªÌî³ä£¬½âÃÜÒ»°ã¼Ó²»¼Ó¶¼½á¹ûÒ»Ö + IvParameterSpec ips = new IvParameterSpec(iv.getBytes()); + cipher.init(Cipher.DECRYPT_MODE, deskey, ips); + byte[] decryptData = cipher.doFinal(Base64.decode(encryptText)); + return new String(decryptData, encoding).trim(); + } + +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/Des3Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/Des3Test.groovy new file mode 100644 index 000000000..a9a798124 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/Des3Test.groovy @@ -0,0 +1,100 @@ +package com.fangjia.script.chongqing + +import com.fangjia.SecretUtils + +import javax.crypto.Cipher +import javax.crypto.SecretKey +import javax.crypto.spec.SecretKeySpec + +class Des3Test { + //¶¨Òå¼ÓÃÜËã·¨£¬ÓÐDES¡¢DESede(¼´3DES)¡¢Blowfish + private static final String Algorithm = "DESede"; + private static final String PASSWORD_CRYPT_KEY = "111036369260679051122113"; + + + /** + * ¼ÓÃÜ·½·¨ + * @param src Ô´Êý¾ÝµÄ×Ö½ÚÊý×é + * @return + */ + public static byte[] encryptMode(byte[] src) { + try { + SecretKey deskey = new SecretKeySpec(build3DesKey(PASSWORD_CRYPT_KEY), Algorithm); //Éú³ÉÃÜÔ¿ + Cipher c1 = Cipher.getInstance(Algorithm); //ʵÀý»¯¸ºÔð¼ÓÃÜ/½âÃܵÄCipher¹¤¾ßÀà + c1.init(Cipher.ENCRYPT_MODE, deskey); //³õʼ»¯Îª¼ÓÃÜģʽ + return c1.doFinal(src); + } catch (java.security.NoSuchAlgorithmException e1) { + e1.printStackTrace(); + } catch (javax.crypto.NoSuchPaddingException e2) { + e2.printStackTrace(); + } catch (java.lang.Exception e3) { + e3.printStackTrace(); + } + return null; + } + + + /** + * ½âÃܺ¯Êý + * @param src ÃÜÎĵÄ×Ö½ÚÊý×é + * @return + */ + public static byte[] decryptMode(byte[] src) { + try { + SecretKey deskey = new SecretKeySpec(build3DesKey(PASSWORD_CRYPT_KEY), Algorithm); + Cipher c1 = Cipher.getInstance(Algorithm); + c1.init(Cipher.DECRYPT_MODE, deskey); //³õʼ»¯Îª½âÃÜģʽ + return c1.doFinal(src); + } catch (java.security.NoSuchAlgorithmException e1) { + e1.printStackTrace(); + } catch (javax.crypto.NoSuchPaddingException e2) { + e2.printStackTrace(); + } catch (java.lang.Exception e3) { + e3.printStackTrace(); + } + return null; + } + + + /* + * ¸ù¾Ý×Ö·û´®Éú³ÉÃÜÔ¿×Ö½ÚÊý×é + * @param keyStr ÃÜÔ¿×Ö·û´® + * @return + * @throws UnsupportedEncodingException + */ + public static byte[] build3DesKey(String keyStr) throws UnsupportedEncodingException{ + byte[] key = new byte[24]; //ÉùÃ÷Ò»¸ö24λµÄ×Ö½ÚÊý×飬ĬÈÏÀïÃæ¶¼ÊÇ0 + byte[] temp = keyStr.getBytes("UTF-8"); //½«×Ö·û´®×ª³É×Ö½ÚÊý×é + + /* + * Ö´ÐÐÊý×鿽±´ + * System.arraycopy(Ô´Êý×飬´ÓÔ´Êý×éÄÄÀ↑ʼ¿½±´£¬Ä¿±êÊý×飬¿½±´¶àÉÙλ) + */ + if(key.length > temp.length){ + //Èç¹ûtemp²»¹»24룬Ôò¿½±´tempÊý×éÕû¸ö³¤¶ÈµÄÄÚÈݵ½keyÊý×éÖÐ + System.arraycopy(temp, 0, key, 0, temp.length); + }else{ + //Èç¹ûtemp´óÓÚ24룬Ôò¿½±´tempÊý×é24¸ö³¤¶ÈµÄÄÚÈݵ½keyÊý×éÖÐ + System.arraycopy(temp, 0, key, 0, key.length); + } + return key; + } + + /** + * @param args + */ + public static void main(String[] args) { + String msg = "3DES¼ÓÃܽâÃܰ¸Àý"; + System.out.println("¡¾¼ÓÃÜǰ¡¿£º" + msg); + + //¼ÓÃÜ +// byte[] secretArr = Des3Test.encryptMode(msg.getBytes()); +// System.out.println("¡¾¼ÓÃܺ󡿣º" + new String(secretArr)); + + String s = "Lk+AtbEWoNF0eQNrSsGoNJjRFuvnCaRKaypcAnaRvGpHtc2KmMOMbufut+JDWP5Rq/4qNAWsEch0iZgE5z2CTnAwCjoRTUl0" + + //½âÃÜ + byte[] myMsgArr = Des3Test.decryptMode(s.getBytes("UTF-8")); + System.out.println("¡¾½âÃܺ󡿣º" + new String(myMsgArr)); + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/HailanTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/HailanTest.groovy new file mode 100644 index 000000000..2b163d322 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/HailanTest.groovy @@ -0,0 +1,703 @@ +package com.fangjia.script.chongqing + +import com.fangjia.core.RegionData +import com.fangjia.core.util.HttpRequest +import com.fangjia.script.ccbevaluation.CcbCommonUtils +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.common.DataHandleUtils +import com.fangjia.script.util.DateUtils +import com.fangjia.script.util.ElasticUtils +import com.fangjia.script.util.ExcelUtils +import com.fangjia.script.util.MongoUtils +import com.fangjia.script.util.OpenApiClient +import com.mongodb.BasicDBObject +import com.mongodb.DBCollection +import com.mongodb.DBObject +import net.sf.json.JSONObject +import org.elasticsearch.index.query.BoolQueryBuilder +import org.elasticsearch.index.query.QueryBuilder +import org.elasticsearch.index.query.QueryBuilders + +import java.util.concurrent.CopyOnWriteArrayList +import java.util.concurrent.CountDownLatch +import java.util.concurrent.ExecutorService +import java.util.concurrent.Executors +import java.util.concurrent.atomic.AtomicLong +import java.util.regex.Matcher +import java.util.regex.Pattern + +class HailanTest { + + static def DIRECTIONS = ["¶«±±", "Î÷±±", "¶«ÄÏ", "Î÷ÄÏ", "Äϱ±", "¶«Î÷", "¶«", "ÄÏ", "Î÷", "±±"] + private static final HashMap> FITMENTS_TYPES_MAPS = new HashMap>() + static{ + FITMENTS_TYPES_MAPS.put("ëÅ÷", ["ëÅ÷", "ÇåË®", "ÎÞ×°ÐÞ", "¶À¶°Ã«Å÷", "ëÅß", "°×Å÷", "¾É×°", "Å÷", "Ô­·¿", "뻵"]) + FITMENTS_TYPES_MAPS.put("¼ò×°", ["¼ò×°", "ÆÕͨװÐÞ", "ÆÕͨ", "¼òµ¥×°ÐÞ", "¼òÒ××°ÐÞ", "ÆÕ×°", "Ò»°ã×°ÐÞ", "Ò»°ã", "¼ò", "´Ö×°ÐÞ"]) + FITMENTS_TYPES_MAPS.put("¾«×°", ["¾«×°", "ȫװÐÞ", "ȫװ", "ÖеÈ×°ÐÞ", "ÖÐ×°", "Öеµ×°ÐÞ", "¾«ÖÂ×°ÐÞ", "Öеµ", "ÖеÈ", "¾«", "ÖÐÐÞ", "ÓÅÖÊ×°ÐÞ", "ʱÉÐ×°ÐÞ", "Á¼×°", "Öиߵ²"]) + FITMENTS_TYPES_MAPS.put("ºÀ×°", ["ºÀ»ª×°ÐÞ", "¸ßµµ", "ºÀ»ª", "ºÀ×°", "¸ß¼¶×°ÐÞ", "¸ß×°", "ÉݳÞ"]) + } + + static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(80) + def static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + + static main(args) { + def task = new HailanTest(); + task.run(); + } + + def run(){ + def inputfile = "D:\\Êý¾Ý\\º£ÄÏ\\ͳ¼Æ.xlsx" +// match(inputfile) +// addPrice(inputfile) +// addCommId("D:\\Êý¾Ý\\º£ÄÏ\\Æ¥ÅäÉϵĺϲ¢Êý¾Ý.xlsx") +// addHouse(inputfile) +// stat(inputfile) + hailanStat(inputfile) + } + + def addHouse(inputfile){ + + def datas = [] + datas << ["ÀàÐÍ(סլ/±ðÊû£©","ÐÐÕþÇø»®","ÏêϸµØÖ·","·¿ºÅ","Ð¡ÇøÃû³Æ","½¨ÖþÃæ»ý","ËùÔÚÂ¥²ã","ÏêϸµØÖ·","Ð¡ÇøÃû","½»Ò×ÈÕ¾ÓסÓ÷¿¼Û¸ñÖ¸Êý","ÆÀ¹ÀÈÕ¾ÓסÓ÷¿¼Û¸ñÖ¸Êý","ÊÇ·ñÓеçÌÝ","ËùÔÚÂ¥²ã","×ÜÂ¥²ã","ÄÚ²¿×°ÐÞ","Æ½Ãæ²¼ÖÃ","³¯Ïò", + "¾°¹Û","½¨Öþ½á¹¹","½¨ÖþÃæ»ý£¨Æ½·½Ã×£©","·¿ÎÝ¿ÉʹÓÃÄêÏÞ","·¿ÎÝÒÑʹÓÃÄêÏÞ","ÆÀ¹À¼Û£¨µ¥¼Û£©","¹ÒÅÆ¼Û£¨µ¥¼Û£©","³É½»¼Û£¨µ¥¼Û£©","Ð¡Çø/Â¥Å̾ù¼Û£¨µ¥¼Û£©"] + def index = 0 + ExcelUtils.multiThreadingModify(inputfile, { row -> + if(row['L']){ + index ++ + def dist = CommonDatautils.findDistrict(row['H'], row['I'], row['J'], "district") + def rets = findHouses(row['H'], row['I'], "sell", 20200101,20230113, row['J'], null, row['k']) + println index +" "+ row['C']+" "+ rets.size() + if(rets){ + def lastRets = [] + for(def r : rets){ + def fjwPrice = row['M'] + if(fjwPrice){ + def precent = java.lang.Math.abs((fjwPrice-r.avg_price)*100/r.avg_price) + if(precent>=10){ + continue; + } + } + if(row['A'] && row['A']=="±ðÊû"){ + def inputAare = row['F'].toString().toDouble() + def minArea = inputAare + 50 + def maxArea = inputAare + 100 + if(r.areamaxArea){ + continue; + } + } + + lastRets << r + if(lastRets.size()>=3){ + break; + } + } + + if(lastRets){ + for(def lr : lastRets){ + def data = [] + data << row['A'] + data << row['B'] + data << row['C'] + data << row['D'] + data << row['E'] + data << row['F'] + data << row['G'] + if(dist){ + data << dist.address + }else{ + data << "" + } + if(dist){ + data << dist.name + }else{ + data << "" + } + + data << "" + data << "" + if(lr.height){ + if(lr.height>6){ + data << "ÊÇ" + }else{ + data << "·ñ" + } + }else{ + data << "" + } + data << lr.floor + data << lr.height + data << lr.fitment + data << "" + data << lr.direction + data << "" + data << lr.build_type + data << lr.area + data << dist.property_life +// def year = dist.create_year +// if(year){ +// data << getHouseYear(year.toInteger())//ÒÑʹÓÃÄêÏÞ +// }else{ +// data << ""//ÒÑʹÓÃÄêÏÞ +// } + data << getHouseYear(dist.create_year , lr.build_date, dist.build_date) + + data << getEvalutaionPrice(lr, dist)//ÆÀ¹À¼Û£¨µ¥¼Û£© + data << lr.avg_price + data << getDealPrice(dist)//³É½»µ¥¼Û + data << row['M'] + datas << data + } + } + } + } + }) + ExcelUtils.write("D:\\Êý¾Ý\\º£ÄÏ\\º£ÄÏÑù±¾Êý¾Ý.xlsx", datas, "Ñù±¾Êý¾Ý") + } + + def getDealPrice(dist){ + def json = OpenApiClient.searchDealPrice(dist._id.toString(),"20220101", 100) + def prices = [] + if(json && json.code==200){ + def result = json.result + if(result){ + for(def r : result){ + prices << r.avgPrice + } + } + } + def dealAvgPrice = null + if(prices){ + dealAvgPrice = (prices.sum()/prices.size()).toInteger() + } + return dealAvgPrice; + } + + def getHouseYear(create_year , house_build_date, dist_build_date){ + def year = null + if(house_build_date){ + year = getYear(house_build_date) + + }else if(dist_build_date){ + year = getYear(dist_build_date) + }else if(create_year){ + year = create_year + } + if(year){ + year = year.toInteger() + def curYear = new Date().getYear()+1900 + def modYear = curYear - year + return modYear.toInteger().toString() + } + return null + + } + + + def getYear(finishBuildingDate){ + if(finishBuildingDate){ + Pattern pat3 = Pattern.compile("\\d{4}"); + def matcher3 = pat3.matcher(finishBuildingDate); + if(matcher3.find()){ + return matcher3.group() + } + } + return null + } + + + def getEvalutaionPrice(house, dist){ + def params = [:] + params.put("city", dist.city); + params.put("district", dist.region); + params.put("name", dist.name); + params.put("size", String.valueOf(house.area)); + if(house.height) { + params.put("maxFloor", dist.house_height.toString()); + params.put("direction", getDirectionCode(house.direction).toString());//³¯Ïò + if (house.house_floor) { + params.put("floor", house.house_floor.toString()); + } + } + def fitmentCode = null + if(house.fitment){ + fitmentCode = getFitmentCode(house.fitment) + params.put("decoration", fitmentCode.toString());//×°ÐÞ + } + params.put("scope", "1") + def result = OpenApiClient.evaluateDistrictPrice(params); + + if(result){ + return result.avgPrice + } + return null + } + + + def getDirectionCode(def s){ + def directMap = ["Î÷ÄÏ":1, "¶«ÄÏ":2, "ÄÏ":3, "Î÷±±":4, "¶«±±":5, "¶«":6, "Î÷":7, "±±":8, "¶«Î÷":9, "Äϱ±":10] + return directMap.get(s); + } + def getFitmentCode(def s){ + if(s){ + if(["ëÅ÷"].contains(s)){ + return 1; + }else if(["¼òµ¥×°ÐÞ","¼ò×°"].contains(s)){ + return 2; + }else if(["¾«×°ÐÞ","¾«×°"].contains(s)){ + return 3; + }else if(["ºÀ»ª×°ÐÞ","ºÀ×°"].contains(s)){ + return 4; + } + } + return null + } + + + + + def findHouses(def city, def region, def cat, def startDate, def endDate, def name, def alias, def estate_type2){ + + QueryBuilder date_range = QueryBuilders.rangeQuery("p_date").from(startDate).to(endDate).includeLower(false).includeUpper(false); + QueryBuilder area_range = QueryBuilders.rangeQuery("area").from(20).to(500).includeLower(true).includeUpper(false); + + QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("city", city)).must(QueryBuilders.termQuery("region", region)).must(QueryBuilders.termQuery("cat", cat)) + .must(date_range).must(area_range) + + if(!alias){ + alias = [] + } + if(!alias.contains(name)){ + alias.add(name) + } + + + if(alias && alias.size()>0){ + BoolQueryBuilder inBuilder = QueryBuilders.boolQuery(); + for(def s : alias){ + inBuilder.should(QueryBuilders.matchQuery("district_name", s)); + } + queryBuilder.must(inBuilder) + } + + + def rets = [] + def hosts = ["192.168.0.206","192.168.0.211","192.168.0.212","192.168.0.213","192.168.0.214","192.168.0.215"] + def index = new Random().nextInt(5); + + def houses = ElasticUtils.executeSimpleQuery(hosts[index], "seawater-20*", queryBuilder); + + if(houses){ + for (int k=0;k60){ + continue; + } + +// if(!seawater.room){ +// continue; +// } +// if(!seawater.room){ +// seawater.room = null +// } + + if(seawater.room){ + if(seawater.room>=11 || seawater.room<1){ + continue; + } + } + + if(!seawater.hall){ + seawater.hall = null + } + if(seawater.hall && (seawater.hall>=5 || seawater.hall<1)){ + continue; + } + if(!seawater.toilet){ + seawater.toilet = null + } + if(seawater.toilet && (seawater.toilet>=5 || seawater.toilet<1)){ + continue; + } + + + def floor = parseFloor(seawater.floor_info) + if(seawater.height && floor && floor.isNumber()){ + if(floor.toInteger()>seawater.height){ + floor = null + seawater.height = null + } + + } + + if(!floor){ + seawater.floor = null + } + if(floor && floor.toInteger()<1){ + floor = null + } + + def rowMap = [:]; + + rowMap.houseId = seawater.id +// rowMap.city = CcbCommonUtils.getCcbCity(city) + //rowMap.region =seawater.region + //rowMap.address = seawater.address + rowMap.area = seawater.area + rowMap.address = seawater.address + rowMap.total_price = seawater.total_price + rowMap.avg_price = seawater.avg_price + rowMap.build_type = seawater.build_type + rowMap.build_date = seawater.build_date + rowMap.district_name = seawater.district_name + rowMap.height = seawater.height=="null"?null:seawater.height + if(rowMap.height && rowMap.height<1){ + rowMap.height = null + } + rowMap.floor = floor=="null"?null:floor + rowMap.room = seawater.room=="null"?null:seawater.room + rowMap.hall = seawater.hall=="null"?null:seawater.hall + rowMap.toilet = seawater.toilet=="null"?null:seawater.toilet + + + def direction = parseDirection(seawater.direction) + rowMap.direction = direction=="null"?null:direction + + def fitment = parseFitment(seawater.fitment) + rowMap.fitment = fitment=="null"?null:fitment + + + + if(seawater.p_date instanceof String){ + seawater.p_date = seawater.p_date.toInteger() + } + + rowMap.p_date = DateUtils.formatDateByPattern(DateUtils.parseFromTightYYYYMMDD2(seawater.p_date.toString()), "yyyy-MM-dd HH:mm:ss") + rowMap.c_date = DateUtils.getConverDate(seawater.m_date) + rowMap.m_date = DateUtils.getConverDate(seawater.m_date) + + rets << rowMap + } + } + return rets; + } + + + static def parseFloor(def floorDesc){ + if(floorDesc){ + floorDesc = floorDesc.replaceAll("[\\s ]+", "") + if(floorDesc){ + Pattern pat1 = Pattern.compile("µÚ(\\d{1,2})²ã"); + Matcher matcher1 = pat1.matcher(floorDesc); + if (matcher1.find()) { + return matcher1.group(1) + } + pat1 = Pattern.compile("(\\d{1,2})²ã?(/|\\()¹²?\\d{1,2}(²ã|F)?"); + matcher1 = pat1.matcher(floorDesc); + if (matcher1.find()) { + return matcher1.group(1) + } +// if(floorDesc.contains("ÖÐÂ¥²ã") || floorDesc.contains("Öвã")){ +// return "Öвã" +// } +// +// if(floorDesc.contains("¸ßÂ¥²ã") || floorDesc.contains("¸ß²ã")){ +// return "¸ß²ã" +// } +// +// +// if(floorDesc.contains("µÍÂ¥²ã") || floorDesc.contains("µÍ²ã")){ +// return "µÍ²ã" +// } + if(floorDesc.isNumber()){ + return floorDesc; + } + } + } + return null; + } + + static String parseDirection(String directionDesc) { + if (directionDesc == null) { + return null + } + directionDesc = directionDesc.replaceAll("(\\(|£¨|¡¶|\"|¡°|¡¾|¡²).+?(\\)|¡·|£©|\"|¡±|¡¿|¡³)", "#_#") + StringBuffer sb = new StringBuffer() + for (int i = 0; i < directionDesc.length(); i++) { + String c = directionDesc.substring(i, i + 1) + if (DIRECTIONS.contains(c)) { + if (directionDesc.substring(i).startsWith(c + "#_#")) { + sb.append(c + " ") + } else { + sb.append(c) + } + } + } + for (String d : DIRECTIONS) { + if (sb.toString().startsWith(d)) { + return d + } + } + for (String d : DIRECTIONS) { + if (sb.toString().contains(d)) { + return d + } + } + return null + + } + + static String parseFitment(String fitmentDesc) { + if (fitmentDesc == null) { + return null + } + fitmentDesc = fitmentDesc.replaceAll("[\\s ]+", "") + if (fitmentDesc.equals("·ÇëÅ÷")) { + return null + } + Iterator>> it = FITMENTS_TYPES_MAPS + .entrySet().iterator() + Map.Entry> entry + while (it.hasNext()) { + entry = it.next() + if (fitmentDesc.contains(entry.getKey())) { + return entry.getKey() + } + for (String fitmentKey : entry.getValue()) { + if (fitmentDesc.contains(fitmentKey)) { + return entry.getKey() + } + } + } + return null + + } + + + + def addCommId(inputfile){ + ExcelUtils.modify(inputfile, { row -> + if(row['H']){ + def dist = CommonDatautils.findDistrict(row['H'], row['I'], row['J'], "district") + if(dist){ + row['L'] = dist._id.toString() + } + } + }) + } + + def addPrice(path){ + ExcelUtils.multiThreadingModify(path, { row -> + def commid = row['L'] + if(commid){ + def dist = CommonDatautils.findDistrictById(commid.trim()) + if(dist){ + def priceObj = CommonDatautils.findDistrictPrice(dist.city, dist.region, dist.name) + if(priceObj){ + row['M'] = priceObj.avg_price + } + } + } + }) + } + + + def match(path){ + ExcelUtils.multiThreadingModify(path, { row -> + if(row['C']){ + String city = row['H']//RegionData.formatCity(row['B']) + if(city){ + def address = row['C'] +// def region = row['C'] + println "[match] city:"+city+" address:"+address + def jsonObject = OpenApiClient.addressMatch(city, address, "property", false, null, row['E']) + if(jsonObject != null && jsonObject.precise!=-1) { + row['I'] = jsonObject.get("district") + row['J'] = jsonObject.get("name") + row['K'] = jsonObject.get("propertyType") + row['L'] = jsonObject.get("id") + } + }else{ + println row['C'] + } + + } + }) + } + + def stat(path){ + ExcelUtils.modify(path, { row -> + if(row['L'] && !row['H']){ + def city = row['L'] + def region = row['M'] + def dists = null + if(city && region){ + dists = CommonDatautils.findDistrictByCityAndRegions(city, "district", [region], ["city","region","name","alias","estate_type2"]) + }else{ + dists = CommonDatautils.findAllDistrictByCity(city, "district", ["city","region","name","alias","estate_type2"]) + } + def distLists = [] + def villaLists = [] + for(def d : dists){ + if(d.estate_type2=="±ðÊû"){ + villaLists << d + }else{ + distLists << d + } + } + row['J'] = dists.size() + + def haveHouseList = findHaveHouseDist(distLists) + def haveVillaList = findHaveHouseDist(villaLists) + row['H'] = haveHouseList + row['I'] = haveVillaList +// row['N'] = distLists.size() +// row['O'] = villaLists.size() + } + }) + } + + def hailanStat(path){ + def total = 0 + def distTotal = 0 + def villaTotal = 0 + def haveHouseDistTotal = 0 + def haveHouseVillaTotal = 0 + def buildStructureTotal = 0 +// ExcelUtils.modify(path, { row -> +// if (row['L'] && !row['K']) { + //"º£¿Ú","ÈýÑÇ","Èýɳ","ÙÙÖÝ", + def citys = ["Îåָɽ","Çíº£","ÎIJý","ÍòÄþ","¶«·½","¶¨°²","ÍͲý","³ÎÂõ","ÁÙ¸ß","°×ɳ","²ý½­","ÀÖ¶«","ÁêË®","±£Í¤","ÇíÖÐ"] + for(def city : citys) { + + def dists = null +// if (city && region) { +// dists = CommonDatautils.findDistrictByCityAndRegions(city, "district", [region], ["city", "region", "name", "alias", "estate_type2", "build_structure"]) +// } else { + dists = CommonDatautils.findAllDistrictByCity(city, "district", ["city", "region", "name", "alias", "estate_type2", "build_structure"]) +// } + def distLists = [] + def villaLists = [] + for (def d : dists) { + if (d.estate_type2 == "±ðÊû") { + villaLists << d + } else { + distLists << d + } + } + total = total + dists.size() + +// def structureCount = 0 +// for(def d : dists){ +// if(d.build_structure){ +// structureCount ++ +// } +// } +// println structureCount +// row['K'] = structureCount +// buildStructureTotal = buildStructureTotal + structureCount +// + def haveHouseList = findHaveHouseDist(distLists) + def haveVillaList = findHaveHouseDist(villaLists) + haveHouseDistTotal = haveHouseDistTotal + haveHouseList + haveHouseVillaTotal = haveHouseVillaTotal + haveVillaList + distTotal = distTotal + distLists.size() + villaTotal = villaTotal + villaLists.size() +// println c +" "+total+" "+buildStructureTotal +// } + } +// }) + + println total +" "+haveHouseDistTotal+" "+haveHouseVillaTotal+" "+distTotal+" "+villaTotal+" "+buildStructureTotal + + } + + def findHaveHouseDist(districts){ + def totalCount = new AtomicLong() + final CountDownLatch latch = new CountDownLatch(districts.size()) + println "Ð¡ÇøÁ¿£º"+districts.size() + + def rets = new CopyOnWriteArrayList() + + for(def i=0;i0){ + rets.add(dist) + } + println totalCount.get() +" "+ ret.size() + } catch (Exception e) { + e.printStackTrace() + } finally { + latch.countDown() + } + }; + }) + } + latch.await() + return rets.size() + } + + + def findThirdPrice(dist){ + def q = new BasicDBObject() + q.put("city", dist.city) + q.put("region", dist.region) + q.put("name", dist.name) + q.put("s_date", new BasicDBObject('$gte', 202201)) + def dbcursor = AVERAGE_STATISTICS.find(q) + def prices = [] + if(dbcursor){ + for(def d : dbcursor){ + def set = d.keySet(); + Iterator it = set.iterator() + while(it.hasNext()){ + def key = it.next() + if(key && key.contains("_price") && key!="fangjia_price" && key!="last_price"){ + def price = d[key] + if(price){ + prices << price + } + } + } + } + } + return prices; + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MingShenPocStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MingShenPocStat.groovy new file mode 100644 index 000000000..d1e0db444 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MingShenPocStat.groovy @@ -0,0 +1,328 @@ +package com.fangjia.script.chongqing + +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.common.DataHandleUtils +import com.fangjia.script.util.ElasticUtils +import com.fangjia.script.util.ExcelUtils +import com.fangjia.script.util.MongoUtils +import com.mongodb.BasicDBObject +import com.mongodb.DBCollection +import com.rabbitmq.client.impl.AMQImpl +import org.apache.lucene.queryparser.classic.QueryParser +import org.elasticsearch.index.query.BoolQueryBuilder +import org.elasticsearch.index.query.QueryBuilder +import org.elasticsearch.index.query.QueryBuilders + +import java.util.concurrent.ConcurrentHashMap +import java.util.concurrent.CopyOnWriteArrayList +import java.util.concurrent.CountDownLatch +import java.util.concurrent.ExecutorService +import java.util.concurrent.Executors +import java.util.concurrent.atomic.AtomicLong + + +class MingShenPocStat { + + static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(40) + + private static final DBCollection district_sell_stat_coll = MongoUtils.getCollectionByName("fangjia_stat", "district_sell_stat", "mongo.db.fangjia.com") + final static DBCollection CITY_INFO_CONN = MongoUtils.getCollectionByName("fangjia_data_ana", "city_info", MongoUtils.MongoDB_Domain_mongo); + + static main(args) { + def task = new MingShenPocStat() +// task.run() + task.officeRun() + } + + def officeRun(){ + def path = "D:\\Êý¾Ý\\ÃñÉú\\³éÑù-д×ÖÂ¥Àà.xlsx" + def datas = [] + ExcelUtils.modify(path, { d -> + if(d['B']){ + + def office = CommonDatautils.findDistrictById(d['C']) + if(office){ + def alias = [] + alias << office.name + if(office.alias){ + def nameAlias = office.alias + for(def o : nameAlias){ + if(o){ + alias << o + } + } + } + def aliasStr = escapeExprSpecialWord(alias.join("','")) + def houses = findOfficeHouseCount(office.city, office.region, aliasStr) + if(houses){ + if(houses.size()>=2){ + houses = houses[0..1] + } + for(def h : houses){ + def obj = findOfficeAvgPrice(office) + def rets = [] + rets << d['A'] + rets << d['B'] + rets << '' + rets << h.region + rets << office.address + rets << h.area + rets << h.floor + rets << h.height + def level = office.bed_kind + rets << level + rets << h.fitment + def date = office.finish_building_date + if(date){ + rets << date.substring(0, 4) + }else{ + rets << "" + } + + rets << "" + rets << "" + def price = "" + if(obj && obj.avg_price){ + price = obj.avg_price + rets << obj.avg_price + }else{ + rets << "" + } + + if(price){ + rets << (price*h.area).toInteger() + } + datas << rets + } + } + }else{ + def rets = [] + rets << d['A'] + rets << d['B'] + datas << rets + } + + // def districts = CommonDatautils.findAllDistrictByCity(d['C'],"office",["city", "region", "name", "alias","address","bed_kind","finish_building_date"]) + + } + }) + + ExcelUtils.write("D:\\Êý¾Ý\\ÃñÉú\\³éÑù-д×ÖÂ¥Àà-Ñù±¾.xlsx", datas, "Ñù±¾") + } + + def run(){ + def path = "D:\\Êý¾Ý\\ÃñÉú\\Ñù±¾×ֶθ²¸ÇÂÊ.xlsx" +// def datas = ExcelUtils.read("C:\\Users\\gaojuan\\Downloads\\¶þÆÚ¹ÀÖµÊý¾ÝÿÖÜͳ¼Æ\\¶þÆÚ¹ÀÖµÊý¾ÝÿÖÜͳ¼Æ\\¹ÀÖµÊý¾Ýͳ¼Æ½á¹û20230112.xlsx", 0 , 1) +// +// ExcelUtils.modify(path, { row -> +// if(row['C']) { +// def total = 0 +// def pre = 0 +// for(def d : datas){ +// if(row['C']==d['A']){ +// total = d['B'] +// pre = d['H'] +// break +// } +// } +// if(total){ +// def c = (total*pre/100).toInteger() +// row['E'] = c +// row['F'] = pre+"%" +// } +// } +// }) + + def totalcount = findHouseTotal("´óÁ¬") + def count = findHouseCount("´óÁ¬", "height") + + println DataHandleUtils.getDoubleRound(2, count*100/totalcount) + +// ExcelUtils.multiThreadingModify(path, { row -> +// if(row['C']) { + //def districts = CommonDatautils.findAllDistrictByCity(row['C'],"district",["city", "region", "name", "alias"]) +// def districts = CommonDatautils.findDistrictByCityAndRegions("´óÁ¬","district",["ÂÃ˳¿Ú"], ["city", "region", "name", "alias"]) +// def total = districts.size() +// if(total){ +// def house_dist_count = findHouseStat(districts) +// def pre = house_dist_count*100/total +// pre = DataHandleUtils.getDoubleRound(2, pre) +// println total+" "+house_dist_count+" "+pre +// } +// def count = findHouseCount(row['C']) +// row['D'] = count +// println row['C']+" "+count +// row['H'] = findDistrictSellStat(row['C']) +// row['G'] = getNewDist(row['C']) + +// def totalcount = findHouseTotal(row['C']) + +// def total = row['Z'] +// def count = findHouseCount(row['C'], "build_date") +// row['Q'] = DataHandleUtils.getDoubleRound(2, count*100/total) +// println count +" "+row['Q'] +// def obj = getFieldPrecent(row['C']) +// if(obj){ +// def detail = obj.district_detail +// row['E'] = detail.alias.toDouble()*100 +// row['F'] = detail.address.toDouble()*100 +// row['G'] = detail.lng.toDouble()*100 +// row['H'] = detail.buildType.toDouble()*100 +// row['I'] = detail.outPics.toDouble()*100 +// row['J'] = detail.developer.toDouble()*100 +// row['Q'] = detail.buildDate.toDouble()*100 +// row['R'] = detail.buildDate.toDouble()*100 +// } +// } +// }); + } + + def getFieldPrecent(city){ + def q = new BasicDBObject() + q.put("city", city) + def rets = CITY_INFO_CONN.find(q).sort(new BasicDBObject('weekend', -1)) + if(rets){ + return rets[0] + } + return null + } + + + def getNewDist(city){ + String sql = "select count(*) as count from community where city='${city}' and source='±´¿ÇÕÒ·¿-з¿' " + def count = null + ElasticUtils.executeSqlQuery(sql,{ data-> + count = data.count + }) + return count; + } + + def findDistrictSellStat(def city){ + def q = new BasicDBObject() + q.put("city", city) + def count = district_sell_stat_coll.count(q) + return count + } + + + def findHouseStat(districts){ + def totalCount = new AtomicLong() + final CountDownLatch latch = new CountDownLatch(districts.size()) + println "Ð¡ÇøÁ¿£º"+districts.size() + + def rets = new CopyOnWriteArrayList() + + for(def i=0;i0){ + rets.add(rMap) + } + println totalCount.get() +" "+ ret.size() + } catch (Exception e) { + e.printStackTrace() + } finally { + latch.countDown() + } + }; + }) + } + latch.await() + return rets.size() + } + + def findHouseTotal(city){ + def count = 0 + ElasticUtils.executeSqlQuery("select count(*) as count from seawater where p_date >= 20220101 and city='${city}'", { + count = it.count + println("$city\t${it.count}") + }) + return count + } + + def findHouseCount(city, field){ + def count = 0 + def sql = "select count(*) as count from seawater where city='${city}' and cat='sell' and "+field+" is not null" + ElasticUtils.executeSqlQuery(sql, { + count = it.count + println("$city\t${it.count}") + }) + return count + } + + def findHouses(def city, def region, def cat, def startDate, def name, def alias){ + + QueryBuilder date_range = QueryBuilders.rangeQuery("p_date").from(startDate).includeLower(false).includeUpper(false); + QueryBuilder area_range = QueryBuilders.rangeQuery("area").includeLower(true).includeUpper(false); + + QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("city", city)).must(QueryBuilders.termQuery("region", region)).must(QueryBuilders.termQuery("cat", cat)) + .must(date_range).must(area_range) + + if(!alias){ + alias = [] + } + if(!alias.contains(name)){ + alias.add(name) + } + + + if(name.contains("ÅªÐ¡Çø")){ + def newName = name.replace("ÅªÐ¡Çø","Ū") + if(!alias.contains(newName)){ + alias << newName + } + + } + + if(alias && alias.size()>0){ + BoolQueryBuilder inBuilder = QueryBuilders.boolQuery(); + for(def s : alias){ + inBuilder.should(QueryBuilders.matchQuery("district_name", s)); + } + queryBuilder.must(inBuilder) + } + + + def rets = [] + def houses = ElasticUtils.executeSimpleQuery("192.168.0.206", "seawater-20*", queryBuilder); + return houses; + } + + def findOfficeAvgPrice(office){ + def sql = "select * from office where city='${office.city}' and region='${office.region}' and name='${office.name}'" + def rets = [] + ElasticUtils.executeSqlQuery(sql, {d-> + rets << d + }) + if(rets){ + def obj = rets[0] + return obj + } + return null + + } + + def findOfficeHouseCount(city, region, names){ + def sql = "select * from seawater where city='${city}' and region='${region}' and cat='office_sell' and district_name in ('${names}') and root='58.com'" + def rets = [] + ElasticUtils.executeSqlQuery(sql, {d-> + rets << d + }) + return rets + } + + + /** + * תÒå×Ö·û´®ÖеÄÌØÊâ×Ö·û + * ½ö¹ýÂËLucene regexps, ÆäËûµÄÎðÓà + * @param keyword + * @return + */ + public static String escapeExprSpecialWord(String keyword) { + return QueryParser.escape(keyword); + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MingShenPocTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MingShenPocTest.groovy new file mode 100644 index 000000000..112de372f --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/MingShenPocTest.groovy @@ -0,0 +1,459 @@ +package com.fangjia.script.chongqing + +import com.fangjia.core.RegionData +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.gj.district.FangjiaClientUtils +import com.fangjia.script.util.BaiduMapUtils +import com.fangjia.script.util.DateUtils +import com.fangjia.script.util.DbUtils +import com.fangjia.script.util.ElasticUtils +import com.fangjia.script.util.ExcelUtils +import com.fangjia.script.util.GeoHelper +import com.fangjia.script.util.OpenApiClient +import com.mongodb.BasicDBObject +import com.mongodb.DBObject +import org.elasticsearch.index.query.BoolQueryBuilder +import org.elasticsearch.index.query.QueryBuilder +import org.elasticsearch.index.query.QueryBuilders + +class MingShenPocTest { + + def total = 5000 + static main(args) { + def task = new MingShenPocTest() + task.run() + } + def run(){ + def path = "D:\\Êý¾Ý\\ÃñÉú\\poc²âÊÔ.xlsx" + //9¼¶±ê×¼»¯ + //structureV2(path)//Õë¶Ôº£ÄÏpocµØÖ·Êý¾Ý´Ë½Ó¿Ú²»ºÏÊÊʹÓà + //Ê¡ÊÐÇø²ð·Ö +// ner(path)//³ÇÊУ¬ÇøÓò´øÊдøÇø +// match(path) +// addPrice(path) +// addLatLng(path) +// addAroundPrice(path) +// addAuthor(path) + addHouse(path) + } + + def structureV2(path){ + ExcelUtils.multiThreadingModify(path, { row -> + if(row['A']){ + def jsonObj = FangjiaClientUtils.addressStructure(null, row['A']) + if(jsonObj && jsonObj.result){ + + if(jsonObj.result.province){ + row['B'] = jsonObj.result.province + } + + if(jsonObj.result.city){ + def cityStr = null + if(jsonObj.result.city=="ÊÐÏ½Çø"){ + cityStr = jsonObj.result.province + }else{ + cityStr = jsonObj.result.city + } + row['C'] = RegionData.formatCity(cityStr) + } + + if(jsonObj.result.district){ + row['D'] = jsonObj.result.district + } + } + } + }) + } + + def ner(path){ + ExcelUtils.multiThreadingModify(path, { d -> + if(d['A'] && !d['B']) { + def json = FangjiaClientUtils.addressStand(null, d['A']) + if(json && json.entities){ + def entities = json.entities + for(def m : entities){ + if(m.type=="prov"){ + d['B'] = m.word + } + if(m.type=="city"){ + def cityStr = m.word + if(cityStr){ + d['C'] = cityStr//RegionData.formatCity(cityStr) + } + } + if(m.type=="dist") { + if(d['C']){ + d['D'] = m.word //RegionData.formatRegion(d['C'], m.word) + } + } + } + } + } + }); + } + + //¿ÉÒÔ¸ù¾Ý²âÊÔÊý¾ÝÌí¼Ó ÍÆ¼öÂ¥ÅÌÃû + def match(path){ + ExcelUtils.multiThreadingModify(path, { row -> + if(row['C'] && !row['E']){ + def city = RegionData.formatCity(row['C']) + def region = null + if(city){ + region = RegionData.formatRegion(city, row['D']) + } + def address = row['A'] + println "[match] city:"+city+" region:"+region+" address:"+address + def jsonObject = OpenApiClient.addressMatch(city, address, null, false, region, null)//"property" + if(jsonObject != null && jsonObject.precise!=-1) { + row['E'] = jsonObject.get("city") + row['F'] = jsonObject.get("district") + row['G'] = jsonObject.get("name") + row['H'] = jsonObject.get("propertyType") + row['I'] = jsonObject.get("id") + } + } + }) + } + + def addPrice(path){ + ExcelUtils.multiThreadingModify(path, { row -> + def commid = row['I'] + if(commid && !row['J']){ + def dist = CommonDatautils.findDistrictById(commid.trim()) + if(dist){ + def house = [:] + house.area = 100 + def price = getEvalutaionPrice(house, dist) + if(price){ + row['J'] = price + } +// def priceObj = CommonDatautils.findDistrictPrice(dist.city, dist.region, dist.name) +// if(priceObj){ +// row['J'] = priceObj.avg_price +// } + } + } + }) + } + + def getEvalutaionPrice(house, dist){ + def params = [:] + params.put("city", dist.city); + params.put("district", dist.region); + params.put("name", dist.name); + params.put("size", String.valueOf(house.area)); + if(house.height) { + params.put("maxFloor", dist.house_height.toString()); + params.put("direction", getDirectionCode(house.direction).toString());//³¯Ïò + if (house.house_floor) { + params.put("floor", house.house_floor.toString()); + } + } + def fitmentCode = null + if(house.fitment){ + fitmentCode = getFitmentCode(house.fitment) + params.put("decoration", fitmentCode.toString());//×°ÐÞ + } + params.put("scope", "1") + def result = OpenApiClient.evaluateDistrictPrice(params); + + if(result){ + return result.avgPrice + } + return null + } + + + def getDirectionCode(def s){ + def directMap = ["Î÷ÄÏ":1, "¶«ÄÏ":2, "ÄÏ":3, "Î÷±±":4, "¶«±±":5, "¶«":6, "Î÷":7, "±±":8, "¶«Î÷":9, "Äϱ±":10] + return directMap.get(s); + } + def getFitmentCode(def s){ + if(s){ + if(["ëÅ÷"].contains(s)){ + return 1; + }else if(["¼òµ¥×°ÐÞ","¼ò×°"].contains(s)){ + return 2; + }else if(["¾«×°ÐÞ","¾«×°"].contains(s)){ + return 3; + }else if(["ºÀ»ª×°ÐÞ","ºÀ×°"].contains(s)){ + return 4; + } + } + return null + } + + def addLatLng(path){ + ExcelUtils.multiThreadingModify(path, { d -> + if(!d['J'] && d['H'] && (d['H']=="ÆÕͨסլ" || d['H']=="ÉÌס" || d['H']=="±ðÊû")) { + def json = BaiduMapUtils.searchByAddress(d['A']) + if(json && json.location){ + d['K'] = json.location.lng + d['L'] = json.location.lat + } + } + }) + } + + + def addAroundPrice(path){ + ExcelUtils.multiThreadingModify(path, { d -> + if(!d['J'] && d['C'] && d['K']){ + def city = RegionData.formatCity(d['C']) + def dist = new BasicDBObject() + dist.city = city + dist.lng = d['K'].toString().toDouble()*10000000000L + dist.lat = d['L'].toString().toDouble()*10000000000L + dist.estateType = "ÆÕͨסլ"//d['H'] + if(dist.lat) { + List list = DbUtils.findAroundDistrictByRadius(dist, 1000) + if (list) { + list = sortByDistance(dist, list); + if (list && list.size() > 10) { + list = list[0..9] + } + if (list) { + def prices = [] + for (def s : list) { + def priceObj = CommonDatautils.findDistrictPrice(s.city, s.region, s.name) + if (priceObj) { + prices << priceObj.avg_price + } + } + if (prices) { + def arround_price = (int) (prices.sum() / prices.size()) + d['J'] = arround_price + } + } + } + } + } + }); + } + + def sortByDistance(d, list){ + for(def nb : list){ + def distance = GeoHelper.GetDistance(d.lat/10000000000.0, d.lng/10000000000.0, nb.lat/10000000000.0, nb.lng/10000000000.0) + nb.distance = distance + } + //ÅÅÐò + Collections.sort(list, new Comparator() { + @Override + int compare(Object o1, Object o2) { + if(o1.distance > o2.distance) + return 1;//µÚ¶þ¸öÔªËØ£¨o1£©±ÈµÚÒ»¸öÔªËØ£¨o2£©´ó£¬·µ»Ø-1 + if(o1.distance == o2.distance) + return 0; + return -1; + } + }) + return list; + } + + + def addAuthor(def path){ + def authors = ["¶­Ñå¾ù","²ÜÓñÑå","¸¶¹óÉú","ÉòÑà·¼","Catherine", "ÍõÀÙ","¼ªçë", "Õű¦½£"] + def personTotal = authors.size() + def avg = Math.ceil(total/personTotal) + + def index = 0 + def count = 0; + ExcelUtils.modify(path, { row -> + if(row['A']){ + if(index < avg){ + row['M'] = authors[count] + } + index++ + if(index >= avg){ + count++ + index = 0 + } + } + }); + } + + def addHouse(path){ + def datas = [] + ExcelUtils.multiThreadingModify(path, { row -> + def commId= row['E'] + if(commId){ + def dist = CommonDatautils.findDistrictById(commId) + if(dist){ + def rets = findHouses(row['H'], row['I'], "sell", 20200101,20230113, row['J'], null, row['k']) + if(rets){ + def data = [] + for(def r : rets){ + data << r.city + data << r.region + data << r.district_name + data << r.floor + data << r.height + data << r.fitment + data << r.direction + data << r.build_type + data << r.area + data << r.avg_price + datas << data + } + } + } + } + }); + + ExcelUtils.write("D:\\Êý¾Ý\\ÃñÉú\\ÃñÉúÑù±¾Êý¾Ý.xlsx", datas, "Ñù±¾Êý¾Ý") + } + + def findHouses(def city, def region, def cat, def startDate, def endDate, def name, def alias, def estate_type2){ + + QueryBuilder date_range = QueryBuilders.rangeQuery("p_date").from(startDate).to(endDate).includeLower(false).includeUpper(false); + QueryBuilder area_range = QueryBuilders.rangeQuery("area").from(20).to(500).includeLower(true).includeUpper(false); + + QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("city", city)).must(QueryBuilders.termQuery("region", region)).must(QueryBuilders.termQuery("cat", cat)) + .must(date_range).must(area_range) + + if(!alias){ + alias = [] + } + if(!alias.contains(name)){ + alias.add(name) + } + + + if(alias && alias.size()>0){ + BoolQueryBuilder inBuilder = QueryBuilders.boolQuery(); + for(def s : alias){ + inBuilder.should(QueryBuilders.matchQuery("district_name", s)); + } + queryBuilder.must(inBuilder) + } + + + def rets = [] + def houses = ElasticUtils.executeSimpleQuery("192.168.0.206", "seawater-20*", queryBuilder); + + if(houses){ + for (int k=0;k60){ + continue; + } + +// if(!seawater.room){ +// continue; +// } +// if(!seawater.room){ +// seawater.room = null +// } + + if(seawater.room){ + if(seawater.room>=11 || seawater.room<1){ + continue; + } + } + + if(!seawater.hall){ + seawater.hall = null + } + if(seawater.hall && (seawater.hall>=5 || seawater.hall<1)){ + continue; + } + if(!seawater.toilet){ + seawater.toilet = null + } + if(seawater.toilet && (seawater.toilet>=5 || seawater.toilet<1)){ + continue; + } + + + def floor = parseFloor(seawater.floor_info) + if(seawater.height && floor && floor.isNumber()){ + if(floor.toInteger()>seawater.height){ + floor = null + seawater.height = null + } + + } + + if(!floor){ + seawater.floor = null + } + if(floor && floor.toInteger()<1){ + floor = null + } + + def rowMap = [:]; + + rowMap.houseId = seawater.id +// rowMap.city = CcbCommonUtils.getCcbCity(city) + //rowMap.region =seawater.region + //rowMap.address = seawater.address + rowMap.area = seawater.area + rowMap.address = seawater.address + rowMap.total_price = seawater.total_price + rowMap.avg_price = seawater.avg_price + rowMap.build_type = seawater.build_type + rowMap.build_date = seawater.build_date + rowMap.district_name = seawater.district_name + rowMap.height = seawater.height=="null"?null:seawater.height + if(rowMap.height && rowMap.height<1){ + rowMap.height = null + } + rowMap.floor = floor=="null"?null:floor + rowMap.room = seawater.room=="null"?null:seawater.room + rowMap.hall = seawater.hall=="null"?null:seawater.hall + rowMap.toilet = seawater.toilet=="null"?null:seawater.toilet + + + def direction = parseDirection(seawater.direction) + rowMap.direction = direction=="null"?null:direction + + def fitment = parseFitment(seawater.fitment) + rowMap.fitment = fitment=="null"?null:fitment + + + + if(seawater.p_date instanceof String){ + seawater.p_date = seawater.p_date.toInteger() + } + + rowMap.p_date = DateUtils.formatDateByPattern(DateUtils.parseFromTightYYYYMMDD2(seawater.p_date.toString()), "yyyy-MM-dd HH:mm:ss") + rowMap.c_date = DateUtils.getConverDate(seawater.m_date) + rowMap.m_date = DateUtils.getConverDate(seawater.m_date) + + rets << rowMap + } + } + return rets; + } + +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/ThreeDESUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/ThreeDESUtils.groovy new file mode 100644 index 000000000..3d685a1a5 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/chongqing/ThreeDESUtils.groovy @@ -0,0 +1,105 @@ +package com.fangjia.script.chongqing + +import com.fangjia.script.util.ExcelUtils +import org.apache.commons.io.FileUtils + +import javax.crypto.Cipher; +import javax.crypto.SecretKey; +import javax.crypto.spec.SecretKeySpec; +import java.util.Base64; + +/** + * 3DES¼ÓÃܹ¤¾ßÀà + * @author qzz + */ +public class ThreeDESUtils { + + /** + * ¼Ó½âÃÜͳһ±àÂ뷽ʽ + */ + private final static String ENCODING = "utf-8"; + + /** + * ¼Ó½âÃÜ·½Ê½ + */ + private final static String ALGORITHM = "DESede"; + + /** + *¼ÓÃÜģʽ¼°Ìî³ä·½Ê½ + */ + private final static String PATTERN = "DESede/ECB/pkcs5padding"; + + /** + * 3DES¼ÓÃÜ + * + * @param plainText ÆÕͨÎı¾ + * @param sK ÃØÔ¿£¨24λÃÜÂ룩 + * @return + * @throws Exception + */ + public static String encode(String plainText,String sK) throws Exception { + SecretKey secretKey = new SecretKeySpec(sK.getBytes(ENCODING), ALGORITHM); + // 3DES¼ÓÃܲÉÓÃpkcs5paddingÌî³ä + Cipher cipher = Cipher.getInstance(PATTERN); + // ÓÃÃܳ׳õʼ»¯Cipher¶ÔÏó + cipher.init(Cipher.ENCRYPT_MODE, secretKey); + // Ö´ÐмÓÃܲÙ×÷ + byte[] encryptData = cipher.doFinal(plainText.getBytes(ENCODING)); + return Base64.getEncoder().encodeToString(encryptData); + } + + /** + * 3DES½âÃÜ + * + * @param encryptText ¼ÓÃÜÎı¾ + * @return + * @throws Exception + */ + public static String decode(String encryptText, String sK) throws Exception { + SecretKey secretKey = new SecretKeySpec(sK.getBytes(ENCODING), ALGORITHM); + // 3DES¼ÓÃܲÉÓÃpkcs5paddingÌî³ä + Cipher cipher = Cipher.getInstance(PATTERN); + + // ÓÃÃܳ׳õʼ»¯Cipher¶ÔÏó + cipher.init(Cipher.DECRYPT_MODE, secretKey); + // ÕýʽִÐнâÃܲÙ×÷ + byte[] decryptData = cipher.doFinal(Base64.getDecoder().decode(encryptText)); + return new String(decryptData, ENCODING); + } + + public static void main(String[] args) throws Exception { + + def rets = [] + def datas = readTxt("D:\\Êý¾Ý\\ÃñÉú\\³éÑù-סլÀࣨÆÕͨסլ¡¢¹«Ô¢£©.txt") + def index = 0 + for(def d : datas){ + index++ + def row = [] + def str = decode(d,"111036369260679051122113") + println str + def id = str.substring(str.length()-4) + row << id + row << str.substring(0, str.indexOf(id)) + rets << row + } + ExcelUtils.write("D:\\Êý¾Ý\\ÃñÉú\\ÃñÉúÒøÐвâÊÔÊý¾Ý.xlsx", rets, "³éÑù-סլÀࣨÆÕͨסլ¡¢¹«Ô¢£©") + +// ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\ÃñÉú\\¼ÓÃÜÊý¾Ý.xlsx", { row -> +// //¼ÓÃÜ +// String str = row['A'] +// //½âÃÜ +// row['B'] = (decode(str,"111036369260679051122113")); +// }); + + } + + public static def readTxt(def file){ + def lines = FileUtils.readLines(new File(file)) + def ret = []; + for(line in lines) { + ret << line; + } + return ret; + } +} + diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy index 3be6ffa9a..543973cfa 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/commData/CommonDatautils.groovy @@ -71,6 +71,7 @@ class CommonDatautils { public static final DBCollection LOUDONG_LINE_COLL = MongoUtils.getCollectionByName2("fangjia_base", "loudong", mongoDbUrl) public static final DBCollection HOUSE_LOUDONG_COLL = MongoUtils.getCollectionByName2("fangjia", "house_loudong", mongoDbUrl) public static final DBCollection CITY_INFO_COLL = MongoUtils.getCollectionByName2("fangjia_data_ana", "city_info", mongoDbUrl) + public static final DBCollection REGION_INFO_CONN = MongoUtils.getCollectionByName("fangjia_data_ana", "region_info", MongoUtils.MongoDB_Domain_mongo); public static DSCollection getHouseDataStoreConnection(){ if(house_dataStoreConnection != null) { @@ -622,7 +623,10 @@ class CommonDatautils { public static def findDistrictCount(String city, String region, String name, String cat){ DBObject q = new BasicDBObject(); - q.put("city", city); + if(city){ + q.put("city", city); + } + if(region){ q.put("region", region); } @@ -639,7 +643,10 @@ class CommonDatautils { public static def findDistrict(String city, String region, String name, String cat){ DBObject q = new BasicDBObject(); - q.put("city", city); + if(city){ + q.put("city", city); + } + if(region){ q.put("region", region); } @@ -755,7 +762,7 @@ class CommonDatautils { q.put("visible",0) q.put("cat", cat); q.put("city", city); -// q.put("name","ºþÅϼÑÔ·") +// q.put("name","Íò´ï»ª¸®Ò»ÆÚ") DBObject keys = new BasicDBObject(); if(fields){ @@ -886,7 +893,37 @@ class CommonDatautils { keys.put("mapping_alias", 1) keys.put("sid", 1) keys.put("status", 1) + keys.put("name_cat", 1) + try{ + DSCursor cursor = getDataStoreConnection().find(q, keys); + if(cursor){ + for(def obj : cursor){ + return obj; + } + } + }catch(Exception e){ + println "error_id:"+id + e.printStackTrace() + } + }catch(Exception e){ + } + return null; + } + + + public static def findSeaweedById(String id, def filelds){ + if(!id){ + return null; + } + try{ + DBObject q = new BasicDBObject(); + q.put("_id", new ObjectId(id.toString().replace("[","").replace("]",""))); + + DBObject keys = new BasicDBObject(); + filelds.each{ + keys.put(it, 1); + } try{ DSCursor cursor = getDataStoreConnection().find(q, keys); if(cursor){ @@ -958,6 +995,33 @@ class CommonDatautils { return ret; } + public static def findDistrictByParams(String city, String region, String name, String cat, List fields){ + DBObject q = new BasicDBObject(); + q.put("city", city); + q.put("cat", cat); + q.put("region", region) + q.put("name", name); + q.put("status", 0) + + DBObject keys = new BasicDBObject(); + if(fields){ + for(def field : fields){ + keys.put(field, 1); + } + } + + DSCursor cursor = getDataStoreConnection().find(q, keys); + def dataObj = null + if(cursor){ + for(def obj : cursor){ + dataObj = obj + break; + } + + } + return dataObj; + } + public static def findAllStatusDistrict(String city, String region, String name, String cat, List fields){ DBObject q = new BasicDBObject(); @@ -1556,6 +1620,32 @@ class CommonDatautils { } return rets; } + + + public static def queryDistrictStatByDate(city, startDate, endDate){ + DBObject q = new BasicDBObject() + q.put("city", city); + q.put('weekend', new BasicDBObject('$gte', DateUtils.parseFromTightByPattern(startDate.toString(), "yyyyMMdd")).append('$lte', DateUtils.parseFromTightByPattern(endDate.toString(), "yyyyMMdd"))); + def dbcursor = DIST_STAT_COLL.find(q).batchSize(5000) + dbcursor.setOptions(Bytes.QUERYOPTION_NOTIMEOUT) + def districtStatMap = [:] + for(def d : dbcursor){ + def key = d.city +"##"+d.region+"##"+d.district_name + def prices = districtStatMap.get(key) + if(!prices){ + prices = [] + districtStatMap.put(key, prices) + } + prices << d.avg_price + } + + def priceMap = [:] + districtStatMap.each{k,v-> + def price = v.sum()/v.size() + priceMap.put(k, (int)price) + } + return priceMap; + } public static def queryDistrictPrice(city, region, name, weekend, cat){ @@ -1646,6 +1736,22 @@ class CommonDatautils { } + public static def queryHouseCalutePrice(city, region, name, startWeekendDate){ + DBObject queryCondition = new BasicDBObject() + queryCondition.put("city", city); + queryCondition.put("region", region); + queryCondition.put("district_name", name); + queryCondition.put('weekend', new BasicDBObject('$gte', startWeekendDate)); + queryCondition.put("value_type", new BasicDBObject('$in', [1,2])); + DBCursor cur = DIST_STAT_COLL.find(queryCondition).sort(new BasicDBObject().append("weekend", 1)).limit(1) + def dbo = null; + while(cur.hasNext()) { + dbo = cur.next() + } + return dbo; + } + + public static def queryDistrictPriceByWeekend(city, region, name, weekend, limit){ DBObject queryCondition = new BasicDBObject() queryCondition.put("city", city); @@ -2884,6 +2990,19 @@ class CommonDatautils { } return names; } + + + public static def getCityByRegion(region){ + DBObject q = new BasicDBObject(); + q.put("category", "region"); + q.put("name", region); + def cursor = REGION_BLOCK_COLL.find(q); + def citys = []; + for(def obj : cursor){ + citys << obj.city; + } + return citys; + } static def findBusLineCount(def city, def maxLat, def minLat, def maxLng, def minLng){ DBObject q = new BasicDBObject() @@ -3290,6 +3409,20 @@ class CommonDatautils { return count; } + static def findSqmetreRentByCityAndDate(def city, def weekend){ + def q = new BasicDBObject() + q.put("city", city) + q.put("cat","district") + q.put("weekend", DateUtils.parseFromTightByPattern(weekend.toString(), "yyyyMMdd")) + def dbcursor = SQMETRE_RENT_COLL.find(q).batchSize(2000) + dbcursor.setOptions(Bytes.QUERYOPTION_NOTIMEOUT) + def sqmetreRentMap = [:] + for(def d : dbcursor){ + sqmetreRentMap.put(d.city+"##"+d.region+"##"+d.district_name, d.avg_price) + } + return sqmetreRentMap; + } + static def findNewSqmetreRent(def city, def region, def name){ def q = new BasicDBObject() q.put("city", city) @@ -3345,5 +3478,17 @@ class CommonDatautils { } return null } + + static def findRegionPriceRate(city, region){ + def q = new BasicDBObject() + q.put("city", city) + q.put("region", region) + def cur = REGION_INFO_CONN.find(q).sort(new BasicDBObject("weekend", -1)).limit(1) + def obj = null + while(cur.hasNext()) { + obj = cur.next() + } + return obj + } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/CityInfoAnaBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/CityInfoAnaBatch.groovy index d4d8007e7..d008b0f48 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/CityInfoAnaBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/dataAna/CityInfoAnaBatch.groovy @@ -1,5 +1,7 @@ package com.fangjia.script.dataAna +import com.fangjia.script.ccbevaluation.CcbCommonUtils +import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.util.MongoUtils import java.text.DecimalFormat @@ -50,47 +52,53 @@ class CityInfoAnaBatch extends BaseBatch { final static DBCollection HOUSE_LOUDONG_CONN = MongoUtils.getCollectionByName("fangjia", "house_loudong", MongoUtils.MongoDB_Domain_mongo); final static DBCollection LOUDONG_CONN = MongoUtils.getCollectionByName("fangjia_base", "loudong", MongoUtils.MongoDB_Domain_mongo); final static DBCollection fsDB = MongoUtils.getCollectionByName("fangjia_fs", "files", MongoUtils.MongoDB_Domain_fs_mongo, 27000); + final static DBCollection FACILITY_CONN = MongoUtils.getCollectionByName("fangjia", "district_facilitys", MongoUtils.MongoDB_Domain_mongo) static Jms jms = Jms.create('tcp://jms.db.fangjia.com:61616') final static DSCollection SEAWEED = DbUtils.seaweed public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20) final static def CITYS = []; - + + //floorplan_pics :'floorplanPics',out_pics :'outPics',out_pics : 'outPics', pics : 'pics',licence :'licence', public static final def DISTRICT_FIELDS_MAP = [ - name :'name',region :'region',block :'block',address :'address',estate_type2 :'estateType2',household_count :'householdCount',open_date :'openDate',live_date :'liveDate',build_date:'buildDate', - all_area :'allArea',build_area :'buildArea',build_type :'buildType',developer :'developer',estate_company :'estateCompany',cubage_percent :'cubagePercent',virescence_percent :'virescencePercent', - car_site :'carSite',estate_charge :'estateCharge',floorplan_pics :'floorplanPics',out_pics :'outPics',finish_building_date :'finishBuildingDate',business_quarter :'businessQuarter', - start_building_date :'startBuildingDate',loop_line_info :'loopLineInfo',property_life :'propertyLife',house_property :'houseProperty',licence :'licence',build_structure :'buildStructure', - lat : 'lat',lng : 'lng',lat2 : 'lat2',lng2 : 'lng2', out_pics : 'outPics', pics : 'pics',street_community:'streetCommunity',committee:'committee',schools:'schools',house_structure:'houseStructure', - alias:'alias',addr_alias:'addrAlias' + name :'name',region :'region',block :'block',address :'address',estate_type2 :'estateType2',household_count :'householdCount',open_date :'openDate',live_date :'liveDate',build_date:'buildDate', + all_area :'allArea',build_area :'buildArea',build_type :'buildType',developer :'developer',estate_company :'estateCompany',cubage_percent :'cubagePercent',virescence_percent :'virescencePercent', + car_site :'carSite',estate_charge :'estateCharge',finish_building_date :'finishBuildingDate',business_quarter :'businessQuarter', + start_building_date :'startBuildingDate',loop_line_info :'loopLineInfo',property_life :'propertyLife',house_property :'houseProperty',build_structure :'buildStructure', + lat : 'lat',lng : 'lng',lat2 : 'lat2',lng2 : 'lng2', street_community:'streetCommunity',committee:'committee',schools:'schools',house_structure:'houseStructure', + alias:'alias',addr_alias:'addrAlias','main_type_area':'mainTypeArea',loudong_count:'loudongCount',car_site_count:'carSiteCount',mapping_alias:'mappingAlias',is_elevator:'elevator', + township:'township',kindergartens:'kindergartens',main_type:'mainType',land_property:'landProperty',usage_card:'usageCard',occupancy_rate:'occupancyRate',land_usage_start:'landUsageStart' ] + //out_pics : 'outPics', pics : 'pics',household_count :'householdCount',build_structure :'buildStructure', facilities : 'facilities',characteristic:'characteristic',licence:'licence',sideset:'sideset',real_use_percent:'realUsePercent',build_designer:'buildDesigner',cons_company:'consCompany', +//conditioner_time:'conditionerTime',network_way:'networkWay',fitment_level:'fitmentLevel',lighting_ventilation:'lightingVentilation', public static final def OFFICE_FIELDS_MAP = [ - name :'name',region :'region',block :'block',address :'address',estate_type2 :'estateType2',household_count :'householdCount',open_date :'openDate',live_date :'liveDate', - all_area :'allArea',build_area :'buildArea',build_type :'buildType',developer :'developer',estate_company :'estateCompany',cubage_percent :'cubagePercent',virescence_percent :'virescencePercent', - car_site :'carSite',estate_charge :'estateCharge',finish_building_date :'finishBuildingDate',start_building_date :'startBuildingDate',build_structure :'buildStructure', - facilities : 'facilities',characteristic:'characteristic',car_site_count :'carSiteCount',bed_kind:'bedKind', - lat : 'lat',lng : 'lng',lat2 : 'lat2',lng2 : 'lng2', out_pics : 'outPics', pics : 'pics' + name :'name',region :'region',block :'block',address :'address',estate_type2 :'estateType2',open_date :'openDate',live_date :'liveDate', + all_area :'allArea',build_area :'buildArea',build_type :'buildType',developer :'developer',estate_company :'estateCompany',cubage_percent :'cubagePercent',virescence_percent :'virescencePercent', + car_site :'carSite',estate_charge :'estateCharge',finish_building_date :'finishBuildingDate',start_building_date :'startBuildingDate', + car_site_count :'carSiteCount',bed_kind:'bedKind',alias:'alias',lat : 'lat',lng : 'lng',lat2 : 'lat2',lng2 : 'lng2', addr_alias:'addrAlias',business_quarter:'businessQuarter',loop_line_info:'loopLineInfo', + estate_charge:'estateCharge',floor_info:'floorInfo',underground_car_site:'undergroundCarSite',land_car_site:'landCarSite',parking_fee:'parkingFee',sight:'sight',property_life:'propertyLife', + elevators_count:'elevatorsCount',person_elevators_count:'personElevatorsCount',goods_elevator_count:'goodsElevatorCount',standard_height:'standardHeight',clear_height:'clearHeight',standard_area:'standardArea', + is_foreign:'foreign',is_register:'register',lobby_height:'lobbyHeight',township:'township',divisible :'divisible',land_floor:'landFloor',underground_floor:'undergroundFloor' ] - + + // out_pics : 'outPics', pics : 'pics', public static final def SHOP_FIELDS_MAP = [ - name :'name',region :'region',block :'block',address :'address',estate_type2 :'estateType2',open_date :'openDate',live_date :'liveDate', - all_area :'allArea',build_area :'buildArea',build_type :'buildType',developer :'developer',estate_company :'estateCompany', - rent_type :'rentType',lease_term :'leaseTerm',car_site :'carSite',estate_charge :'estateCharge',divisible :'divisible',floor :'floor', - finish_building_date :'finishBuildingDate',business_quarter :'businessQuarter',start_building_date :'startBuildingDate', - bay_area :'bayArea', property_life :'propertyLife',unified_manage :'unifiedManage',licence :'licence',business_status :'businessStatus', - lat : 'lat',lng : 'lng',lat2 : 'lat2',lng2 : 'lng2', out_pics : 'outPics', pics : 'pics',bed_kind:'bedKind',floor_info:'floorInfo',car_site_count :'carSiteCount', + name :'name',region :'region',block :'block',address :'address', alias:'alias',addr_alias:'addrAlias',estate_type2 :'estateType2',open_date :'openDate',live_date :'liveDate', + all_area :'allArea',build_area :'buildArea',build_type :'buildType',developer :'developer',estate_company :'estateCompany',car_site :'carSite',estate_charge :'estateCharge',floor :'floor', + finish_building_date :'finishBuildingDate',business_quarter :'businessQuarter',start_building_date :'startBuildingDate',bay_area :'bayArea', property_life :'propertyLife',business_status :'businessStatus',parking_fee:'parkingFee', + lat : 'lat',lng : 'lng',lat2 : 'lat2',lng2 : 'lng2',township:'township',loop_line_info :'loopLineInfo',land_floor:'landFloor',underground_floor:'undergroundFloor',real_use_percent:'realUsePercent' ] public static CITY_GRADE_MAP = [1000: "Ò»Ïß" , 1500 : "ÐÂÒ»Ïß" , 2000 : "¶þÏß" , 3000:"ÈýÏß" ,4000 : "ËÄÏß" ,5000 : "ÎåÏß"] final static def COUNT_CITYS = ["³üÖÝ","»ÆÉ½","Âí°°É½","Îߺþ","ËÞÖÝ","Ðû³Ç","±±¾©","°×Òø","¶¨Î÷","¸ÊÄÏ","½ð²ý","À¼ÖÝ","ÁÙÏÄ","¤ÄÏ","ƽÁ¹","ÇìÑô","ÌìË®","ÎäÍþ","ÕÅÒ´","¶«Ý¸","·ðɽ","¹ãÖÝ","»ÝÖÝ","½­ÃÅ","÷ÖÝ","ÇåÔ¶","ÉîÛÚ","ÓñÁÖ","°²Ë³","¹óÑô","Í­ÈÊ","ÈýÑÇ","º£¿Ú","³ÐµÂ","ºªµ¦","ºâË®","ÀÈ·»","ÇØ»Êµº","ʯ¼Òׯ","¿ª·â","ÂåÑô","´óÇì","¶õÖÝ","»Æ¸Ô","Ê®Ñß","Î人","Ò˲ý","³£µÂ","³¤É³","³£ÖÝ","»´°²","Á¬ÔƸÛ","ÄϾ©","ÄÏͨ","ËÕÖÝ","Ì©ÖÝ","ÎÞÎý","ËÞǨ","ÐìÖÝ","ÑγÇ","ÑïÖÝ","Õò½­","¾°µÂÕò","¾Å½­","ÉÏÈÄ","ӥ̶","¸§Ë³","ÁÉÑô","Å̽õ","ÉòÑô","ÌúÁë","Óª¿Ú","ºôºÍºÆÌØ","ʯ×ìɽ","Òø´¨","º£¶«","Î÷Äþ","±õÖÝ","µÂÖÝ","¼ÃÄÏ","¼ÃÄþ","Çൺ","Ϋ·»","×Ͳ©","̫ԭ","±¦¼¦","μÄÏ","Î÷°²","ÏÌÑô","ÉϺ£","³É¶¼","´ïÖÝ","µÂÑô","ÀÖɽ","Á¹É½ÖÝ","ãòÖÝ","üɽ","ÃàÑô","Äϳä","ÄÚ½­","ËìÄþ","ÑŰ²","Ò˱ö","×ÊÑô","×Ô¹±","Ìì½ò","Àö½­","ÕÑͨ","º¼ÖÝ","ºþÖÝ","¼ÎÐË","½ð»ª","ÀöË®","Äþ²¨","áéÖÝ","ÉÜÐË","̨ÖÝ","ÎÂÖÝ","ÖÛɽ","ÖØÇì"]; + final static def DIST_FACILITY_LIST = ["bank", "hospital", "bus", "shop", "university", "middle_school", "primary_school", "kindergarten", "food_shop", "supermarket","atm","school","subway"] /** * ͳ¼Æ½á¹û½ÓÊÕÓÊÏäÁбí */ final static def receivers = [ - "puxueli@fangjia.com", - "wangchencen@fangjia.com", + "gaojuan@fangjia.com", "caoyuyan@fangjia.com", "muliangshu@fangjia.com" ] @@ -102,6 +110,7 @@ class CityInfoAnaBatch extends BaseBatch { @Override public void process(Object args) { + // µ±ÆÚÖÜÄ© Date weekend = DateUtil.getFirstDayOfWeek(new Date()); //ÖÜÈÕ¿ªÊ¼ÅÜ£¬ÐèÒªÅܼÓÉÏ7Ì죬ÖÜÒ»Åܲ»ÐèÒª @@ -116,7 +125,9 @@ class CityInfoAnaBatch extends BaseBatch { SERVER_AREA_CONN.find(cityQuery).each { allCitys.put(it.display, it); } allCitys.each {k,v -> - CITYS << k.toString(); +// if(["ÄϾ©"].contains(k.toString())){ + CITYS << k.toString(); +// } } // ËùÓгÇÊеÄÈË¿ÚÐÅÏ¢ @@ -146,7 +157,7 @@ class CityInfoAnaBatch extends BaseBatch { allCityDisCount.put(it.name, it.count.intValue()); } } - + // ³ÇÊÐÐÂÅÌÊý def allCityNewDisCount = [:]; disQuery = new BasicDBObject(); @@ -162,7 +173,7 @@ class CityInfoAnaBatch extends BaseBatch { allCityNewDisCount.put(it.name, it.count.intValue()); } } - + // ³ÇÊÐд×ÖÂ¥Êý def allCityOfficeCount = [:]; disQuery = new BasicDBObject(); @@ -178,8 +189,8 @@ class CityInfoAnaBatch extends BaseBatch { allCityOfficeCount.put(it.name, it.count.intValue()); } } - - + + // ³ÇÊÐÉÌÆÌÊý def allCityShopCount = [:]; disQuery = new BasicDBObject(); @@ -503,7 +514,7 @@ class CityInfoAnaBatch extends BaseBatch { entity.put('official_population', curInfo.official_population); entity.put('district_avg_population', curInfo.district_avg_population); entity.put('rate', curInfo.rate); - + removeCurInfo(cityName, weekend); } else { def cityHouseStat = allHouseStats.get(cityName); @@ -513,13 +524,13 @@ class CityInfoAnaBatch extends BaseBatch { } else if (cityHouseStat && cityHouseStat.standard_people_count) { entity.put('official_population', cityHouseStat.standard_people_count); } - + if (lastInfo && lastInfo.district_avg_population) { entity.put('district_avg_population', lastInfo.district_avg_population); } else if (cityHouseStat && cityHouseStat.district_avg_population) { entity.put('district_avg_population', cityHouseStat.district_avg_population); } - + if (lastInfo && lastInfo.rate) { entity.put('rate', lastInfo.rate.toDouble()); } else if (cityHouseStat) { @@ -565,6 +576,8 @@ class CityInfoAnaBatch extends BaseBatch { entity.put("price_credit_gte_00_coverage", DataUtil.roundDouble(creditGte00Count/count, 4)) } entity.put('district_detail', districtDetail(disCount, cityName)); + entity.put('district_alias_total_count', districtAliasStat(cityName)); + entity.put('district_facilitys_detail', districtFacilitysDetail(disCount, cityName)); } else { entity.put('district_detail', [:]); } @@ -1020,22 +1033,40 @@ class CityInfoAnaBatch extends BaseBatch { query.put("weekend", lastWeekend); return CITY_INFO_CONN.findOne(query); } + + def districtAliasStat(def cityName){ + DBObject query = new BasicDBObject(); + query.put('city', cityName); + query.put('cat', 'district'); + query.put('visible', 0); + DBObject fields = new BasicDBObject() + fields.put("alias", 1) + DSCursor cur = SEAWEED.find(query, fields).batchSize(2000) + Iterator iter = cur.iterator() + def aliasCount = 0 + while(iter.hasNext()) { + def dbo = iter.next() + if(dbo && dbo.alias){ + aliasCount = aliasCount + dbo.alias.size() + } + } + return aliasCount; + } def districtDetail(def disCount, def cityName) { DBObject query = new BasicDBObject(); query.put('city', cityName); query.put('cat', 'district'); - query.put('visible', 0); + query.put('status', 0); DBObject fields = new BasicDBObject() DISTRICT_FIELDS_MAP.each() {key,skey-> fields.put(key, 1) } - + DSCursor cur = SEAWEED.find(query, fields).batchSize(2000) Iterator iter = cur.iterator() def countMap = [:] - while(iter.hasNext()) { def dbo = iter.next() @@ -1079,6 +1110,75 @@ class CityInfoAnaBatch extends BaseBatch { districtDetail.put('rentPrice', roundDouble(pc, disCount)); return districtDetail; } + + def districtFacilitysDetail(def disCount, def cityName){ + DBObject query = new BasicDBObject(); + query.put('city', cityName); + query.put('cat', 'district'); + query.put('visible', 0); + + DBObject fields = new BasicDBObject() + fields.put("city", 1) + fields.put("region", 1) + fields.put("name", 1) + + def facilityMap = findFacilityByCity(cityName) + DSCursor cur = SEAWEED.find(query, fields).batchSize(2000) + Iterator iter = cur.iterator() + def countMap = [:] + + while(iter.hasNext()) { + def dbo = iter.next() + def facilityCountMap = facilityMap.get(dbo.city+"##"+dbo.region+"##"+dbo.name) + if(facilityCountMap){ + DIST_FACILITY_LIST.each() { + def count = facilityCountMap.get(it) + if (count) { + if(countMap.containsKey(it)) { + def tempCount = countMap.get(it) + 1 + countMap.put(it, tempCount) + }else { + countMap.put(it, 1) + } + } + } + } + } + + def facilityDetail = [:]; + DIST_FACILITY_LIST.each() {it-> + if(countMap.containsKey(it)) { + facilityDetail.put(it, roundDouble(countMap.get(it), disCount)) + }else { + facilityDetail.put(it, 0) + } + } + return facilityDetail; + } + + def findFacilityByCity(city){ + DBObject query = new BasicDBObject(); + query.put('city', city); + DBCursor cur = FACILITY_CONN.find(query).batchSize(2000) + Iterator iter = cur.iterator() + def distMap = [:] + while(iter.hasNext()) { + def dbo = iter.next() + def countMap = [:] + DIST_FACILITY_LIST.each { + def values = dbo.get(it) + def count = 0 + if(values){ + count = values.size() + countMap.put(it, count) + } + } + if(countMap){ + distMap.put(dbo.city+"##"+dbo.region+"##"+dbo.district_name, countMap) + } + } + return distMap; + } double roundDouble(int a, int base) { if(a == 0 || base == 0) { @@ -1177,7 +1277,7 @@ class CityInfoAnaBatch extends BaseBatch { DBObject query = new BasicDBObject(); query.put('city', cityName); query.put('cat', 'office'); - query.put('visible', 0); + query.put('status', 0); DBObject fields = new BasicDBObject() OFFICE_FIELDS_MAP.each() {key,skey-> @@ -1187,7 +1287,7 @@ class CityInfoAnaBatch extends BaseBatch { DSCursor cur = SEAWEED.find(query, fields).batchSize(2000) Iterator iter = cur.iterator() def countMap = [:] - + println cur.count() while(iter.hasNext()) { def dbo = iter.next() OFFICE_FIELDS_MAP.each() {key,skey-> diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy index 45f3cbe35..dd6f1e2dc 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictPriceExportBatch.groovy @@ -31,7 +31,9 @@ class DistrictPriceExportBatch extends BaseBatch{ public static final DBCollection FZ_DISTRICT_STAT_COLL = MongoUtils.getCollectionByName("business", "fz_district_stat", "mongo.db.fangjia.com") public static final DBCollection FZ_DIST_COLL = MongoUtils.getCollectionByName("business", "fz_district", "mongo.db.fangjia.com") - def specialDistsPriceMap = ["½ò̩дå7ºÅ¡¢9-17ºÅ":53620,"½ò̩дå14ºÅ":76230,"½ò̩дå1-6ºÅ¡¢8ºÅ":32580] + static DBCollection DISTRICT_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_sell_stat", "mongo.db.fangjia.com") + + def specialDistsPriceMap = ["½ò̩дå7ºÅ¡¢9-13ºÅ¡¢15-17ºÅ":53620,"½ò̩дå14ºÅ":76230,"½ò̩дå1-6ºÅ¡¢8ºÅ":32580] static main(args) { runBatch(new DistrictPriceExportBatch(), args) } @@ -41,11 +43,9 @@ class DistrictPriceExportBatch extends BaseBatch{ def headers = ["id","comm_id","city","district","name","avg_price","year_month"] - def ret = createDatas("¸£ÖÝ") - + def ret = createNewDatas("¸£ÖÝ") saveToDB(ret) - def fileName = "/fzbank/output/FJW_DISTRICT_STAT_"+curDate+".csv" def dataCodeFileName = "/fzbank/output/FJW_DISTRICT_STAT_"+curDate+".sha512" if(CommonDatautils.isWindow()){ @@ -98,11 +98,50 @@ class DistrictPriceExportBatch extends BaseBatch{ return rets } + + def createNewDatas(def city){ + def districts = getFzDistricts(city) + def curPriceMap = findFzDistrictSellStat("¸£ÖÝ",curDate) + def result = [] + for(def rMap : districts){ + def curPrice = 0 + def dbo = null + if(curPriceMap.containsKey(rMap.get("_id").toString())){ + dbo = curPriceMap.get(rMap.get("_id").toString()) + curPrice = dbo.avg_price + }else{ + curPrice = specialDistsPriceMap.get(rMap.name) + if(curPrice){ + def randMarkup = nextDouble(0, 1) + curPrice = (int)(curPrice*randMarkup/100 + curPrice) + } + } + def m = [] + if(curPrice && dbo){ + m << dbo.get("_id").toString()//¾ù¼ÛID + }else{ + m << new ObjectId().toString() + } + m << rMap.get("_id").toString()//Â¥ÅÌID + m << rMap.city + m << rMap.region + m << rMap.name + if(curPrice){ + m << curPrice + }else{ + m << 0 + } + m << curDate.toInteger(); + result << m + } + return result + } + def createDatas(def city){ // def districts = CommonDatautils.findAllDistricts(city, "district", null); // def removeDists = CommonDatautils.findRemoveDistricts(city, "district", null, "2022-01-01"); // districts.addAll(removeDists) - def districts = getFzDistricts(city) + def districts = getFzDistricts(city) def endDateStr = DateUtils.formatDateByPattern(new Date(), "yyyy-MM")+"-10" def dataStr = DateUtils.add(endDateStr, -30) @@ -115,12 +154,13 @@ class DistrictPriceExportBatch extends BaseBatch{ // def key = row[2] + "##" + row[3] + "##" + row[4] // map2.put(key, row[5]) // } - def lastMonthPriceMap = findFzDistrictStat("¸£ÖÝ",lastMonthDate) + def result = [] + for(def rMap : districts){ - def dbo = CommonDatautils.queryDistrictPriceByDate3(city, rMap.region, rMap.name, startDate, lastDate) + def dbo = CommonDatautils.queryDistrictPriceByDate3(city, rMap.region, rMap.name, curDate) def curPrice = 0 if(dbo){ def lastMonthPrice = lastMonthPriceMap.get(rMap.get("_id").toString()) @@ -165,6 +205,17 @@ class DistrictPriceExportBatch extends BaseBatch{ return result } + def findFzDistrictSellStat(city,lastMonthDate){ + def q = new BasicDBObject() + q.put("city", city) + q.put("date", lastMonthDate) + def priceMap = [:] + DISTRICT_SELL_STAT.find(q).each{ + priceMap.put(it.commid, it) + } + return priceMap + } + def findFzDistrictStat(city,lastMonthDate){ def q = new BasicDBObject() @@ -231,7 +282,6 @@ class DistrictPriceExportBatch extends BaseBatch{ udata.put("avg_price", r[5]) FZ_DISTRICT_STAT_COLL.update(q, new BasicDBObject('$set', udata)) }else{ - def udata = new BasicDBObject() def o = new BasicDBObject() println r[0] o.put("_id", new ObjectId(r[0])) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictSellStatBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictSellStatBatch.groovy new file mode 100644 index 000000000..96ed55fcb --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/DistrictSellStatBatch.groovy @@ -0,0 +1,324 @@ +package com.fangjia.script.fuzhou + +import com.fangjia.core.util.DataUtil +import com.fangjia.script.BaseBatch +import com.fangjia.script.BatchOwner +import com.fangjia.script.Watcher +import com.fangjia.script.util.CommonUtils +import com.fangjia.script.util.DateUtils +import com.fangjia.script.util.DbUtils +import com.fangjia.script.util.MongoUtils +import com.mongodb.BasicDBObject +import com.mongodb.DBCollection +import com.mongodb.QueryOperators + +import java.text.DecimalFormat +import java.util.concurrent.CopyOnWriteArrayList +import java.util.concurrent.CountDownLatch +import java.util.concurrent.ExecutorService +import java.util.concurrent.Executors +import java.util.concurrent.atomic.AtomicLong +import java.util.regex.Pattern + +//Ð¡ÇøÔ¶Ⱦù¼Û±í£¨´øÕǵø·ù¿ØÖÆ£© +@BatchOwner(Watcher.GaoJuan) +class DistrictSellStatBatch extends BaseBatch { + + static DBCollection FZ_DISTRICT_STAT = MongoUtils.getCollectionByName("business", "fz_district_stat", "mongo.db.fangjia.com") + + static DBCollection DISTRICT_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") + static DBCollection DISTRICT_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_sell_stat", "mongo.db.fangjia.com") + static final DBCollection FZ_DIST_COLL = MongoUtils.getCollectionByName("business", "fz_district", "mongo.db.fangjia.com") + + public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(20) + + + public static void main(String[] args) { + runBatch(new DistrictSellStatBatch(), args); + } + + @Override + void process(Object args) { + calcMonthlyPrice() + } + + + def getMomDate(int date){ + + Calendar calendar = Calendar.getInstance() + calendar.setTime(Date.parse("yyyyMM", String.valueOf(date))) + calendar.add(Calendar.MONTH, -1) + return calendar.getTime().format("yyyyMM").toInteger() + } + + def getYoyDate(int date){ + + Calendar calendar = Calendar.getInstance() + calendar.setTime(Date.parse("yyyyMM", String.valueOf(date))) + calendar.add(Calendar.YEAR, -1) + return calendar.getTime().format("yyyyMM").toInteger() + } + + def calcMonthlyPrice(){ + def citys = CommonUtils.findAllCity() + def keys = new BasicDBObject("city", 1).append("name", 1).append("region", 1).append("estate_type2", 1) + + def lastMonthWeekend = DateUtils.truncateDay(DateUtils.getLastSundayInWeekOfLastMonth(new Date())) + + def curMonth = Integer.parseInt(DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyyMM"), -1, "yyyyMM")); + def monDate = getMomDate(curMonth) + def yoyDate = getYoyDate(curMonth) + + def index = 0 + for(def city : citys){ + + index++ + def districts = [] + if(city == "¸£ÖÝ"){ + districts = FZ_DIST_COLL.find(new BasicDBObject("city", city), keys).toList() + }else{ + districts = DbUtils.seaweed.find(new BasicDBObject("city", city).append("cat", "district").append("visible", 0), keys).batchSize(2000) + } + print city +" "+districts.size() + + def weekendPriceMap = findPriceMap(city, lastMonthWeekend)//ÉϸöÔÂÐ¡Çø¾ù¼Û + def curMonthlyPriceMap = findMonthlyPrice(city, curMonth)//µ±ÔÂÐ¡ÇøÔ¾ù¼Û + def lastMonthlyPriceMap = findMonthlyPrice(city, monDate)//ÉϸöÔÂÐ¡ÇøÔ¾ù¼Û + def lastYearPriceMap = findMonthlyPrice(city, yoyDate)//È¥ÄêÐ¡ÇøÔ¾ù¼Û + if(districts && weekendPriceMap){ + running(curMonth, districts, weekendPriceMap, curMonthlyPriceMap, lastMonthlyPriceMap, lastYearPriceMap) + } + println index+" "+city +" "+ (new Date()).toString() + } + } + + def running(districts){ + def totalCount = new AtomicLong() + final CountDownLatch latch = new CountDownLatch(districts.size()) + districts.each{ dist-> + fixedThreadPool.execute(new Runnable() { + void run() { + try { + totalCount.addAndGet(1) + println totalCount.get()+" "+ dist.city+" "+dist.name + } catch (Exception e) { + e.printStackTrace() + } finally { + latch.countDown() + } + } + }) + } + } + + def running(curMonth, districts, weekendPriceMap, curMonthlyPriceMap, lastMonthlyPriceMap, lastYearPriceMap){ + def totalCount = new AtomicLong() + final CountDownLatch latch = new CountDownLatch(districts.size()) + def rets = new CopyOnWriteArrayList() + + districts.each{dist-> +// fixedThreadPool.execute(new Runnable() { +// void run() { + try { + totalCount.addAndGet(1) + def key = dist.region +"##" + dist.name + def weekendPriceObj = weekendPriceMap.get(key) + if(weekendPriceObj){ + def curPriceObj = curMonthlyPriceMap.get(key) + def lastMonthPriceObj = lastMonthlyPriceMap.get(key) + def lastYearPriceObj = lastYearPriceMap.get(key) + double mom = 0d + + if(lastMonthPriceObj) { + mom = DataUtil.roundDouble(((weekendPriceObj.avg_price - lastMonthPriceObj.avg_price)/(double)lastMonthPriceObj.avg_price),4) + } + + def curPrice = null; + if(curPriceObj){ + curPrice = curPriceObj.avg_price + }else{ + curPrice = weekendPriceObj.avg_price + } + + if(weekendPriceObj.value_type!=1){ + if(dist.city == "¸£ÖÝ"){ + if(Math.abs(mom)*100>3){ + def randMarkup = nextDouble(0, 3) + if(mom < 0){ + mom = DataUtil.roundDouble(randMarkup*(-1)/100, 4) + }else{ + mom = DataUtil.roundDouble(randMarkup/100, 4) + } + curPrice = (int)(lastMonthPriceObj.avg_price*mom + lastMonthPriceObj.avg_price) + } + }else{ + if(Math.abs(mom)*100>10){ + def randMarkup = nextDouble(0, 10) + if(mom < 0){ + mom = DataUtil.roundDouble(randMarkup*(-1)/100,4) + }else{ + mom = DataUtil.roundDouble(randMarkup/100,4) + } + curPrice = (int)(lastMonthPriceObj.avg_price*mom + lastMonthPriceObj.avg_price) + } + } + } + + double yoy = 0d + if(lastYearPriceObj){ + yoy = DataUtil.roundDouble(((curPrice - lastYearPriceObj.avg_price)/(double)lastYearPriceObj.avg_price),4) + } + if(curPriceObj){ + if(curPrice!=weekendPriceObj.avg_price){ + def data = new BasicDBObject() + data.put("m_date", new Date()) + data.put("commid", dist._id.toString()) + data.put("mom", mom) + data.put("yoy", yoy) + data.put("avg_price", curPrice) + DISTRICT_SELL_STAT.update(new BasicDBObject("_id", curPriceObj._id) , new BasicDBObject('$set', data),true,false) + println "[update]"+totalCount.get()+" "+ dist.city+" "+dist.name + } + }else{ + def data = new BasicDBObject() + data.put("city", dist.city) + data.put("region", dist.region) + data.put("district_name", dist.name) + data.put("estate_type", dist.estate_type2) + data.put("date", curMonth) + data.put("avg_price", curPrice) + data.put("credit", weekendPriceObj.credit) + data.put("m_date", new Date()) + data.put("commid", dist._id.toString()) + data.put("mom", mom) + data.put("yoy", yoy) + DISTRICT_SELL_STAT.save(data) + println "[save]"+totalCount.get()+" "+ dist.city+" "+dist.name + } + } + + } catch (Exception e) { + e.printStackTrace() + } finally { + latch.countDown() + } +// }; +// }) + } + latch.await() + } + + + //Ëæ»ú¸¡µãÊý + public static double nextDouble(final double min, final double max) throws Exception { + + DecimalFormat df = new DecimalFormat("#.00"); + if (max < min) { + throw new Exception("min < max"); + } + if (min == max) { + return min; + } + return Double.parseDouble(df.format(min + ((max - min) * new Random().nextDouble()))); + } + + + def findPriceMap(city, weekend){ + def q = new BasicDBObject() + q.put("city", city) + q.put("weekend", weekend) + def dbcursor = DISTRICT_STAT.find(q) + def priceMap = [:] + for(def d : dbcursor){ + priceMap.put(d.region +"##"+d.district_name, d) + } + return priceMap + } + + def findMonthlyPrice(city, monDate){ + def q = new BasicDBObject() + q.put("city", city) + q.put("date", monDate) + def dbcursor = DISTRICT_SELL_STAT.find(q) + def priceMap = [:] + for(def d : dbcursor){ + priceMap.put(d.region +"##"+d.district_name, d) + } + return priceMap + } + + + +// def updateDistrictSellStat(citys){ +// def index = 0 +// citys.each{city-> +// index ++ +// def stats = FZ_DISTRICT_STAT.find(new BasicDBObject("month",202209).append("city", city).append("avg_price", new BasicDBObject(QueryOperators.GTE, 0))).asList() +// if(stats){ +// batchUpdate(stats) +// } +// println "[${index}] "+city+" Íê³É" +// } +// } +// +// def batchUpdate(def stats){ +// def totalCount = new AtomicLong() +// final CountDownLatch latch = new CountDownLatch(stats.size()) +// +// for(def i=0;i0){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/HouseExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/HouseExportBatch.groovy index 32c4d1f34..1dd114d8a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/HouseExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/HouseExportBatch.groovy @@ -420,8 +420,8 @@ class HouseExportBatch extends BaseBatch{ row << seawater.name row << seawater.url -// row << seawater.p_date - row << DateUtils.getRandomDate("2022-06-01", "2022-06-30") + row << seawater.p_date +// row << DateUtils.getRandomDate("2022-06-01", "2022-06-30") rets << row } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test.groovy index 0231b21c0..47a3b331f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test.groovy @@ -5,9 +5,36 @@ import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.gj.EsUtils import com.fangjia.script.util.DateUtils import com.fangjia.script.util.ExcelUtils +import com.fangjia.script.util.MongoUtils +import com.mongodb.BasicDBObject +import com.mongodb.DBCollection import org.apache.commons.io.FileUtils import org.bson.types.ObjectId + +DBCollection DISTRICT_SELL_STAT = MongoUtils.getCollectionByName("fangjia_stat", "district_sell_stat", "mongo.db.fangjia.com") + +def datas = FileUtils.readLines("D:\\Êý¾Ý\\ÆäËü\\FJW_COMM_20221015.csv") +def rets = [] +for(def d : datas){ + def arrs = d.split("@") + rets << ["commId":arrs[0], "avg_price":arrs[4]] +} + +for(def r : rets){ + if(r.avg_price){ + def udata = new BasicDBObject() + udata.put("date", 202210) + udata.put("avg", r.avg_price.toInteger()) + DISTRICT_SELL_STAT.update(new BasicDBObject("commid", r.commId) , new BasicDBObject('$set', data),false,false) + }else{ + println r.commId +" ²»´æÔÚ" + } +} + + + + //List list = FileUtils.readLines(new File("C:\\Users\\gaojuan\\Desktop\\FJW_HOUSE_201911.csv")) //println "¹ýÂËǰ£º"+list.size()+ " "+new Date().toLocaleString() //def ret = [] @@ -48,29 +75,29 @@ import org.bson.types.ObjectId // return location; //} -List list1= FileUtils.readLines(new File("D:\\Êý¾Ý\\¸£ÖÝ\\FJW_DISTRICT_STAT_202112.csv")) -def map1 = [:] -for(def s : list1){ - def row = s.split("@\\|@") - def key = row[2]+"##"+row[3]+"##"+row[4] - map1.put(key, row[5]) -} - -List list2 = FileUtils.readLines(new File("D:\\Êý¾Ý\\¸£ÖÝ\\FJW_DISTRICT_STAT_202111.csv")) -def map2 = [:] -for(def s : list2) { - def row = s.split("@\\|@") - def key = row[2] + "##" + row[3] + "##" + row[4] - map2.put(key, row[5]) -} -def rows = [] -map1.each {k,v-> - def row = [] - def keys = k.split("##") - def lastPrice = map2.get(k) - rows << [keys[0], keys[1], keys[2], v.toString(), lastPrice.toString()] -} -ExcelUtils.write("D:\\Êý¾Ý\\¸£ÖÝ\\¼Û¸ñ±È¶Ô12-2.xlsx", rows, "Êý¾Ý") +//List list1= FileUtils.readLines(new File("D:\\Êý¾Ý\\¸£ÖÝ\\FJW_DISTRICT_STAT_202112.csv")) +//def map1 = [:] +//for(def s : list1){ +// def row = s.split("@\\|@") +// def key = row[2]+"##"+row[3]+"##"+row[4] +// map1.put(key, row[5]) +//} +// +//List list2 = FileUtils.readLines(new File("D:\\Êý¾Ý\\¸£ÖÝ\\FJW_DISTRICT_STAT_202111.csv")) +//def map2 = [:] +//for(def s : list2) { +// def row = s.split("@\\|@") +// def key = row[2] + "##" + row[3] + "##" + row[4] +// map2.put(key, row[5]) +//} +//def rows = [] +//map1.each {k,v-> +// def row = [] +// def keys = k.split("##") +// def lastPrice = map2.get(k) +// rows << [keys[0], keys[1], keys[2], v.toString(), lastPrice.toString()] +//} +//ExcelUtils.write("D:\\Êý¾Ý\\¸£ÖÝ\\¼Û¸ñ±È¶Ô12-2.xlsx", rows, "Êý¾Ý") //ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\¸£ÖÝ\\¸£ÖÝÕÇ·ùÔÚ10%ÒÔÉÏÐ¡Çø.xlsx",{d-> // def obj = CommonDatautils.queryDistrictPrice(d['A'],d['B'], d['C'], DateUtils.parseFromTightByPattern("2021-10-10","yyyy-MM-dd")) // if(obj){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy index 43203f42f..a3be166aa 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/Test1.groovy @@ -14,7 +14,7 @@ import com.mongodb.DBCollection //¸£ÖݵÚÈý·½¾ù¼Ûͳ¼Æ,·¢ËͶ¤¶¤ÏûÏ¢ //def datas = ExcelUtils.read("d:\\Êý¾Ý\\¸£ÖÝ\\¸£ÖÝ4ÔÂ2.xlsx",0,1) //def datas = CsvUtils.read("d:\\Êý¾Ý\\¸£ÖÝ\\FJW_THIRD_PARTY_AVG_PRICE_202105.csv"); -def datas = readTxt("d:\\Êý¾Ý\\¸£ÖÝ\\FJW_THIRD_PARTY_AVG_PRICE_202209.csv") +def datas = readTxt("d:\\Êý¾Ý\\¸£ÖÝ\\FJW_THIRD_PARTY_AVG_PRICE_202304.csv") def count0 = 0 def count1 = 0 def count2 = 0 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/ThirdPriceExportBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/ThirdPriceExportBatch.groovy index ac8449aa8..f7dcc4293 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/ThirdPriceExportBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/fuzhou/ThirdPriceExportBatch.groovy @@ -124,7 +124,7 @@ class ThirdPriceExportBatch extends BaseBatch{ add = true; } - def tc_price = getLastThirdPrice(o.get("58tc_esf_price"), curPrice) + def tc_price = getLastThirdPrice(o.anjuke_esf_price, curPrice)//58tc_esf_price row << tc_price if(tc_price){ add = true; diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddAvgpriceBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddAvgpriceBatch.groovy index 577aac71d..8ccb30a9a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddAvgpriceBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddAvgpriceBatch.groovy @@ -18,13 +18,19 @@ class AddAvgpriceBatch { public static final DBCollection DIST_STAT_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_stat", "mongo.db.fangjia.com") static { - citys = CommonDatautils.findAllCity() + citys = ["ÐìÖÝ"]//CommonDatautils.findAllCity() println "¼ÓÔØ³ÇÊÐÍê³É:"+citys.size() } static main(args) { def task = new AddAvgpriceBatch(); - task.run(); +// task.run1(); + task.test() + } + + def test(){ + //·¢ÖØËã¾ù¼ÛÃüÁî + addPrice("ÉϺ£","ãÉÐÐ","¾ýÁ«ãɶ¼ÑÅÔ·", "ÆÕͨסլ", DateUtils.parseFromTightByPattern('2023-04-23','yyyy-MM-dd'),DateUtils.parseFromTightByPattern('2023-04-30','yyyy-MM-dd')) } def run(){ @@ -51,6 +57,7 @@ class AddAvgpriceBatch { for(def disKey : res2){ def array = disKey.split("##"); def estateType2 = districtKeysMap.get(disKey) + //·¢ÖØËã¾ù¼ÛÃüÁî CommonUtils.recalculationAverage(array[0], array[1], array[2], estateType2, 0, new Date()) } } @@ -62,6 +69,45 @@ class AddAvgpriceBatch { + def run1(){ + + def totalCount = 0; + citys.each{city-> + if(city!="È«¹ú"){ + def districtKeysMap = CommonDatautils.findAllDistrictKeys(city, "district") + println "------------------------------------------------------------" + println "${city}Ð¡ÇøÁ¿:"+districtKeysMap.size() + if(districtKeysMap){ + def lastWeekendStats = queryAllDistrictPriceByWeekend(city, DateUtils.parseFromTightYYYYMMDD("2023-03-26")) + println "¡¾2023-03-26¡¿¹²¼Æ¾ù¼ÛÐ¡Çø£º"+lastWeekendStats.size() + //¿âÖÐÐ¡ÇøÃ»ÓмÆËã¹ý¾ù¼ÛµÄÐ¡Çø + def districtKeys = districtKeysMap.keySet(); + def rets1 = findNoCaluteDistrict(districtKeys, lastWeekendStats); + println "¡¾2023-03-26¡¿¹² "+rets1.size()+" ¸öÐ¡ÇøÎÞ¾ù¼Û" + if(rets1){ + for(def disKey : rets1){ + def array = disKey.split("##"); + def estateType2 = districtKeysMap.get(disKey) + //·¢ÖØËã¾ù¼ÛÃüÁî + addPrice(array[0], array[1], array[2], estateType2, DateUtils.parseFromTightByPattern('2023-03-01','yyyy-MM-dd'),DateUtils.parseFromTightByPattern('2023-04-03','yyyy-MM-dd')) + } + } + } + } + } + println "¹²²¹£º"+totalCount + } + + + def addPrice(city, region, name, estateType2,startDate, endDate){ + def weekends = DateUtils.getWeekendBetweenDates(startDate, endDate) + for(def weekend : weekends){ + CommonUtils.recalculationAverage(city, region, name, estateType2, weekend,false,0) + } + } + + + def findHavePrice(lastAgoWeekendStats, rets){ def disKeys = []; for(def key : rets){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddDistrictTemp.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddDistrictTemp.groovy new file mode 100644 index 000000000..94442053c --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/AddDistrictTemp.groovy @@ -0,0 +1,76 @@ +package com.fangjia.script.gj + +import com.fangjia.core.util.BaiDuApiUtils +import com.fangjia.script.util.DbUtils +import com.fangjia.script.util.ExcelUtils +import com.mongodb.BasicDBObject + +class AddDistrictTemp { + + static main(args) { + def task = new AddDistrictTemp(); + task.run(); + } + def run() { + def datas = ExcelUtils.read("D:\\Êý¾Ý\\Ð¡Çø\\ÐÂÔöÐ¡Çø.xlsx", 0, 1) + def index = 0 + for (def d : datas) { + index ++ + def q = new BasicDBObject() + q.put("city", d['A']) + q.put("name", d['C']) + q.put("cat","district") + q.put("status", 0) + def obj = DbUtils.seaweed.findOne(q) + if(!obj){ + def dbo = new BasicDBObject() + dbo.city = d['A']; + dbo.region = d['B']; + dbo.name = d['C'] + dbo.address = d['F'] + dbo.estate_type2 = "ÆÕͨסլ" + dbo.status = 0; + dbo.cat ="district" + dbo.name_cat = 0 + dbo.c_date = new Date() + dbo.m_date = new Date() + + def markMap = [:] + markMap.put("data_source", "»úÆ÷Èë¿â") + dbo.mark_map = markMap + + // ¸ßµÂת°Ù¶È + def baidu = BaiDuApiUtils.geoconv(d['G'].toString().toDouble(), d['H'].toString().toDouble(), 3) + def lng2 = baidu.x + def lat2 = baidu.y + Long lng_new = d['G'].toString().toDouble() *10000000000L + Long lat_new = d['H'].toString().toDouble() *10000000000L + dbo.put("lng", lng_new) + dbo.put("lat", lat_new) + if(lng2){ + Long lng2_new = lng2 *10000000000L + Long lat2_new = lat2 *10000000000L + dbo.put("lng2", lng2_new) + dbo.put("lat2", lat2_new) + } + def alias = [] + if(d['D'] && d['D']!=d['C'] && !alias.contains(d['D'])){ + alias << d['D'] + } + + if(d['F'] && d['F']!=d['C'] && !alias.contains(d['F'])){ + alias << d['F'] + } + if(alias){ + dbo.put("alias", alias) + } + + println "[${index}]"+dbo + DbUtils.seaweed.save(dbo); + }else{ + println d['C']+" ÒÑ´æÔÚ" + } + + } + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CityStatExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CityStatExport.groovy index 64a84167e..d6432197b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CityStatExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/CityStatExport.groovy @@ -1,40 +1,73 @@ package com.fangjia.script.gj import com.fangjia.core.RegionData +import com.fangjia.script.ccbevaluation.CcbCommonUtils import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.common.DataHandleUtils +import com.fangjia.script.util.CommonUtils import com.fangjia.script.util.DateUtils +import com.fangjia.script.util.ElasticUtils import com.fangjia.script.util.ExcelUtils import com.fangjia.script.util.MongoUtils import com.mongodb.BasicDBObject +import com.mongodb.Bytes import com.mongodb.DBCollection import com.mongodb.DBObject +import com.mongodb.QueryOperators class CityStatExport { + final DBCollection DEAL_PRICE = MongoUtils.getCollectionByName("fangjia", "deal_price", "192.168.0.43") public static final def dbUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; public static final DBCollection DIST_STAT_COLL = MongoUtils.getCollectionByName2("fangjia_stat", "district_stat", dbUrl) + public static final DBCollection HOUSE_LOUDONG = MongoUtils.getCollectionByName("fangjia", "house_loudong", "192.168.0.136") + public static final DBCollection LOUDONG = MongoUtils.getCollectionByName("fangjia_base", "loudong", "192.168.0.136") + static main(args) { def task = new CityStatExport(); - //task.run() - task.run1() +// task.run() +// task.run1() + task.regionStat() +// task.stat() + } + + def stat(){ + def fileName = "C:\\Users\\gaojuan\\Desktop\\½­ËÕ³ÇÊÐ×Ö¶ÎÐÅϢͳ¼Æ_½»¸¶.xlsx" + ExcelUtils.multiThreadingModify(fileName, { d -> + println d['A'] + " "+ d['B'] + def rets = CcbCommonUtils.findAllDistrictByCityAndRegion(d['A'], d['B'],"district", ["city","region", "name", "address","lat", "lng","all_area","build_area","virescence_percent","cubage_percent","car_site_count","finish_building_date","estate_type2","household_count","status","c_date","m_date","name_cat","street","street_number"]) + if(rets){ + d['H'] = rets.size() + } + }) } def run(){ // def citys = CommonDatautils.findAllCity(); - def citys = ["¸£ÖÝ", "ÏÃÃÅ", "ȪÖÝ", "ÆÎÌï", "ÄþµÂ", "ÈýÃ÷", "ÁúÑÒ", "ÄÏÆ½", "ÕÄÖÝ"] + def citys = ["º¼ÖÝ","Äþ²¨","ÎÂÖÝ","¼ÎÐË","̨ÖÝ","ºþÖÝ","ÉÜÐË","½ð»ª","ÖÛɽ","áéÖÝ","ÀöË®"] def ret = [] - // ret << ["³ÇÊÐ","Ð¡Çø×ÜÁ¿","²úȨÄêÏÞ¸²¸ÇÂÊ","¿¢¹¤Ê±¼ä¸²¸ÇÂÊ"] ret << ["³ÇÊÐ","Ð¡Çø×ÜÁ¿"] +// ret << ["³ÇÊÐ","Â¥¶°×ÜÁ¿", "·¿ºÅ×ÜÁ¿"] for(def city : citys){ def districts = CommonDatautils.findAllDistricts(city, "district", ["city", "region", "name"]); def total = districts.size() def m = [] m << city m << total +// def tradeCount = findTrades(city, '2022-02-01'); +// m << tradeCount +// def houseCount = findHouseCount(city, '2022-02-01') +// m << houseCount + +// def loudongCount = findLoudongCount(city) +// m << loudongCount +// +// def fanghaoCount = findFanghaoCount(city) +// m << fanghaoCount + // def priceCount = findDistrictPrice(city, null); // m << priceCount @@ -45,7 +78,7 @@ class CityStatExport { ret << m println m } - ExcelUtils.write("D:\\Êý¾Ý\\¸£½¨Ê¡Ð¡ÇøÊý¾Ýͳ¼Æ.xlsx",ret,"Êý¾Ý") + ExcelUtils.write("D:\\Êý¾Ý\\Õã½­Ê¡³ÇÊÐͳ¼Æ(Â¥ÅÌÁ¿).xlsx",ret,"Êý¾Ý") } @@ -62,6 +95,54 @@ class CityStatExport { } + def regionStat(){ + def citys = ["º¼ÖÝ","Äþ²¨","ÎÂÖÝ","¼ÎÐË","̨ÖÝ","ºþÖÝ","ÉÜÐË","½ð»ª","ÖÛɽ","áéÖÝ","ÀöË®"] + def ret = [] + ret << ["³ÇÊÐ","ÇøÓò","Ð¡Çø×ÜÁ¿"] + for(def city : citys){ + def regions = CommonDatautils.getRegionListByCity(city) + for(def r : regions){ + def districts = CommonDatautils.findDistricts(city, r, null) + println city +" "+ r +" "+ districts.size() + } + } + ExcelUtils.write("D:\\Êý¾Ý\\Õã½­Ê¡³ÇÊÐͳ¼Æ(Â¥ÅÌÁ¿).xlsx",ret,"ÇøÏØ") + } + + + def findHouseCount(def city, def startDate){ + def total = 0 + try{ + String sql = "select count(*) as c from latest_seawater where cat='sell' and city='${city}' and p_date >= ${startDate} " + + ElasticUtils.executeSqlQuery(sql,{ data-> + total = data.c + }) + }catch(Exception e){ + e.printStackTrace() + } + + return total + } + + def findLoudongCount(String city) { + return LOUDONG.count(new BasicDBObject('city', city)) + } + + def findFanghaoCount(String city){ + return HOUSE_LOUDONG.count(new BasicDBObject('city', city)) + } + + def findTrades(city, date){ + def startDate = DateUtils.parseFromTightByPattern(date, "yyyy-MM-dd") + def q = new BasicDBObject() + q.put("city", city) + q.put("area", new BasicDBObject(QueryOperators.GTE,20)) + q.put("trade_date", new BasicDBObject(QueryOperators.GTE, startDate)) + def total = DEAL_PRICE.count(q) + return total; + } + def findDistrictPrice(def city, def region){ def weekend = DateUtils.getFirstDayOfWeek(new Date()); DBObject q = new BasicDBObject() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsHouseStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsHouseStat.groovy index b78e0ec4b..da0c07889 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsHouseStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/EsHouseStat.groovy @@ -29,16 +29,16 @@ class EsHouseStat { DBCollection LOG = MongoUtils.getCollectionByName("business", "open_uri_log", "192.168.0.42", 52002) // DBCollection LOG = MongoUtils.getCollectionByName("business", "open_uri_log", "192.168.0.206", 27020) -// public static JdbcDataSource dataSource = new JdbcDataSource() -// private static final String address = "jdbc:es://http://seawater.es.db.fangjia.com:9200/timezone=UTC&page.size=250&connect.timeout=120s&network.timeout=120s&page.timeout=120s" -// public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(50) -// static { -// dataSource.setUrl(address) -// Properties connectionProperties = new Properties() -// connectionProperties.put("user", "developer") -// connectionProperties.put("password", "5e8edd851d2fdfbd7415232c67367cc3") -// dataSource.setProperties(connectionProperties) -// } + public static JdbcDataSource dataSource = new JdbcDataSource() + private static final String address = "jdbc:es://http://seawater.es.db.fangjia.com:9200/timezone=UTC&page.size=250&connect.timeout=120s&network.timeout=120s&page.timeout=120s" + public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(50) + static { + dataSource.setUrl(address) + Properties connectionProperties = new Properties() + connectionProperties.put("user", "developer") + connectionProperties.put("password", "5e8edd851d2fdfbd7415232c67367cc3") + dataSource.setProperties(connectionProperties) + } public static final def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; public static final DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FiledStrand.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FiledStrand.groovy index cdbeaefd7..1b7d3b371 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FiledStrand.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/FiledStrand.groovy @@ -1,7 +1,10 @@ package com.fangjia.script.gj +import com.fangjia.core.BlockData +import com.fangjia.core.RegionData import com.fangjia.core.util.DateUtil import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.linxsh.util.AddressUtil import com.fangjia.script.util.DbUtils import com.fangjia.script.util.ExcelUtils import com.mongodb.BasicDBObject @@ -263,8 +266,7 @@ class FiledStrand { if(all_area){ def v = getValue(all_area) if(v>=1000 && v<=10000000){ - - return v.toString() + return v.toString().toDouble().toInteger() } } return null @@ -273,7 +275,7 @@ class FiledStrand { static def processCarSite(car_site_count){ def v = getValue(car_site_count.toString()); if(v){ - if(v>=1 && v<=100000){ + if(v>5 && v<=100000){ try { return v.toString().toInteger(); }catch(Exception e){ @@ -284,6 +286,147 @@ class FiledStrand { return null } + static def processCarSiteDesc(car_site){ + if(car_site && car_site.size()<=20 && car_site.size()>=2 && !car_site.contains("´ý¶¨") && !car_site.contains("ÔÝÎÞ")){ + return car_site.toString() + } + return null + } + + + static def processPropertyLife(car_site_count){ + def v = getValue(car_site_count.toString()); + if(v){ + if([40,50,70].contains(v)){ + try { + return v.toString()+"Äê"; + }catch(Exception e){ + println e.getMessage() + } + } + } + return null + } + + static def processAlias(esVal, name, alias){ + if(esVal){ + if(esVal!=name){ + if(!alias){ + alias = [] + } + def arr = alias.split(",") + for(def s : arr){ + if(!alias.contains(s)){ + alias << esVal + } + } + + if(alias){ + return alias + } + } + } + return null + } + + static def processAddress(def esAddress, def city){ + if(esAddress){ + def formatAddress = AddressUtil.formatAddress(city, esAddress) + if(formatAddress && isRoad(formatAddress)){ + return formatAddress + } + } + return null + } + + static def processBlock(city, region, def block){ + if(block){ + if(block.contains("ÎÞ") || block.toString().length()>10){ + return null + } +// block = BlockData.formatBlock(city, region, block); + return block + } + return null + } + + static def processBuildType(def buildType, def estateType){ + if(buildType){ + def types = [] + if(estateType == "±ðÊû"){ + def arrs = ["¶à²ã","С¸ß²ã","¸ß²ã","³¬¸ß²ã","»¨Ô°Ñó·¿","ÀÏÑó·¿","ËĺÏÔº"] + for(def s : arrs){ + if(buildType.contains(s)){ + types << s + } + } + }else if(estateType == "ÉÌס"){ + def arrs = ["¶À¶°","˫ƴ","ÁªÅÅ","µþ¼Ó","ÀÏʽ±ðÊûÑó·¿"] + for(def s : arrs){ + if(buildType.contains(s)){ + types << s + } + } + }else{ + def arrs = ["¶à²ã","С¸ß²ã","¸ß²ã","³¬¸ß²ã","SOHO","soho","LOFT","loft","¾Æµêʽ¹«Ô¢"] + for(def s : arrs){ + if(buildType.contains(s)){ + types << s + } + } + } + if(types){ + return types.join(",").toString() + } + } + return null + } + + static def processlandProperty(val){ + if(val){ + def arrs = ["¾­ÊÊ·¿","ÏÞ¼Û·¿","Á®×â·¿","Õ¬»ùµØ","±£ÕÏ·¿","¶¯Ç¨·¿","ÅäÌ×·¿","ÉÌÆ··¿"] + def property = null + for(def s : arrs){ + if(val.contains(s)){ + property = s + break; + } + } + return property + } + return null + } + + static def processBuildStructure(val) { + if (val) { + def buildStructure= null + if(val.indexOf("שľ")>-1){ + buildStructure = "שľ½á¹¹" + }else if(val.indexOf("¸Ö½á¹¹")>-1){ + buildStructure = "¸Ö½á¹¹"; + }else if(val.indexOf("¸Ö¡¢¸Ö½î»ìÄýÍÁ")>-1){ + buildStructure = "¸Ö¡¢¸Ö½î»ìÄýÍÁ½á¹¹"; + }else if(val.indexOf("¸Ö½î»ìÄýÍÁ")>-1){ + buildStructure = "¸Ö½î»ìÄýÍÁ½á¹¹"; + }else if(val.indexOf("»ìºÏ")>-1){ + buildStructure = "»ìºÏ½á¹¹"; + } + return buildStructure + } + return null + } + + static def isRoad(def s){ + def pattern = Pattern.compile("[·|½Ö|´óµÀ|Ïï]"); + def matcher = pattern.matcher(s) + if(matcher.find()){ + return true; + } + return false + } + + + static def addBuildAreaToData(def dist, def updateFile){ def build_area = null; if(dist.build_area){ @@ -324,18 +467,12 @@ class FiledStrand { return updateFile; } - public static def processCubagePercent(cubage_percent, estate_type2){ + public static def processCubagePercent(cubage_percent){ if(cubage_percent){ def v = getValue(cubage_percent) if(v){ - if(estate_type2 == "±ðÊû"){ - if(v>=0.3 && v<=1){ - return v.toString() - } - }else{ - if(v>1 && v<=10){ - return v.toString() - } + if(v>=0.3 && v<=10){ + return v.toString() } } } @@ -418,26 +555,26 @@ class FiledStrand { estateCharege = estateCharege.toDouble() if(estateType2=="ÆÕͨסլ"){ if(city=="ÉϺ£" || city=="±±¾©" || city=="¹ãÖÝ" || city=="º¼ÖÝ"){ - if(estateCharege>=0.6 && estateCharege<=3.5){ + if(estateCharege>=0.3 && estateCharege<=40){ return estateCharege }else{ return null; } }else{ - if(estateCharege>=0.2 && estateCharege<=3.5){ + if(estateCharege>=0.2 && estateCharege<=20){ return estateCharege }else{ return null; } } }else if(estateType2=="±ðÊû"){ - if(estateCharege>=3){ + if(estateCharege>=1){ return estateCharege; }else{ return null; } }else if(estateType2=="ÉÌס"){ - if(estateCharege>=4){ + if(estateCharege>=2){ return estateCharege; }else{ return null; @@ -454,13 +591,13 @@ class FiledStrand { if(household_count){ household_count = household_count.toInteger() if(estateType2=="ÆÕͨסլ" || estateType2=="ÉÌס"){ - if(household_count>=50 && household_count<=100000){ + if(household_count>=15 && household_count<=100000){ return household_count; }else{ return null; } }else if(estateType2=="±ðÊû"){ - if(household_count>=20 && household_count<=100000){ + if(household_count>=10 && household_count<=100000){ return household_count; }else{ return null; @@ -470,6 +607,20 @@ class FiledStrand { return null; } + static def processLoudongCount(loudongCount){ + def v = getValue(loudongCount.toString()); + if(v){ + if(v>=1 && v<=10000){ + try { + return v.toString().toInteger(); + }catch(Exception e){ + println e.getMessage() + } + } + } + return null + } + static def processFinishBuildingDate(def finishBuildingDate){ if(finishBuildingDate){ Pattern pat1 = Pattern.compile("\\d{4}[Äê\\-\\.]\\d{2}[ÔÂ\\-\\.]\\d{2}"); @@ -493,6 +644,39 @@ class FiledStrand { } + static def processCompany(val){ + if(val){ + if(val.length()>20){ + return null + }else{ + if(val.contains("ÎÞ")){ + return null + } + def fiterChars = [",",".","?","/","Êý¾Ý",'-','?',' ',' '] + for(def s : fiterChars){ + val = val.replace(s, '') + } + + if(val.length()<1){ + return null + } + + if(val.toString().isNumber()){ + return null + } + + Pattern pattern = Pattern.compile("\\d{4}Äê"); + if (pattern.matcher(val).matches()) { + return null + } + return val + } + } + + return null; + } + + def converList(def dbCursor){ def list = [] for(def dbo : dbCursor){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy index 5da258e86..e4e5016ec 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/OpenApiUtils.groovy @@ -143,17 +143,8 @@ class OpenApiUtils { def result = queryMaxSimilarAddress(city, name) if(result){ for(def ret : result){ - if(ret && ret.lat){ - try{ - def gmap = GeocodeUtils.getGaodeToBaidu(ret.lng.toDouble(), ret.lat.toDouble()) - ret.lng2 = gmap.get("lng") - ret.lat2 = gmap.get("lat") - ret.estateType = ret.type - ret.source = "¸ßµÂ" - }catch (Exception e){ - - } - } + ret.estateType = ret.type + ret.source = "¸ßµÂ" } } return result @@ -161,11 +152,17 @@ class OpenApiUtils { public static def queryMaxSimilarAddress(String city, String address, boolean isFullMatch = false){ - if(StringUtils.isEmpty(city) || StringUtils.isEmpty(address)){ +// if(StringUtils.isEmpty(city)){ +// return null +// } + if(StringUtils.isEmpty(address)){ return null; } address = address.trim().replace(" ","") - String url = "https://restapi.amap.com/v3/place/text?keywords=" + address + "&types=120000&city=" + city + "&output=json&offset=20&page=1&key=2af0b8533415a612b98d59bb93d664b9&extensions=all" +// String url = "https://restapi.amap.com/v3/place/text?keywords=" + address + "&types=120000&city=" + city + "&output=json&offset=20&page=1&key=2af0b8533415a612b98d59bb93d664b9&extensions=all" + //key:8796b9dfb3889b57c38e2fff1b7e51bd »¨Ç®ÂòµÄ + String url = "https://restapi.amap.com/v3/place/text?keywords=" + address + "&city=" + city + "&output=json&offset=20&page=1&key=8796b9dfb3889b57c38e2fff1b7e51bd&extensions=all&citylimit=true"//citylimitÏÞÖÆ³ÇÊÐ + List poiList = null; com.alibaba.fastjson.JSONObject result = null; @@ -539,4 +536,49 @@ class OpenApiUtils { } + static def searchDistrictRank(def city, def region, def name){ + def url = "http://localhost:8080/fangjia-open/property/rank?city="+city+"&district="+region+"&name="+name+"&token=F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB" + String content = new HttpRequest().get(url, "utf-8"); + def dto = [] + if(content){ + def doc = new JsonSlurper().parseText(content) + if(doc && doc.code ==200 && doc.result){ + def dtos = doc.result + return dtos + } + } + return null; + } + + static def similarRank(proCode, cityCode, regionCode, name, area, floor, height){ + def url = "http://localhost:8080/fangjia-open/house/similar?aboveFloorAmount=${height}&buildingName=${name}&city=${cityCode}&district=${regionCode}&" + + "propertyTypeCode=01&province=${proCode}&floorNumber=${floor}&strctureArea=${area}" + println url + String content = new HttpRequest().get(url, "utf-8"); + def dto = [] + if(content){ + def doc = new JsonSlurper().parseText(content) + if(doc && doc.code ==200 && doc.result){ + def dtos = doc.result + return dtos + } + } + return null; + } + + static def financialRating(city, address){ + def url = "http://open.fangjia.com/address/financialRating?city=${city}&address=${address}&token=2C5B1EDE22A17EDA191B1863B8BD319308E3D89AFBDC76DCD511B639DDF1FC404DA43FE52CB5D8BC666444D9753B39378041962D82A67C4BB45A0E481EE0CA3FF8438C2696B9B57F85B7C110E088361345E89BFEA62FB65442C4ED4508DCEAA931B6C2C05402A3A3" + String content = new HttpRequest().get(url, "utf-8"); + if(content){ + def doc = new JsonSlurper().parseText(content) + if(doc && doc.code ==0 && doc.result){ + def dtos = doc.result + return dtos + } + } + return null; + } + + + } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ShLongShangHangLocation.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ShLongShangHangLocation.groovy new file mode 100644 index 000000000..4cc9588c1 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ShLongShangHangLocation.groovy @@ -0,0 +1,52 @@ +package com.fangjia.script.gj + +import com.fangjia.core.util.GeoUtils +import com.fangjia.script.util.ExcelUtils +import com.fangjia.script.yinjihaun.amap.GaoDeApiUtils + +class ShLongShangHangLocation { + static main(args) { + def task = new ShLongShangHangLocation() + task.run() + } + + def run(){ + def rets = ["ÉϺ£ÊлÆÐË·1599ºÅ","ÉϺ£ÊÐÑîÆÖÇø³¤Ñô·1687ºÅA¶°","ÉϺ£ÊÐÑîÆÖÇø¼Ñľ˼·432ºÅ","ÉϺ£ÊÐÑîÆÖÇø¿Ø½­Â·1063ºÅ","ÉϺ£ÊÐÑîÆÖÇø°°É½Â·100ºÅ","ÉϺ£ÊÐÑîÆÖÇøÑÓ¼ª¶«Â·287ºÅ","ÉϺ£ÊÐÑîÆÖÇøÒóÐз408ºÅ","ÉϺ£ÊÐÑîÆÖÇøÕ¢Òó·1555ºÅ102ÊÒ","ÉϺ£ÊÐÑîÆÖÇøÆ½Á¹Â·1500ºÅ"] + def map = [:] + for(def r : rets){ + def location = getLocation(r) + if(location){ + map.put(r, location) + } + } + def titleMap = [0:'C',1:'D',2:'E',3:'F',4:'G',5:'H',6:'I',7:'J',8:'K'] + ExcelUtils.modify("D:\\Êý¾Ý\\ÉϺ£Å©ÉÌÐÐ\\ÍøµãÓë¾Óί·Ö²¼20230118.xlsx",{row-> + if(row['B'] && !row['B'].contains("µØÖ·") && row['B'].contains('ÆëÆë¹þ¶û·')){ + for(def i=0;i + if(d['A'] && d['T']=="°Ù¶ÈÈ˹¤"){ + def jsonObj = BaiDuApiUtils.getDetailByUid(d['U']) + if(jsonObj && jsonObj.result){ + def result = jsonObj.result + if(result){ + d['J'] = result.uid + d['K'] = RegionData.formatRegion(result.city, result.area) + d['L'] = result.name + d['M'] = result.address + d['N'] = result.detail_info.tag + d['O'] = result.location.lng + d['P'] = result.location.lat + println result + } + } + } + }) + } + def marge(){ + def file1 = "D:\\Êý¾Ý\\ÒøÁª\\ÒøÁªÈ˹¤1221(ÁéÖ¥).xlsx" + def datas1 = ExcelUtils.read(file1, 0, 1) + ExcelUtils.modify("D:\\Êý¾Ý\\ÒøÁª\\Êý¾Ý500Ìõ(12-21).xlsx",{d-> + if(d['A']){ + for(def r : datas1){ + if(r['A'] == d['A']){ + List pois = GaoDeUtils.getAmapById2(r['F']); + if(pois && pois.size()==1){ + def amapPoi = pois[0] + d['J'] = amapPoi.id + d['K'] = amapPoi.adname + d['L'] = amapPoi.name + d['M'] = amapPoi.address + d['N'] = amapPoi.type + def location = amapPoi.location + if(location){ + def arrs = location.split(",") + // ¸ßµÂת°Ù¶È + def baidu = BaiDuApiUtils.geoconv(arrs[0].toString().toDouble(), arrs[1].toString().toDouble(), 3) + def lng2 = baidu.x + def lat2 = baidu.y + d['O'] = lng2 + d['P'] = lat2 + } + } + println pois + } + } + } + }) + } + + def run(){ + ExcelUtils.modify("D:\\Êý¾Ý\\ÒøÁª\\Êý¾Ý500Ìõ£¨ºÏ²¢È˹¤).xlsx",{row-> + def score = row['Q'] + if(row['B'] && !row['L']){ + def baiduCode = getBaiduMapCode(row['E']); + def city = RegionData.formatCity(row['E']); + if(!baiduCode){ + baiduCode = getBaiduMapCode(city); + } + + def newKeys = filterName(row['D'], row['E'], row['F'], row['B']) + row['I'] = newKeys + + if(baiduCode){ + def map = getSimpleAddress(city, row['C']) + def simpleAddr = map.addr + if(map.city!="ÊÐÏ½Çø" && map.city!=city){ + city = RegionData.formatCity(map.city); + } + def rets = getBiduSearchDatas(baiduCode , simpleAddr, row['B'], null) + rets = getBiduSearchDatas(baiduCode , null, row['B'], rets) + rets = getBiduSearchDatas(baiduCode , null, simpleAddr, rets) + def bdRes = searchMapBySimilar(city, row['F'], row['B'], simpleAddr, rets, newKeys); + if (bdRes) { + row['J'] = bdRes.uid + row['K'] = bdRes.region + row['L'] = bdRes.name + row['M'] = bdRes.old_addr + row['N'] = bdRes.type + row['O'] = bdRes.baidu_lng2 + row['P'] = bdRes.baidu_lat2 + row['Q'] = bdRes.score + if(bdRes.matchType){ + row['R'] = bdRes.matchType + } + } + println row['B'] +" "+ bdRes + } + + } + }) + } + + def matchFlag(){ + ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\ÒøÁª\\Êý¾Ý500Ìõ£¨ºÏ²¢È˹¤).xlsx",{row-> + if(row['B'] && row['B'].contains("Âó¼ÓÃÀ¶­´å²ÍÌü")){ + def datas = findQccData(row['B']) + if(datas){ + def max_score = 0 + def last_obj = null + def newKeys = filterName(row['D'], row['E'], row['F'], row['B']) + def city = RegionData.formatCity(row['E']); + for(def d : datas){ + + def map = getSimpleAddress(null, d.address) + def inputMap = getSimpleAddress(null, row['C']) + if(inputMap && inputMap.city){ + city = inputMap.city + } + if(map && city==map.city){ + def qccNameKey = filterName(map.pro, map.city, map.region, d.name) + def name_score = CosineSimilarAlgorithm.getSimilarityRatio(newKeys, qccNameKey); + def addr_score = 0 + if (map.addr && inputMap.addr) { + if(map.addr.contains("Óë")){ + def arrs = map.addr.split("Óë") + for(def s1 : arrs){ + def temp_addr_score = CosineSimilarAlgorithm.getSimilarityRatio(inputMap.addr, s1); + if(temp_addr_score > addr_score){ + addr_score = temp_addr_score + } + } + }else{ + addr_score = CosineSimilarAlgorithm.getSimilarityRatio(inputMap.addr, map.addr); + } + } + + def total_score = name_score + addr_score + if(total_score > max_score){ + max_score = total_score; + last_obj = d + last_obj.simple_addr = map.addr + last_obj.tyc_city = map.city + } + println row['B'] +" "+ d.name+" "+total_score + }else{ + def qccNameKey = filterName(map.pro, map.city, map.region, d.name) + def name_score = CosineSimilarAlgorithm.getSimilarityRatio(newKeys, qccNameKey); + if(map.addr && inputMap.addr && (inputMap.addr.contains(map.addr) || map.addr.contains(inputMap.addr))){ + max_score = name_score; + last_obj = d + last_obj.simple_addr = map.addr + last_obj.tyc_city = map.city + println row['B'] +" "+ d.name+" "+name_score + } + } + } + if(max_score && max_score > 0.4){ + row['AB'] = last_obj.name + row['AC'] = last_obj.address + row['AD'] = last_obj.flag + row['AE'] = max_score + } + } + } + }); + } + + def findQccData(keywords){ + def q = new BasicDBObject() +// q.put("search_terms", keywords) + if(keywords.contains("(*")){ + keywords = keywords.toString().substring(0, keywords.toString().indexOf("(*")) + } + q.put("search_terms", Pattern.compile("^.*${keywords}.*\$", Pattern.CASE_INSENSITIVE)) + def dbcursor = QCC_COLL.find(q) + def rets = [] + for(def d : dbcursor){ + rets << ["name":d.name, "address":d.taxAddress, "flag":d.regStatus] + } + return rets; + } + def getBiduSearchDatas(baiduCode , simpleAddr, nameKey, rets){ + def searchKey = "" + if(simpleAddr){ + searchKey = simpleAddr +" "+nameKey + }else{ + searchKey = nameKey + } + def datas = searchBaiDuMap(searchKey, baiduCode.toInteger()); + if(!rets){ + return datas; + }else{ + def ids = [] + for(def r : rets){ + if(!ids.contains(r.uid)){ + ids << r.uid + } + } + for(def d : datas){ + if(!ids.contains(d.uid)){ + rets << d + } + } + return rets; + } + return null; + } + + + def getSimpleAddress(city, address){ + def jsonObj = FangjiaClientUtils.addressStructure(city, address) + def old_addr = "" + def map = [:] + if(jsonObj && jsonObj.result){ + + if(jsonObj.result.province){ + map.pro = jsonObj.result.province + } + + if(jsonObj.result.city){ + if(jsonObj.result.city=="ÊÐÏ½Çø"){ + map.city = jsonObj.result.province + }else{ + map.city = jsonObj.result.city + } + map.city = RegionData.formatCity(map.city) + } + + if(jsonObj.result.district){ + map.region = jsonObj.result.district + } + if(jsonObj.result.street){ + def street = jsonObj.result.street + if(street){ + old_addr = street + map.street = street.replace("½»²æ¿Ú","").replace("½»²æ","") + } + } + if(jsonObj.result.streetNumber){ + def street_number = jsonObj.result.streetNumber + if(street_number){ + old_addr = old_addr + street_number + } + } + } + map.addr = old_addr.replace("½»²æ¿Ú","").replace("½»²æ","") + return map; + } + + def filterName(pro,city, region, name){ + def newKey = name.replace("²ÍÒû·þÎñÓÐÏÞ¹«Ë¾","").replace("¿Ø¹ÉÓÐÏÞ¹«Ë¾","").replace("ÓÐÏÞÔðÈι«Ë¾", "").replace("ÓÐÏÞ¹«Ë¾","").replace("²ÍÒû","") + if(pro && name.contains(pro)){ + newKey = newKey.replace(pro, "") + } + + def newCity = RegionData.formatCity(city) + if(city && (name.contains(city) || name.contains(newCity))){ + newKey = newKey.replace(city, "").replace(newCity, "") + } + + if(region && newKey.contains(region) ){ + newKey = newKey.replace(region, "") + } + + def newRegion = null + if(region){ + newRegion = RegionData.formatRegion(city, region) + } + if(newRegion && newKey.contains(newRegion)){ + newKey = newKey.replace(newRegion, "") + } + + if(newKey.contains("(") || newKey.contains("£¨")){ + if(newKey.contains("(")){ + def subName = newKey.substring(newKey.indexOf("(")+1, newKey.indexOf(")")); + if(subName.endsWith("½Ö") || subName.endsWith("·") || subName.contains("*") || subName.endsWith("µê")){ + newKey = newKey.replace("("+subName+")", ""); + } + } + newKey = newKey.replace("(","").replace(")","").replace("£¨","").replace("£©","") + if(newKey.toString().endsWith("µê")){ + newKey = newKey.substring(0, newKey.size()-1) + } + } + return newKey; + } + + def filterName2(pro,city, region, name){ + def newKey = name.replace("²ÍÒû·þÎñÓÐÏÞ¹«Ë¾","").replace("¿Ø¹ÉÓÐÏÞ¹«Ë¾","").replace("ÓÐÏÞÔðÈι«Ë¾", "").replace("ÓÐÏÞ¹«Ë¾","").replace("²ÍÒû","") + if(pro && name.contains(pro)){ + newKey = newKey.replace(pro, "") + } + + def newCity = RegionData.formatCity(city) + if(city && (name.contains(city) || name.contains(newCity))){ + newKey = newKey.replace(city, "").replace(newCity, "") + } + + if(region && newKey.contains(region) ){ + newKey = newKey.replace(region, "") + } + + def newRegion = null + if(region){ + newRegion = RegionData.formatRegion(city, region) + } + if(newRegion && newKey.contains(newRegion)){ + newKey = newKey.replace(newRegion, "") + } + + newKey = newKey.replace("(","").replace(")","").replace("£¨","").replace("£©","") + return newKey; + } + + def getBaiduMapCode(city){ + if(city){ + return baiduCityCodeMap[city] + } + return city + } + + static def searchBaiDuMap(String address, int cityCode) { + def rets = [] + try { + Thread.sleep(500) + // String url = "https://map.baidu.com/?newmap=1&reqflag=pcmap&biz=1&from=webmap&da_par=baidu&pcevaname=pc4.1&qt=s&da_src=searchBox.button&wd="+URLEncoder.encode(address,"UTF-8")+"&c=${cityCode}&src=0&wd2=&pn=0&sug=0&l=11&from=webmap&sug_forward=&device_ratio=1&tn=B_NORMAL_MAP&nn=0&u_loc=13509900,3640104&ie=utf-8&t=${System.currentTimeMillis()}&&auth=Dae1RaNR1LK8xdJTxN8SQOTRa2AH%3DL7vuxLNVENTxRBt6BG6B6WJWwGvzBU%40yYxvkGcuVtvvhguVtvyheuVtcvY1SGpuLtB2QKAZzvCQMuVtvIPcuxtw8wkv7uvZgMuVtv%40vcuVtvc3CuVtvcPPuztxgHxwBVDzvFosSE21wiKDv7uvhgMuzVVtvrMhuENLtSrrlrIKHf0wd0vyMO7FOUySy&seckey=Im7p%2FanwNmQx078ijew%2FsyQrDC7YJnynqrZ43JVFlM0%3D%2C0-Ulo82T3hd3wuKMf_tTM-ZXYa3S1Y21RX3DV_l5MHgI_1U55ZQrzxTIKi3BRb2x59mVOurDjnW_8CwMEmjK3y8JfHyV0kv70GMQXxnIEcHpM3Dqhs5EdrN6ciDtoxyrcRfowp_xTBkEgU49ZrCz2KeLyujCOypqjKS3rAmPOfEp1kIZPD4W6RDQzrsWTe7a"; + String url = "https://map.baidu.com/?newmap=1&reqflag=pcmap&biz=1&from=webmap&da_par=after_baidu&pcevaname=pc4.1&qt=s&da_src=searchBox.button&wd="+URLEncoder.encode(address,"UTF-8")+"&c=${cityCode}&src=0&wd2=&pn=0&sug=0&l=19&from=webmap&sug_forward=&auth=E8LCawOwRbEOx6JVTvCIBI6W7zSz5vSXuxLNVENTRVLtUDHUDUYKYyHxzBU%40yYxvkGcuVtvvhguVtvyheuVtvCMGuVtvCQMuVtvIPcuxtw8wkv7uvZgMuVtv%40vcuVtvc3CuVtvcPPuztxgHxwDWBWvveh3uxtwiKDv7uvhgMuzVVtcvY1SGpuxRtKHZz3VP8JSrrlrIKHf0wd0vyMO7FOUS7F&seckey=Im7p%2FanwNmQx078ijew%2FsyQrDC7YJnynqrZ43JVFlM0%3D%2C0-Ulo82T3hd3wuKMf_tTM-ZXYa3S1Y21RX3DV_l5MHgI_1U55ZQrzxTIKi3BRb2x59mVOurDjnW_8CwMEmjK3y8JfHyV0kv70GMQXxnIEcHpM3Dqhs5EdrN6ciDtoxyrcRfowp_xTBkEgU49ZrCz2KeLyujCOypqjKS3rAmPOfEp1kIZPD4W6RDQzrsWTe7a&device_ratio=2&tn=B_NORMAL_MAP&nn=0&u_loc=13513133,3631861&ie=utf-8&t=${System.currentTimeMillis()}&newfrom=zhuzhan_webmap" + def content = new HttpRequest().get(url, null, "utf-8") + JSONObject json = JSONObject.fromObject(content) + if (json && json.content && json.content.size() > 0) { + for (def loc : json.content) { +// String name = formatName(address) + def x = loc.x + def y = loc.y + if(x){ + x = x/100 + } + if(y){ + y = y/100 + } + if(x && y){ + def locJson = BaiDuApiUtils.geoconv(x, y, 6) + if(locJson){ + def baiduCity = RegionData.parseCityInAddress(loc.area_name) + def bean = [:] + def lng2 = locJson.get("x") + def lat2 = locJson.get("y") + def gmap = GeocodeUtils.geoconvBaiduToGoogle(lng2, lat2) + def lng = gmap.get("lng") + def lat = gmap.get("lat") + bean.uid = loc.uid + bean.baidu_lng2 = lng2 + bean.baidu_lat2 = lat2 + bean.longitude = lng + bean.latitude = lat + bean.name = loc.name + if(loc.address_norm){ + bean.address = getAddressInfo(loc.address_norm, loc.addr); + } + bean.old_addr = loc.addr + + if(!baiduCity){ + baiduCity = RegionData.formatCity(loc.city_name) + } + bean.cityname = baiduCity + if(loc.city_name){ + def regionStr = loc.area_name.replace(loc.city_name, "") + def baiduRegion = RegionData.formatRegion(baiduCity, regionStr); + bean.region = baiduRegion + } + + if(loc.std_tag){ + bean.type = loc.std_tag + } + bean.flag = loc.acc_flag + rets << bean; + } + } + } + } + } catch(Exception e) { + searchBaiDuMap(address, cityCode) + } + return rets; + } + + def static formatName(String name) { + if(name.indexOf("¡¤") != -1) { + name = name.replaceAll("¡¤", "") + } + + if(name.indexOf(".") != -1) { + name = name.replace(".", "") + } + if(name.indexOf("(") != -1) { + name = name.replace("(", "") + } + if(name.indexOf(")") != -1) { + name = name.replace(")", "") + } + if(name.indexOf("-")!=-1){ + name = name.replace("-","") + } + return name.replaceAll("\\s+", "").toLowerCase() + } + + + static def getAddressInfo(def s, def addr){ + def arrs = s.split("]") + def map = [:] + if(arrs && arrs.size()>=3){ + if(arrs[0] && arrs[0].contains("PROV")){ + map.prov = arrs[0].substring(1, arrs[0].indexOf("(")) + } + if(arrs[1] && arrs[1].contains("CITY")){ + map.city = arrs[1].substring(1, arrs[1].indexOf("(")) + } + if(arrs[2] && arrs[2].contains("AREA")){ + map.region = arrs[2].substring(1, arrs[2].indexOf("(")) + } + } + if(addr){ + addr = addr.replace("[]","") + } + if(addr && map){ + if(map.region && !addr.contains(map.region)){ + addr = map.region + addr + } + if(map.city && !addr.contains(map.city)){ + addr = map.city + addr + } + + if(map.prov && !addr.contains(map.prov)){ + addr = map.prov + addr + } + } + return addr; + } + + + + def searchMapBySimilar(def city, def region, def name, def inpAddr, def rets, newKey){ + def bo = null; + if(rets){ + def maxScore = 0; + if(!bo || !maxScore){ + for(def o :rets){ + def s = o.name +// if(o.name && o.name.contains("(") && !o.name.toString().startsWith("(")){ +// s = o.name.substring(0, o.name.indexOf("(")) +// } +// s = formatName(s) + def addr = o.address + def mapKey = filterName(null, o.cityname, o.region, o.name) + def mapKey1 = filterName2(null, o.cityname, o.region, o.name) + + if(mapKey){ + def score = CosineSimilarAlgorithm.getSimilarityRatio(mapKey, newKey); + def score1 = CosineSimilarAlgorithm.getSimilarityRatio(mapKey1, newKey); + if(score1>score){ + score = score1 + } + def addr_score = 0 + if(inpAddr) { + def baidu_addr_map = getSimpleAddress(o.cityname, o.old_addr) + if(!baidu_addr_map.addr){ + baidu_addr_map.addr = AddressUtil.formatAddress(o.cityname, o.old_addr) + } + if(!baidu_addr_map.addr){ + if(o.region && !region.contains(o.region)){ + continue; + } + if(city!=o.cityname){ + continue; + } + } + if (baidu_addr_map.addr) { + if(baidu_addr_map.addr.contains("Óë")){ + def arrs = baidu_addr_map.addr.split("Óë") + for(def s1 : arrs){ + def temp_addr_score = CosineSimilarAlgorithm.getSimilarityRatio(inpAddr, s1); + if(temp_addr_score > addr_score && (inpAddr.contains(baidu_addr_map.addr) || baidu_addr_map.addr.contains(inpAddr))){ + addr_score = temp_addr_score + } + } + }else{ + addr_score = CosineSimilarAlgorithm.getSimilarityRatio(inpAddr, baidu_addr_map.addr); + if(addr_score>0 && inpAddr && baidu_addr_map.street && !inpAddr.contains(baidu_addr_map.street) && !baidu_addr_map.street.contains(inpAddr)){ + addr_score = 0 + } + } + + } + } + + if(addr_score>0 && score==0){ + addr_score = addr_score/2 + } + def total_score = score + addr_score +// if(city==o.cityname){ + if(total_score > maxScore){ + maxScore = total_score; + o.matchType = "³ÇÊÐÏàͬ£¬Ãû³ÆÏàËÆ" + o.city = o.cityname + bo = o + bo.score = maxScore + + if(addr_score>0.6){ + o.matchType = "³ÇÊÐÏàͬ£¬Ãû³ÆÏàËÆ£¬µØÖ·ÓйØ" + } + } +// if(bo && score!=1){ +// if(inpAddr){ +// def baidu_addr = getSimpleAddress(o.cityname, o.old_addr) +// if(baidu_addr){ +// def addr_score = CosineSimilarAlgorithm.getSimilarityRatio(inpAddr, baidu_addr); +// //if(addr_score==1){ +// // o.matchType = "³ÇÊÐÏàͬ£¬Ãû³ÆÏàËÆ£¬µØÖ·ÓйØ" +// bo.score = bo.score + addr_score +// maxScore = bo.score; +// //} +// } +// } + +// for(def word : filters){ +// if(mapKeyName.toString().endsWith(word)){ +// mapKeyName = mapKeyName.replace(word, "") +// } +// if(newName.toString().endsWith(word)){ +// newName = newName.replace(word, ""); +// } +// } +// +// +// if(mapKeyName && newName && mapKeyName.length()>=2){ +// score = CosineSimilarAlgorithm.getSimilarityRatio(mapKeyName, newName); +// if(score > maxScore){ +// maxScore = score +// o.matchType = "Ãû³ÆÏàËÆ" +// o.city = obj.city +// bo = o +// bo.score = maxScore +// }else{ +// if(mapKeyName.length() == newName.length()){ +// def mapKeyNameBY = com.fangjia.core.util.DataUtil.hanyuQuanpin(mapKeyName, " ") +// def newNameBY = com.fangjia.core.util.DataUtil.hanyuQuanpin(newName, " ") +// if(mapKeyNameBY == newNameBY){ +// maxScore = 0.977; +// o.matchType = "Æ´ÒôÏàËÆ" +// o.city = obj.city +// bo = o +// bo.score = maxScore +// } +// } +// } +// } +// } +// } + } + } + } + } + return bo; + } + + +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy index 6ccaabde3..16cae9383 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/YouDaDataParser.groovy @@ -48,13 +48,13 @@ class YouDaDataParser { def final AtomicInteger count_ = new AtomicInteger(0) - static def statDate = "2022-09-01" + static def statDate = "2023-04-01" static main(args) { def task = new YouDaDataParser(); // task.newHouseparse();//ÓÑ´ïÒ»ÊÖ·¿´æÈëmongo -// task.esfParser("D:\\Êý¾Ý\\ÓÑ´ï\\2022Äê10ÔÂ\\²éѯ1.DBF");//ÓÑ´ï¶þÊÖ·¿´æÈëmongo +// task.esfParser("D:\\Êý¾Ý\\ÓÑ´ï\\2023Äê5ÔÂ\\²éѯ1.DBF");//ÓÑ´ï¶þÊÖ·¿´æÈëmongo // task.newhouseToSaveEs();//з¿±£´æµ½es -// task.esfhouseToSaveEs();//¶þÊÖ·¿±£´æµ½es + task.esfhouseToSaveEs();//¶þÊÖ·¿±£´æµ½es // task.updateFinishDateByEsfTrade();//¸ù¾Ý¶þÊֳɽ»µÄ¿¢¹¤Ê±¼äÐÞ¸Äseaweed¿âÖеĿ¢¹¤Ê±¼ä } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ZheShengBank.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ZheShengBank.groovy new file mode 100644 index 000000000..73ea03b09 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ZheShengBank.groovy @@ -0,0 +1,118 @@ +package com.fangjia.script.gj + +import com.fangjia.core.Constants +import com.fangjia.core.util.DateUtil +import com.fangjia.core.util.Mongo3Utils +import com.fangjia.script.gj.ccb.FileUtils +import com.fangjia.script.util.ExcelUtils +import com.mongodb.BasicDBObject +import com.mongodb.client.MongoCollection +import net.sf.json.JSONObject +import org.bson.Document + +import static com.mongodb.client.model.Filters.* + +MongoCollection OPEN_URI_LOG = Mongo3Utils.getDbCollection(Constants.SEAWATER_MONGO_URI, "business", "open_uri_log") +//def startDate = DateUtil.parseDate("20210301", "yyyyMMdd") +//def endDate = DateUtil.parseDate("20230401", "yyyyMMdd") +//Calendar calendar = Calendar.getInstance() +//calendar.setTime(startDate) +//def data = [[ "¹«Ë¾Ãû³Æ","·ÃÎÊÁ´½Ó", "·ÃÎÊʱ¼ä", "×ÜÁ¿"]] +//def rMap = [:] +//def index = 0 +//OPEN_URI_LOG.find(and(eq("user_id", "1007569"), eq("request_uri", "/address/risk"), eq("code", 200))).each { Document doc -> +// index++ +// def day = doc.c_date.format("yyyy-MM-dd") +// def count = rMap.get(day) +// if (!count) { +// rMap.put(day, 1) +// } else { +// rMap.put(day, count + 1) +// } +// if(index%10000==0){ +// println index+" "+new Date().toString() +// } +//} +// +//rMap.each {k,val-> +// println k+" "+val +//} + +//def startDate = DateUtil.parseDate("20230416", "yyyyMMdd") +//def endDate = DateUtil.parseDate("20230418", "yyyyMMdd") +//Calendar calendar = Calendar.getInstance() +//calendar.setTime(startDate) +//def count = 0 +//def hashSet = [] +//def data = [["Óû§ID", "Óû§Ãû³Æ", "IP", "·ÃÎÊÁ´½Ó", "·ÃÎÊʱ¼ä", "dataStatus", "code", "msg", "²ÎÊý", "resMap"]] +//while (startDate.before(endDate)) { +// calendar.add(Calendar.DATE, 1) +// def nextDate = calendar.getTime() +// count++ +// def total = 0 +// OPEN_URI_LOG.find(and(eq("user_id", "1007569"), eq("request_uri", "/address/risk"), eq("data_status", 1), lt("c_date", nextDate), gte("c_date", startDate))).each { Document doc -> +// total++ +// def result = JSONObject.fromObject(doc.res_map.result) +//// if (!hashSet.contains(result)) { +// def item = [doc._id.toString(), "neiping2017@czbank", doc.ip, doc.request_uri, doc.c_date.format("yyyy-MM-dd HH:mm:ss"), doc.data_status, doc.code, doc.msg, JSONObject.fromObject(doc.parameter_map).toString(), result.toString()] +// data << item +// hashSet << result +// println total+" "+ nextDate +//// } else { +//// println("ÒÑ´æÔÚ") +//// } +// } +// if (count % 7 == 0) { +// hashSet.clear() +// } +// +// startDate = nextDate +// +//} +// +////FileUtils.batchCreateFile(data, "d:\\ÕãÉ̵÷ÓÃÏêÇé1.csv",null, "utf-8", false); +//ExcelUtils.write("D:\\ÕãÉ̵÷ÓÃÏêÇé${startDate.format('yyyyMM')}.xlsx", data, "²éѯÈÕÖ¾") + + + + +def startDate = DateUtil.parseDate("20230501", "yyyyMMdd") +def endDate = DateUtil.parseDate("20230508", "yyyyMMdd") +Calendar calendar = Calendar.getInstance() +calendar.setTime(startDate) +def count = 0 +def hashSet = [] +def data = [["Óû§ID", "Óû§Ãû³Æ", "IP", "·ÃÎÊÁ´½Ó", "·ÃÎÊʱ¼ä", "dataStatus", "code", "msg", "²ÎÊý", "resMap"]] + +OPEN_URI_LOG.find(and(eq("user_id", "1007779"), eq("data_status", 1), lt("c_date", endDate), gte("c_date", startDate))).each { Document doc -> + def result = JSONObject.fromObject(doc.res_map.result) + def item = [doc._id.toString(), "ÁÉÄþ׿ÐÅÆÕ»ÝÕ÷ÐÅ", doc.ip, doc.request_uri, doc.c_date.format("yyyy-MM-dd HH:mm:ss"), doc.data_status, doc.code, doc.msg, JSONObject.fromObject(doc.parameter_map).toString(), result.toString()] + data << item + hashSet << result +} + + +//FileUtils.batchCreateFile(data, "d:\\ÕãÉ̵÷ÓÃÏêÇé1.csv",null, "utf-8", false); +ExcelUtils.write("D:\\ÁÉÄþ׿ÐÅÆÕ»ÝÕ÷ÐÅ${startDate.format('yyyyMM')}.xlsx", data, "²éѯÈÕÖ¾") + + +//def startDate = DateUtil.parseDate("20221201", "yyyyMMdd") +//def endDate = DateUtil.parseDate("20230506", "yyyyMMdd") +//Calendar calendar = Calendar.getInstance() +//calendar.setTime(startDate) +//def count = 0 +//def hashSet = [] +//def data = [["Óû§ID", "Óû§Ãû³Æ", "IP", "·ÃÎÊÁ´½Ó", "·ÃÎÊʱ¼ä", "dataStatus", "code", "msg", "²ÎÊý", "resMap"]] +// +//OPEN_URI_LOG.find(and(eq("request_uri", "/property/detail"), eq("data_status", 1), lt("c_date", endDate), gte("c_date", startDate))).each { Document doc -> +// def result = JSONObject.fromObject(doc.res_map.result) +// def item = [doc._id.toString(), doc.user_id, doc.ip, doc.request_uri, doc.c_date.format("yyyy-MM-dd HH:mm:ss"), doc.data_status, doc.code, doc.msg, JSONObject.fromObject(doc.parameter_map).toString(), result.toString()] +// data << item +// hashSet << result +// count++ +// println count +//} +// +// +////FileUtils.batchCreateFile(data, "d:\\ÕãÉ̵÷ÓÃÏêÇé1.csv",null, "utf-8", false); +//ExcelUtils.write("D:\\Ð¡ÇøÏêÇé${startDate.format('yyyyMM')}.xlsx", data, "²éѯÈÕÖ¾") \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCodeUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCodeUtils.groovy index 66ff6a8f3..e343714fd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCodeUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/CcbCodeUtils.groovy @@ -221,6 +221,15 @@ class CcbCodeUtils { } return "99" } + + static def getUseTypeCode(def estateType){ + if(estateType=="ÉÌס"){ + return "13" + }else if(estateType && (estateType=="ÆÕͨסլ")){ + return "11" + } + return "11" + } //ÊÒÄڽṹ //ƽ²ã:11 ´í²ã:12 ¸´Ê½:13 ¸óÂ¥:14 ÍŽủ:15 ÀÏʽ·¿:16 µØÏÂÊÒ:17 ´ø¸óÂ¥:21 ´ø³µ¿â:22 ÆäËû:99 Ô¾²ã:18 ´øµØÏÂÊÒ:24 ´ø´¢²ØÊÒ:25 ´ø³µÎ»:23 static def getHouseStructureCode(){ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/FileUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/FileUtils.groovy index 23513b80b..78270dc6c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/FileUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/ccb/FileUtils.groovy @@ -78,4 +78,16 @@ class FileUtils { } out.close(); } + + static def readTxt(def file){ + def f = new File(file) + def ret = []; + if(f.exists()){ + def lines = org.apache.commons.io.FileUtils.readLines(f,"utf-8") + for(line in lines) { + ret << line; + } + } + return ret; + } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/crawl/AnjukeDistrictMatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/crawl/AnjukeDistrictMatch.groovy index f990711be..269b5be9e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/crawl/AnjukeDistrictMatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/crawl/AnjukeDistrictMatch.groovy @@ -1,52 +1,765 @@ package com.fangjia.script.gj.crawl +import com.fangjia.core.RegionData import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.gj.EsUtils +import com.fangjia.script.linxsh.util.AddressUtil import com.fangjia.script.temp.shenjian.util.SeaweedUtils +import com.fangjia.script.util.DbUtils +import com.fangjia.script.util.ElasticUtils import com.fangjia.script.util.ExcelUtils import com.fangjia.script.util.OpenApiClient +import com.mongodb.BasicDBList +import com.mongodb.BasicDBObject +import groovy.sql.Sql +import org.apache.commons.lang.StringUtils +import org.apache.lucene.index.Term +import org.apache.lucene.search.BooleanClause +import org.apache.lucene.search.BooleanQuery +import org.apache.lucene.search.TermQuery +import org.bson.types.ObjectId + +import java.util.concurrent.CopyOnWriteArrayList +import java.util.concurrent.CountDownLatch +import java.util.concurrent.ExecutorService +import java.util.concurrent.Executors +import java.util.concurrent.atomic.AtomicLong class AnjukeDistrictMatch { + public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(10) + + def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse", + "postgres", "postgres", "org.postgresql.Driver") + static main(args) { +// def name = "½¼Ò×ì±õ½­ÖÐÐÄN2×ù" +// name = name.replaceAll("-?\\w+(ºÅд×ÖÂ¥|ºÅÂ¥|Â¥|×ù|¶°)","") +// println name def task = new AnjukeDistrictMatch(); - task.run(); +// task.run(); +// task.runCsv(); +// task.updateCredit() + task.matchCommunity()//²éѯesÐ¡ÇøÊý¾Ý // task.run1() +// task.updateGreenRateField()//¸ù¾ÝµÚÈý·½Êý¾ÝÌî²¹¿âÖÐ×Ö¶Î +// task.updteGreenRateFieldByCsv() +// task.fenQiRun() + +// task.findAliasDatas("»´°²","Ë®ãåδÀ´Ó¡Ïó»¨Ô°")//Ä£ºý²éÕÒEs±ðÃûÊý¾Ý +// task.repeatDistByAlias()//¸ù¾ÝµÚÈý·½ÍøÕ¾±ðÃû²éÕÒÖØ¸´Êý¾Ý + +// task.matchCommunityByCsv() +// task.updteBuildAreaFieldByCsv() +// task.updadteAllAreaFieldByCsv() +// task.updatePlotRateFieldByCsv() +// task.updateFinishDateFieldByCsv() } - def run1(){ - def regionPointsMap = findRegionRange("ÖØÇì") - def flag = isInArea(dist.lng/10000000000.0, dist.lat/10000000000.0, regionPointsMap.get(dist.region)) + def updateCredit(){ + def datas = readTxt("D:\\Êý¾Ý\\½¨ÐÐ\\¶þÆÚ\\µÚÈý·½Ð¡Çø×ֶβ¹³ä\\µÚÈý·½ÍøÕ¾ÂÌ»¯ÂÊ (Æ¥Åä).csv") + def results = [] + for(def i=0;i + if(v.master_district_name!="master"){ + def masterKey = v.city +"##"+v.region+"##"+v.master_district_name; +// def masterObj = distMap.get(masterKey) + def masterObj = CommonDatautils.findDistrict(v.city, v.region, v.master_district_name, "district"); + if(masterObj){ + def udata = new BasicDBObject() + if(!v.virescence_percent && masterObj.virescence_percent){ + udata.put("virescence_percent", masterObj.virescence_percent) + } + + if(!v.build_area && masterObj.build_area){ + udata.put("build_area", masterObj.build_area) + } + + if(!v.all_area && masterObj.all_area){ + udata.put("all_area", masterObj.all_area) + } + + if(!v.cubage_percent && masterObj.cubage_percent){ + udata.put("cubage_percent", masterObj.cubage_percent) + } + + if(udata){ + index ++ + udata.put("m_date",new Date()) + def q = new BasicDBObject() + q.put("_id", new ObjectId(v._id.toString())) + DbUtils.seaweed.update(q, new BasicDBObject('$set', udata)) + } + + } + } + } + println index; + } + + def findFiqiDatas(dists){ + def distMap = [:] + for(def d : dists){ + def master_district_name = d.master_district_name + if(master_district_name && master_district_name!="null"){ + distMap.put(d.city+"##"+d.region+"##"+d.name, d); + } + } + return distMap; + } + + + def updateGreenRateField(){ + def filePath = "D:\\Êý¾Ý\\½¨ÐÐ\\¶þÆÚ\\µÚÈý·½Ð¡Çø×ֶβ¹³ä\\ÂÌ»¯ÂÊ.xlsx" + ExcelUtils.multiThreadingModify(filePath, { row -> + if(row['Q'] && !row['Q'].contains("½Ó¿Ú")){ + def dist = CommonDatautils.findSeaweedById(row['R'], ["virescence_percent"]) + if(dist && !dist.virescence_percent){ + def val = row['K'] + if(!val){ + val = row['J'] + } + if(!val){ + val = row['M'] + } + if(!val){ + val = row['O'] + } + if(!val){ + val = row['G'] + } + if(!val){ + val = row['E'] + } + if(!val){ + val = row['F'] + } + if(!val){ + val = row['H'] + } + if(!val){ + val = row['I'] + } + if(!val){ + val = row['L'] + } + if(!val){ + val = row['N'] + } + if(!val){ + val = row['O'] + } + + if(val){ + if(val.toString().toDouble().toInteger()==val.toString().toDouble()){ + val = val.toString().toDouble().toInteger() + } + def udata = new BasicDBObject() + udata.put("virescence_percent", val.toString()) + udata.put("m_date",new Date()) + + def q = new BasicDBObject() + q.put("_id", new ObjectId(dist._id.toString())) + DbUtils.seaweed.update(q, new BasicDBObject('$set', udata)) + row['U'] = 1 + } + } + } + }) + } + + + def matchCommunityByCsv(){ + def datas = readTxt("D:\\Êý¾Ý\\½¨ÐÐ\\¶þÆÚ\\µÚÈý·½Ð¡Çø×ֶβ¹³ä\\µÚÈý·½ÍøÕ¾ÈÝ»ýÂÊ(Æ¥Åä)-2.csv") + def map = [:] + for(def i=0;i1){ + row << arrs[1] + } + if(arrs.size()>2){ + row << arrs[2] + } + if(arrs.size()>3){ + row << arrs[3] + } + if(arrs.size()>4){ + row << arrs[4] + } + } + } + lastRets << row + } + batchCreateFile(lastRets, "D:\\Êý¾Ý\\½¨ÐÐ\\¶þÆÚ\\µÚÈý·½Ð¡Çø×ֶβ¹³ä\\µÚÈý·½ÍøÕ¾¿¢¹¤Ê±¼ä(Æ¥Åä).csv",null,"GBK") + } + + def updteGreenRateFieldByCsv(){ + def datas = readTxt("D:\\Êý¾Ý\\½¨ÐÐ\\¶þÆÚ\\µÚÈý·½Ð¡Çø×ֶβ¹³ä\\²âÊÔ.csv") + for(def i=0;i=0.9))){ + def dist = CommonDatautils.findSeaweedById(row[25], ["virescence_percent"]) + if(dist && !dist.virescence_percent){ + def val = row[12] + + if(!val){ + val = row[13] + } + if(!val){ + val = row[14] + } + if(!val){ + val = row[11] + } + + if(!val){ + val = row[21] + } + if(!val){ + val = row[22] + } + + if(!val){ + val = row[6] + } + if(!val){ + val = row[10] + } + + if(!val){ + val = row[9] + } + if(!val){ + val = row[5] + } + + if(!val){ + val = row[16] + } + + if(!val){ + val = row[15] + } + + if(!val){ + val = row[23] + } + if(!val){ + val = row[19] + } + if(!val){ + val = row[17] + } + if(!val){ + val = row[8] + } + + if(!val){ + val = row[18] + } + if(!val){ + val = row[20] + } + + if(!val){ + val = row[3] + } + + if(!val){ + val = row[4] + } + + if(!val){ + val = row[7] + } + + + if(val){ + if(val.toString().toDouble().toInteger()==val.toString().toDouble()){ + val = val.toString().toDouble().toInteger() + } + def udata = new BasicDBObject() + udata.put("virescence_percent", val.toString()) + udata.put("m_date",new Date()) + + def q = new BasicDBObject() + q.put("_id", new ObjectId(dist._id.toString())) + DbUtils.seaweed.update(q, new BasicDBObject('$set', udata)) + println row[25] +" "+val.toString() + } + } + } + } + + } + + def updteBuildAreaFieldByCsv(){ + def datas = readTxt("D:\\Êý¾Ý\\½¨ÐÐ\\¶þÆÚ\\µÚÈý·½Ð¡Çø×ֶβ¹³ä\\µÚÈý·½ÍøÕ¾½¨ÖþÃæ»ý(Æ¥Åä).csv") + for(def i=0;i=0.9))){ + def dist = CommonDatautils.findSeaweedById(row[17], ["build_area"]) + if(dist && !dist.build_area){ + def val = row[8] + + if(!val){ + val = row[7] + } + if(!val){ + val = row[9] + } + if(!val){ + val = row[14] + } + + if(!val){ + val = row[15] + } + if(!val){ + val = row[12] + } + + if(!val){ + val = row[5] + } + if(!val){ + val = row[6] + } + + if(!val){ + val = row[3] + } + if(!val){ + val = row[13] + } + + if(!val){ + val = row[4] + } + + if(!val){ + val = row[10] + } + + if(!val){ + val = row[11] + } + + + if(val){ + if(val.toString().toDouble().toInteger()==val.toString().toDouble()){ + val = val.toString().toDouble().toInteger() + } + def udata = new BasicDBObject() + udata.put("build_area", val.toString()) + udata.put("m_date",new Date()) + + def q = new BasicDBObject() + q.put("_id", new ObjectId(dist._id.toString())) + DbUtils.seaweed.update(q, new BasicDBObject('$set', udata)) + println row[17] +" "+val.toString() + } + } + } + } + } + + def updadteAllAreaFieldByCsv(){ + def datas = readTxt("D:\\Êý¾Ý\\½¨ÐÐ\\¶þÆÚ\\µÚÈý·½Ð¡Çø×ֶβ¹³ä\\µÚÈý·½ÍøÕ¾Õ¼µØÃæ»ý(Æ¥Åä).csv") + for(def i=0;i=0.9))){ + def dist = CommonDatautils.findSeaweedById(row[13], ["all_area"]) + if(dist && !dist.all_area){ + def val = row[3] + + if(!val){ + val = row[4] + } + if(!val){ + val = row[5] + } + + if(!val){ + val = row[8] + } + + if(!val){ + val = row[9] + } + if(!val){ + val = row[10] + } + + if(!val){ + val = row[11] + } + if(!val){ + val = row[6] + } + + if(!val){ + val = row[7] + } + if(val){ + if(val.toString().toDouble().toInteger()==val.toString().toDouble()){ + val = val.toString().toDouble().toInteger() + } + def udata = new BasicDBObject() + udata.put("all_area", val.toString()) + udata.put("m_date",new Date()) + + def q = new BasicDBObject() + q.put("_id", new ObjectId(dist._id.toString())) + DbUtils.seaweed.update(q, new BasicDBObject('$set', udata)) + println row[13] +" "+val.toString() + } + } + } + } + } + + + def updatePlotRateFieldByCsv(){ + def datas = readTxt("D:\\Êý¾Ý\\½¨ÐÐ\\¶þÆÚ\\µÚÈý·½Ð¡Çø×ֶβ¹³ä\\µÚÈý·½ÍøÕ¾ÈÝ»ýÂÊ(Æ¥Åä)-2.csv") + for(def i=0;i=0.9))){ + def dist = CommonDatautils.findSeaweedById(row[23], ["cubage_percent"]) + if(dist && !dist.cubage_percent){ + def val = row[10] + + if(!val){ + val = row[11] + } + if(!val){ + val = row[12] + } + + if(!val){ + val = row[19] + } + if(!val){ + val = row[20] + } + if(!val){ + val = row[21] + } + + if(!val){ + val = row[6] + } + if(!val){ + val = row[8] + } + + if(!val){ + val = row[9] + } + if(!val){ + val = row[13] + } + if(!val){ + val = row[14] + } + + if(!val){ + val = row[17] + } + + if(!val){ + val = row[3] + } + if(!val){ + val = row[4] + } + if(!val){ + val = row[5] + } + + if(!val){ + val = row[15] + } + if(!val){ + val = row[16] + } + + if(!val){ + val = row[18] + } + + if(val){ + if(val.toString().toDouble().toInteger()==val.toString().toDouble()){ + val = val.toString().toDouble().toInteger() + } + def udata = new BasicDBObject() + udata.put("cubage_percent", val.toString()) + udata.put("m_date",new Date()) + + def q = new BasicDBObject() + q.put("_id", new ObjectId(dist._id.toString())) + DbUtils.seaweed.update(q, new BasicDBObject('$set', udata)) + println row[23] +" "+val.toString() + } + } + } + } + } + +// def run1(){ +// def regionPointsMap = findRegionRange("ÖØÇì") +// def flag = isInArea(dist.lng/10000000000.0, dist.lat/10000000000.0, regionPointsMap.get(dist.region)) +// } + + def updateFinishDateFieldByCsv(){ + def datas = readTxt("D:\\Êý¾Ý\\½¨ÐÐ\\¶þÆÚ\\µÚÈý·½Ð¡Çø×ֶβ¹³ä\\¿¢¹¤Ê±¼ä.csv") + for(def i=0;i=0.9))){ + def dist = CommonDatautils.findSeaweedById(row[23], ["finish_building_date"]) + if(dist && !dist.finish_building_date){ + def val = row[10] + + if(!val){ + val = row[11] + } + if(!val){ + val = row[12] + } + + if(!val){ + val = row[19] + } + if(!val){ + val = row[20] + } + if(!val){ + val = row[21] + } + + if(!val){ + val = row[6] + } + if(!val){ + val = row[8] + } + + if(!val){ + val = row[9] + } + if(!val){ + val = row[13] + } + if(!val){ + val = row[14] + } + + if(!val){ + val = row[17] + } + + if(!val){ + val = row[3] + } + if(!val){ + val = row[4] + } + if(!val){ + val = row[5] + } + + if(!val){ + val = row[15] + } + if(!val){ + val = row[16] + } + + if(!val){ + val = row[18] + } + + if(val){ + if(val.toString().toDouble().toInteger()==val.toString().toDouble()){ + val = val.toString().toDouble().toInteger() + } + def udata = new BasicDBObject() + udata.put("finish_building_date", val.toString()) + udata.put("m_date",new Date()) + + def q = new BasicDBObject() + q.put("_id", new ObjectId(dist._id.toString())) + DbUtils.seaweed.update(q, new BasicDBObject('$set', udata)) + println row[23] +" "+val.toString() + } + } + } + } + } + + def runCsv(){ + def datas = readTxt("D:\\Êý¾Ý\\½¨ÐÐ\\¶þÆÚ\\µÚÈý·½Ð¡Çø×ֶβ¹³ä\\ÈÝ»ýÂÊδƥÅä.csv")//µÚÈý·½ÍøÕ¾ÂÌ»¯ÂÊ (3).csv + def results = batchMatch(datas) + batchCreateFile(results, "D:\\Êý¾Ý\\½¨ÐÐ\\¶þÆÚ\\µÚÈý·½Ð¡Çø×ֶβ¹³ä\\ÈÝ»ýÂÊδƥÅä-2.csv",null,"GBK") + } + + + def batchMatch(datas){ + def results = new CopyOnWriteArrayList() + def totalCount = new AtomicLong() + final CountDownLatch latch = new CountDownLatch(datas.size()) + for(def i=0;i - if(row['A'] && !row['J']){ - def city = row['B'] - def region = row['C'] - def name = row['D'] - def address = row['E'] -// def flag = "±ðÃûÆ¥Åä" + index++ + if(row['A'] && row['B']){ + def city = row['A'] + def name = row['B'] + def region = null +// def region = row['B'] + if(name && name.contains("¡¤")){ + name = name.replace("¡¤", "") + } -// def dist = matchDist(city, null, name) -// if(!row['J'] && name.contains("(")){ -// name = name.replace("(${region})","").replace("(","").replace(")","") -// flag = "È¥À¨ºÅÆ¥Åä" -// dist = matchDist(city, region, name) -// } -// if(!dist){ -// dist = CommonDatautils.findSeaweedByMappingAlias(city, region, name,"district") -// flag = "Ó³Éä±ðÃûÆ¥Åä" -// } -// if(!dist) { -// def rets = CommonDatautils.findDistrictByAlias(city, region, name, "district") -// if(rets && rets.size()==1){ -// dist = rets[0] -// } -// } + def flag = "Ãû³ÆÆ¥Åä" + def dist = matchDist(city, region, name) + + if(!dist){ + dist = CommonDatautils.findSeaweedByMappingAlias(city, region, name,"district") + flag = "Ó³Éä±ðÃûÆ¥Åä" + } + if(!dist) { + def rets = CommonDatautils.findDistrictByAlias(city, region, name, "district") + if(rets && rets.size()==1){ + dist = rets[0] + } + } // // if(!dist){ @@ -61,22 +774,59 @@ class AnjukeDistrictMatch { // } // } -// if(dist){ -// row['J'] = flag -// row['K'] = dist._id.toString() -// row['L'] = dist.region -// row['M'] = dist.name -// row['N'] = dist.address -// } + if(dist){ + row['F'] = flag + row['G'] = dist._id.toString() + row['D'] = dist.region + row['C'] = dist.name + }else{ + def jsonObject = OpenApiClient.addressMatch(city, name, "property", false,region, null) + if(jsonObject != null && jsonObject.precise!=-1) { + row['Y'] = "Æ¥Åä½Ó¿Ú" + row['Z'] = jsonObject.get("id") + row['AA'] = jsonObject.get("district") + row['AB'] = jsonObject.get("name") + row['AC'] = jsonObject.get("credit") + } + } +// println index +" "+row['Y'] + if(row['G']){ + def dbo = CommonDatautils.findDistrictById(row['G']) + if(dbo){ + row['H'] = dbo.estate_type2 + row['I'] = dbo.name_cat + + def count = findBigdataCommunity(row['G']) + if(count){ + row['E'] = "ÊÇ" + } + } + } + } + }) + } + + def matchCommunity(){ + def filePath = "D:\\Êý¾Ý\\Ð¡Çø\\ѺƷ·¢ÏÖÐÂÔöÐ¡ÇøÈ·ÈÏ£¨½á¹û£©0406-1.xlsx" + ExcelUtils.modify(filePath, { row -> + if (row['A'] && row['B'] && !row['O']) { + def rets = findAllEsData(row['A'], row['B']) + if(rets){ + def dbo = rets[0] + row['J'] = dbo.city + row['K'] = dbo.region + row['L'] = dbo.name + row['M'] = dbo.alias + row['N'] = dbo.source + row['O'] = dbo.score + if(dbo.address){ + row['P'] = AddressUtil.formatAddress(dbo.city, dbo.address) + } + if(dbo.location){ + row['Q'] = dbo.location.lon + row['R'] = dbo.location.lat + } - def jsonObject = OpenApiClient.addressMatch(city, address, "property", false,region,name) - if(jsonObject != null && jsonObject.precise!=-1) { -// row['J'] = "Æ¥Åä½Ó¿Ú" -// row['K'] = jsonObject.get("id") -// row['L'] = jsonObject.get("district") -// row['M'] = jsonObject.get("name") -// row['N'] = jsonObject.get("address") - row['M'] = jsonObject.get("name") } } }) @@ -86,4 +836,152 @@ class AnjukeDistrictMatch { def dist = CommonDatautils.findDistrict(city, region, name, "district") return dist; } + + + def findBigdataCommunity(comm_id){ + def sql = "select count(1) as count from base.t0831_bigdata_community_gj_h where gujia_comm_id='${comm_id}' ";//where cityId in (350200,150100) + def count = 0 + pgsqlInstance.eachRow(sql,{r-> + count = r.count + }); + return count + } + + def findAllEsData(city,name){ + def rets = [] + def sql = "select * from community where city='${city}' and name='${name}'" + rets = findDatas(sql) + if(!rets){ + rets = findAliasDatas(city,name) + } + return rets; + } + + def findDatas(sql){ + def rets = [] + ElasticUtils.executeSqlQuery(sql, { d-> + rets << ["city":d.city, "region":d.region, "name":d.name, "source":d.source, "alias":d.alias, "address":d.address, "location":d.location] + }) + return rets; + } + + def repeatDistByAlias(){ + def rets = findAliasDist() +// def datas = [] +// for(def r : rets){ +// datas << [r.city, r.region, r.name, r.alias] +// } +// ExcelUtils.write("D:\\Êý¾Ý\\Ð¡Çø\\µÚÈý·½ÓбðÃûµÄÐ¡Çø.xlsx", datas, "test") + def districts = CommonDatautils.findAllDistrictByCity("³£ÖÝ", "district", ["city","region","name"]) + def distKeys = [] + for(def d : districts){ + distKeys << d.region+"#"+d.name + } + + def results = [] + for(def t : rets){ + def names = [] + names << t.region + "#" +t.name + def arrs = t.alias.split(",|£¬") + for(def a : arrs){ + names << t.region + "#" + a + if(a.contains("(")){ + names << t.region + "#" + a.replace("(","").replace(")", "") + } + } + + def set = new HashSet() + for(def n : names){ + if(distKeys.contains(n)){ + set << n + } + } + + if(set.size()>1){ + results << [t.city, t.region, t.name, set.join(" "),t.url] + } + } + ExcelUtils.write("D:\\Êý¾Ý\\Ð¡Çø\\µÚÈý·½±ðÃûÑéÖ¤ÖØ¸´Ð¡Çø.xlsx", results, "test") + } + + def findAliasDist(){ + def rets = [] + def sql = "select * from community where city='³£ÖÝ'" + ElasticUtils.executeSqlQuery(sql, { d-> + if(d.alias){ + rets << ["city":d.city, "region":d.region, "name":d.name, "source":d.source, "alias":d.alias, "url":d.url] + } + + }) + return rets; + } + + def findAliasDatas(city, name){ + def must = [] + def term1 = ["match":["city":city]] + must << term1 + + def should = [] + should << ["match":["alias":name]] + def params = ["query":["bool":["must":must, "should":should]]] + def s = EsUtils.httpSaveData(params, "http://192.168.0.206:9200/community/_doc/_search"); + def rets = []; + if(s) { + def doc = new groovy.json.JsonSlurper().parseText(s) + def hits = doc.hits + if(hits){ + hits = hits.hits + for(def h : hits){ + def d = h._source + rets << ["city":d.city, "region":d.region, "name":d.name, "source":d.source, "alias":d.alias, "score":h._score, "address":d.address, "location":d.location] + } + } + } + return rets; + } + + def readTxt(def fileName){ + File file = new File(fileName); + def rows = []; + + file.eachLine{ + def row = it.split(",",-1) + rows << row + } + return rows; + } + + def batchCreateFile(ret, fileName, headers, charset){ + OutputStream out = new FileOutputStream(fileName); + def sb = new StringBuffer(); +// sb.append(headers.join("@|@")) +// sb.append(System.getProperty("line.separator")); + + out.write(sb.toString().getBytes(charset)); + sb.setLength(0) + + def index = 0 + for(def row : ret){ + index++ + sb.append(StringUtils.join(row, ",")) + sb.append(System.getProperty("line.separator")); + + println index + + if(index%10000==0){ + println index+"¿ªÊ¼Ð´ÈëCSV "+new Date().toLocaleString() + out.write(sb.toString().getBytes(charset)); + sb.setLength(0) + println index+"½áÊøÐ´ÈëCSV "+new Date().toLocaleString() + } + + } + + if(sb.length()>0){ + out.write(sb.toString().getBytes(charset)); + sb.setLength(0) + } + out.close(); + } + } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/crawl/OfficeProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/crawl/OfficeProcess.groovy new file mode 100644 index 000000000..55ce0ed8f --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/crawl/OfficeProcess.groovy @@ -0,0 +1,530 @@ +package com.fangjia.script.gj.crawl + +import com.fangjia.core.RegionData +import com.fangjia.core.util.DataUtil +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.gj.ccb.FileUtils +import com.fangjia.script.looplineinfo.InsidePolygon +import com.fangjia.script.looplineinfo.Point +import com.fangjia.script.util.CosineSimilarAlgorithm +import com.fangjia.script.util.ExcelUtils +import com.fangjia.script.util.MongoUtils +import com.fangjia.script.util.OpenApiClient +import com.mongodb.BasicDBObject +import com.mongodb.Bytes +import com.mongodb.DBCollection +import groovy.sql.Sql + +import java.sql.Connection +import java.sql.DriverManager +import java.sql.PreparedStatement +import java.sql.Statement +import java.util.regex.Pattern + +class OfficeProcess { + + static DBCollection POLYLINECOLL = MongoUtils.getCollectionByAuth20190102("fangjia_crawl", "region_polyline") + def sqlInstance = Sql.newInstance("jdbc:clickhouse://192.168.0.216:8123/etl?max_memory_usage=50000000", + "goojia", "goojia123456", "ru.yandex.clickhouse.ClickHouseDriver") + + static main(args) { + def filePath = "/home/goojia/gj/6³ÇδƥÅäÉϵÄд×ÖÂ¥.xlsx" + + if(CommonDatautils.isWindow()){ + filePath = "D:\\Êý¾Ý\\д×ÖÂ¥\\6³ÇδƥÅäÉϵÄд×ÖÂ¥.xlsx" + } + def task = new OfficeProcess(); + +// task.run("D:\\Êý¾Ý\\д×ÖÂ¥\\6³ÇºÏ²¢Ð´×ÖÂ¥.xlsx") +// task.addPropertyType2("ÉîÛÚ") + +// task.standardName(filePath) +// task.nameRepeatFiter(filePath) +// task.addressFiter(filePath) +// task.nameFiter(filePath) +// task.typeFiter(filePath) +// task.nameFlag(filePath) +// task.updateFlagToDB(filePath) +// task.updateFlagToDB2(filePath) + + task.checkRegion() + + } + + def nameRepeatFiter(filePath){ + def keys = [] + ExcelUtils.modify(filePath, { row -> + if (!row['L'] && row['B']) { + def city = row['B'] + def region = row['C'] + def name = "" + if(row['K']){ + name = row['K'] + }else{ + name = row['D'] + } + def key = city+"##"+region+"##"+name + if(keys.contains(key)){ + row['L'] = "Ãû³ÆÈ¥ÖØ" + println key + }else{ + keys << key + } + } + }) + } + + def nameFiter(filePath){ + ExcelUtils.modify(filePath, { row -> + def name = row['K'] + + if(!row['L'] && !name){ + row['L'] = "Ãû³Æ¹ýÂË" + } + if(!row['L'] && name){ + if(name.contains("¹«Ë¾")){ + row['L'] = "Ãû³Æ¹ýÂË" + } + } + + if(!row['L'] && name){ + if(isStandardRoad(name)){ + row['L'] = "Ãû³Æ¹ýÂË" + } + } + + + + if(!row['L'] && name){ + def fiters = ["³§·¿","²âÊÔ", "·þÎñ","×ۺϷþÎñ","¾Æµê","ÉîÛÚÌØ×¨","¹¤Òµ","¾­¼Ã","²úÒµ","¾Óί»á","ËÞÉá","¹ºÎï","ÐÝÏÐ","ÎÄ»¯","ѵÁ·","³ö×â","Õã²Ë","Öµ°à¸Ú","ÕÐ×â","ÉÌס","°ì¹«ÊÒ","ÅäÌ×","ÃÀʳ","²©Îï¹Ý","ÎïÁ÷","ÉÌÆÌ","¹«Éç","É̳Ç","Öµ°àÊÒ","ÔÝÍ£","´´ÒµÉçÇø","ÕÐÉÌ","±ö¹Ý","Æ÷²Ä","½ÌÓý","ÃÅÕï","¸¾²ú¿Æ","ÉÌó³Ç","µç×Ó³Ç","³¬ÊÐ","ÁãÊÛ"] + for(def key : fiters){ + if(name.contains(key)){ + row['L'] = "Ãû³Æ¹ýÂË" + break; + } + } + } + + if(!row['L'] && name){ + def fiters = ["´óÏÃ","ȹ¥",'»¨Ô°','´óÂ¥','´óÌÃ','ÄÏËþ','±±¾©','´óµÀ','Ö÷Â¥','Öйú','ÖÐÐÄ','¹ã³¡','Äñ³²','Ð¡Çø','µ¥Î»','°ì¹«','±±Ëþ' + ,'д×ÖÂ¥','¼ìÑéÂ¥','°ì¹«Â¥','½Ó´ýÇø','ÉÌÎñÂ¥','ÎÄÌåÂ¥','ÊÐÖÐÐÄ','²úÒµÔ°','¿Æ¼¼Â¥','ÐÐÕþÂ¥','²¡·¿43¡¢44¡¢45','ÂɼºÂ¥','µ÷¶ÈÂ¥','»ÔÌÚÂ¥','×ÜÎñÂ¥' + ,'7´±»õÌÝ','ÏÖ³§B¶°','(ÂíÁ¬µÀÄϽÖ)','ÖÐÑëµçÊǪ́','ºó×ù','Î÷´óÂ¥','B&C','ÉÌÒµÓÃÂ¥','²ÆÎñÖÐÐÄ','µØÌú','һƿ','Íâó¥','ÒµÎñÂ¥','Ñз¢´óÂ¥','½áËãÖÐÐÄ','Âí³¡','ÉÌÎñ'] + for(def key : fiters){ + if(name == key){ + row['L'] = "Ãû³Æ¹ýÂË" + break; + } + } + } + + + if(!row['L'] && row['J'] && name){ + if(row['J'].toString().contains("ÉÌÎñд×ÖÂ¥") && name.contains("¹«Ô¢")){ + row['L'] = "Ãû³Æ¹ýÂË" + } + } + + if(!row['L'] && name){ + if(findPattern(name,'^[A-Za-z0-9]+$') && name.toString().length()<=3){ + row['L'] = "Ãû³Æ¹ýÂË" + }else if(name.toString().length()<2){ + row['L'] = "Ãû³Æ¹ýÂË" + } + } + + if(!row['L'] && name){ + def filters = ['³ï±¸×é','Ð¡Çø','¼ÒÊô·¿','¼ÒÊôÔº','¼ÒÊôÂ¥','×Ô±à','Êг¡','ÏîÄ¿','Åú·¢³Ç','´«´ïÊÒ','ÌÝ','ÐͲÄ','ѧԺ','¹¤µØ','Àä¶³³§','»ú¹ØÂ¥','ÔĶÁÊÒ','ÒéÊÂÌü','µçÄÔ³Ç','ͯװ³Ç','ÅɳöËù','±£°²ÊÒ','É¢ÅÌ','µê','¹¤×÷Õ¾',"Îïҵ¥",'ÎïÒµ','æäÕ¾','¹øÂ¯·¿','´¦ÀíÖÐÐÄ',"ÏúÊÛÖÐÐÄ",'Õþ¸®','¹Ý','¾èÔùµã','°Ù»õ','¹¤³§','¹¤³¡','¼ì²â³¡','Ö°¹¤Ö®¼Ò','ÒÆ¶¯','ÖÐÐÄÕ¾','Â¥ÃÅ','Ö°³¡','ÏÊ»¨»ùµØ','Ò½Ôº','×°ÊγÇ','ʵѵ¥','ÒµÎñÂ¥','¿ÆÑÐÂ¥','ѧУ','½»Ò׳Ç','¹ÜÀíÂ¥','¿¼³¡','ͨµÀ','ÍŹº','Â¥ÉÏ','ÔËÓªÖÐÐÄ','ÉÌÒµ³Ç'] + for(def key : filters){ + if(name.toString().endsWith(key)){ + row['L'] = "Ãû³Æ¹ýÂË" + break; + } + } + } + }) + } + + def typeFiter(filePath){ + ExcelUtils.modify(filePath, { row -> + if(!row['L'] && row['J']){ + def fiters = ["ÉÌס","·þÎñ","×¡Õ¬Ð¡Çø","¾Æµê","ÉÌÒµ×ÛºÏÌå","סլµ×ÉÌ"] + for(def key : fiters){ + if(row['J'].toString().contains(key)){ + row['L'] = "ÀàÐ͹ýÂË" + break; + } + } + } + if(!row['L'] && row['B'] && !row['J']){ + row['L'] = "ÀàÐͿհ׹ýÂË" + } + }) + } + + def nameFlag(filePath){ + ExcelUtils.modify(filePath, { row -> + if(!row['L'] && row['D']) { + def fiters = ["´óÏÃ","´óÂ¥","ÉÌÎñÂ¥","ÉÌÎñÖÐÐÄ","¹ã³¡","д×ÖÂ¥","°ì¹«Â¥","¿Æ¼¼Ô°","¹ú¼Ê´óÏÃ","ÉÌÎñ´óÏÃ","ÉÌÎñ¹ã³¡","´´Ô°","´´Òâ","ÖÐÐÄ","ÓªÏúÖÐÐÄ"] + for(def key : fiters){ + if(row['D'].toString().contains(key)){ + if(row['D']=="¹ã³¡"){ + + } + row['L'] = "Ãû³Æ¹Ø¼ü×Ö[Ìí¼Ó]" + break; + } + } + } + + if(!row['L'] && row['J']){ + if(row['J'].toString().contains("Ô°Çø") || row['J'].toString().trim()=="´¿Ð´×ÖÂ¥" || row['J'].toString().trim()=="±ê׼д×ÖÂ¥"){ + row['L'] = "ÀàÐÍ[Ìí¼Ó]" + } + + if(!row['L'] && row['J'].toString().trim()=="´¿Ð´×ÖÂ¥ ±ê׼д×ÖÂ¥" || row['J'].toString().trim()=="ÉÌÎñÖÐÐÄ" || row['J'].toString().trim()=="ÉÌÎñÖÐÐÄ ±ê׼д×ÖÂ¥"){ + row['L'] = "ÀàÐÍ[Ìí¼Ó]" + } + } + + if(!row['L'] && row['J'] && row['D']){ + if(row['J'].toString().contains("ÉÌÎñд×ÖÂ¥") && !row['D'].toString().contains("¹«Ô¢")){ + row['L'] = "ÀàÐÍ[Ìí¼Ó]" + } + } + + if(!row['L'] && row['J'] && row['D']){ + if(row['J'].toString().contains("´¿Ð´×ÖÂ¥")){ + row['L'] = "ÀàÐÍ[Ìí¼Ó]" + } + } + + }) + + } + + def addressFiter(filePath){ + def keyMap = [:] + ExcelUtils.modify(filePath, { row -> + if(!row['L'] && row['F']){ + def city = row['B'] + def region = row['C'] + def name = "" + if(row['K']){ + name = row['K'] + }else{ + name = row['D'] + } + def address = row['F'] + def key = city+"##"+region+"##"+address + def keys = keyMap.keySet() + if(keys.contains(key)){ + def values = keyMap.get(key) + if(values){ + for(def n : values){ + def score = CosineSimilarAlgorithm.getSimilarityRatio(name, n) + if(score>=0.8){ + row['L'] = "µØÖ·È¥ÖØ" + break; + } + println address +" "+ name+" "+n +" "+score + } + } + + }else{ + def values = keyMap.get(key) + if(!values){ + values = [] + keyMap.put(key, values) + } + values << name + } + } + + }); + } + + def standardName(filePath){ + def index = 0 + ExcelUtils.modify(filePath, { row -> + index++ + if(!row['K'] && row['D']){ + def name = row['D'] + def newName = name.replaceAll("-|¡¤|(|)|//|\\?|¡°|¡±","").replaceAll("\\w+´±\\w+×ù","").replaceAll(" ","").replaceAll("\\.","").replaceAll("Ø­","") + newName = newName.replaceAll("-?\\w+ºÅÉÌҵ¥","").replaceAll("\\?","") + newName = newName.replaceAll("\\w+Â¥\\w+ÊÒ","") + newName = newName.replaceAll("\\w+ºÅ\\w+(×ù|´±)","") + newName = newName.replaceAll("(Ò»|¶þ|Èý|ËÄ|Îå|Áù|Æß|°Ë|¾Å|Ê®)ºÅÂ¥(Ò»|¶þ|Èý|ËÄ|Îå|Áù|Æß|°Ë|¾Å|Ê®)µ¥Ôª","") + newName = newName.replaceAll("(Ò»|¶þ|Èý|ËÄ|Îå|Áù|Æß|°Ë|¾Å|Ê®|ʮһ)?´±?(Ò»|¶þ|Èý|ËÄ|Îå|Áù|Æß|°Ë|¾Å|Ê®|¶«|ÄÏ|Î÷|±±)(ËþÂ¥|Â¥)","") + newName = newName.replaceAll("-?(µÚ)?\\w+(ºÅд×ÖÂ¥|ºÅÂ¥|ºÅ´óÂ¥|Â¥|×ù|¶°|ÄÏÂ¥|±±Â¥|¶«Â¥|Î÷Â¥|Çø|µ¥Ôª)","") + newName = newName.replaceAll("(Ò»|¶þ|Èý|ËÄ|Îå|Áù|Æß|°Ë|¾Å|Ê®|Ò¼|·¡|Èþ|ËÁ|Îé|½|Æâ|°Æ|¾Á|ʰ)¶°","") + newName = newName.replaceAll('(¶«|ÄÏ|Î÷|±±)×ù$',"") + newName = newName.replaceAll("1ÆÚ","Ò»ÆÚ").replaceAll("2ÆÚ","¶þÆÚ").replaceAll("3ÆÚ","ÈýÆÚ").replaceAll("4ÆÚ","ËÄÆÚ").replaceAll("5ÆÚ","ÎåÆÚ").replaceAll("6ÆÚ","ÁùÆÚ").replaceAll("7ÆÚ","ÆßÆÚ").replaceAll("8ÆÚ","°ËÆÚ").replaceAll("9ÆÚ","¾ÅÆÚ").replaceAll("10ÆÚ","Ê®ÆÚ").replaceAll("1-5ÆÚ","Ò»-ÎåÆÚ").replaceAll("5-6ÆÚ","Áù-ÆßÆÚ") + newName = newName.toUpperCase().replaceAll("(×°ÐÞÖÐ)","").replaceAll("\\(\\)","") + + if(newName){ + def md = DataUtil.match(newName, Pattern.compile("^[0-9|a-z|A-Z|Ò»|¶þ|Èý|ËÄ|Îå|Áù|Æß|°Ë|¾Å|Ê®|Áã|Ò¼|·¡|Èþ|ËÁ|Îé|½|Æâ|°Æ|¾Á|ʰ|¶«|ÄÏ|Î÷|±±|ÖÐ]{0,1}[д×Ö|°ì¹«|Â¥|×ù|Çø|¶°|×é|´±|0-9|¶«|ÄÏ|Î÷|±±|ÖÐ|ºÅ]?[0-9|a-z|A-Z|Ò»|¶þ|Èý|ËÄ|Îå|Áù|Æß|°Ë|¾Å|Ê®|Áã|Ò¼|·¡|Èþ|ËÁ|Îé|½|Æâ|°Æ|¾Á|ʰ|¶«|ÄÏ|Î÷|±±|ÖÐ|°ì¹«|д×Ö]?[Â¥|×ù|Çø|¶°|×é|´±|0-9|¶«|ÄÏ|Î÷|±±|ÖÐ]\$")) + if(md){ + newName = '' + } + } + row['K'] = newName + } + }) + } + + def addPropertyType2(runCity){ + def map = [:] + def datas = ExcelUtils.read("D:\\Êý¾Ý\\д×ÖÂ¥\\6³ÇδƥÅäд×ÖÂ¥.xlsx",0,1) + if(datas){ + for(def d : datas){ + def key = d['B']+"##"+d['C']+"##"+d['D'] + def list = map.get(key) + if(!list){ + list = [] + map.put(key, list) + } + if(d['M'] && !list.contains(d['M'])){ + list << d['M'] + } + if(d['U'] && !list.contains(d['U'])){ + list << d['U'] + } + + } + } + + def index = 0 + ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\д×ÖÂ¥\\6³ÇδƥÅäÉϵÄд×ÖÂ¥.xlsx", { row -> + index++ + def city = row['B'] + def region = row['C'] + def name = row['D'] + def types = map.get(city+"##"+region+"##"+name) + if(types){ + row['J'] = types.join(" ") + } + }) + } + + def addPropertyType(){ + def index = 0 + ExcelUtils.modify("D:\\Êý¾Ý\\д×ÖÂ¥\\δƥÅäд×ÖÂ¥.xlsx", { row -> + index++ + def city = row['B'] + def region = row['C'] + def name = row['D'] + def types = findDatasByDB(city, region, name) + if(types){ + row['J'] = types.join(" ") + } + println index + }) + } + + def findDatasByDB(city, region, name){ + def sql = "select * from office where city='${city}' and region='${region}' and name='${name}'" + def types = [] + sqlInstance.eachRow(sql, {r-> + if(r.property_type && !types.contains(r.property_type)){ + types << r.property_type + } + }) + return types + } + + def run(filepath){ + def index = 0 + ExcelUtils.multiThreadingModify(filepath,{row-> + index++ + def city = row['B'] + def region = row['C'] + def name = row['D'] + def address = row['I'] + if(city ){ + def jsonObject = OpenApiClient.addressMatch(city, name, "office", false, region, null) +// if(jsonObject && jsonObject.precise == -1){ +// jsonObject = OpenApiClient.addressMatch(city, address, "office", false, region, name) +// } + if (jsonObject != null && jsonObject.precise != -1) { + row['J'] = jsonObject.get("id") + row['K'] = jsonObject.get("city") + row['L'] = jsonObject.get("district") + row['M'] = jsonObject.get("name") + row['N'] = jsonObject.get("credit") + row['O'] = jsonObject.get("propertyType") + } + } + println index + }) + } + + def isStandardRoad(def s){ + def pattern = Pattern.compile("[·|½Ö|´óµÀ|Ïï]\\d+(ºÅ|Ū)?"); + def matcher = pattern.matcher(s) + if(matcher.find()){ + return true; + } + if(s.toString().endsWith("·")||s.toString().endsWith("½Ö")){ + return true; + } + return false + } + + + def findPattern(def address, def regex) { + Pattern pattern = Pattern.compile(regex); + def matcher = pattern.matcher(address) + if (matcher.find()) { + return true + } + return false; + } + + def updateFlagToDB(filePath){ + def datas = ExcelUtils.read(filePath,0,1) + def total = datas.size() + println total + def index = 0 + def rets = [] + for(def d : datas){ + def sql = "alter table office update option='${d['L']}', format_name='${d['K']}' where city='${d['B']}' and region='${d['C']}' and name='${d['D']}';" + index++ + rets << sql + //sqlInstance.executeUpdate(sql) + //println index+"/"+ total + println sql + } + + + def filePath1 = "d:\\Data1.txt" + File file = new File(filePath1) + def s = new StringBuffer() + for(def r : rets){ + s.append(r+"\n") + } + file.write(s.toString()) + } + + + def updateOption(city, region, name, source, flag){ + def sql = "alter table office update region_fence='${flag}' where city='${city}' and region='${region}' and name='${name}' and source='${source}';" + sqlInstance.executeUpdate(sql) + } + + def batchUpdate(rets){ + // ³õʼ»¯Çý¶¯ + Class.forName("ru.yandex.clickhouse.ClickHouseDriver"); + // url + String url = "jdbc:clickhouse://192.168.0.216:8123/etl"; + // Óû§ÃûÃÜÂë + String user = "goojia"; + String password = "goojia123456"; + // µÇ¼ + Connection connection = DriverManager.getConnection(url, user, password); + Statement stmt = connection.createStatement(); + def count = 0 + def sql = "alter table office update region_fence=? where city=? and region=? and name=? and source=?;" + PreparedStatement pstmt = connection.prepareStatement(sql) + + for(def d : rets){ + count++ + pstmt.setString(1, d.flag) + pstmt.setString(2, d.city) + pstmt.setString(3, d.region) + pstmt.setString(4, d.name) + pstmt.setString(5, d.source) + println count+" "+d.city+" "+d.name + pstmt.addBatch() + if(count % 1 ==0) { + try { + pstmt.executeBatch() + } catch (Exception e) { + e.printStackTrace() + } + } + } + pstmt.executeBatch() + } + def updateFlagToDB2(filePath){ + // ³õʼ»¯Çý¶¯ + Class.forName("ru.yandex.clickhouse.ClickHouseDriver"); + // url + String url = "jdbc:clickhouse://192.168.0.216:8123/etl"; + // Óû§ÃûÃÜÂë + String user = "goojia"; + String password = "goojia123456"; + // µÇ¼ + Connection connection = DriverManager.getConnection(url, user, password); + Statement stmt = connection.createStatement(); + def count = 0 + def datas = ExcelUtils.read(filePath,0,1) + def sql = "alter table office update option=?, format_name=? where city=? and region=? and name=?;" + PreparedStatement pstmt = connection.prepareStatement(sql) + + for(def d : datas){ + if(d['B']){ + count++ + pstmt.setString(1, d['L']) + pstmt.setString(2, d['K']) + pstmt.setString(3, d['B']) + pstmt.setString(4, d['C']) + pstmt.setString(5, d['D']) + println count+" "+d['L']+" "+d['K']+" "+d['B']+" "+d['C']+" "+d['D'] + pstmt.addBatch() + if(count % 100 ==0) { + pstmt.executeBatch() + } + } + } + pstmt.executeBatch() + } + + def checkRegion(){ + def citys = ["º¼ÖÝ","ËÕÖÝ"]//"ÉϺ£","ÉîÛÚ","±±¾©","¹ãÖÝ","ÖØÇì","³É¶¼", + for(def city : citys){ + def regionPointsMap = findRegionRange(city) + def addDatas = findAddDatasByClickhouse(city) + println "Ðè´¦ÀíµÄÇøÓòΧÀ¸£º"+addDatas.size() + def index = 0 + def rets = [] + for(def data : addDatas){ + index ++ + if(data.lng){ + def flag = isInArea(data.lng.toString().toDouble(), data.lat.toString().toDouble(), regionPointsMap.get(data.region)) + def mark = flag?'T':'F' +// rets << ["city":data.city, "region":data.region, "name":data.name, "source":data.source, "flag":mark] + updateOption(data.city, data.region, data.name, data.source, mark) + println index+" "+data.region + " "+data.name+" "+ flag + } + } +// batchUpdate(rets) + } + } + + def findAddDatasByClickhouse(city){ + def sql = "select city,region, name,option,lng,lat,source from office where city='${city}' and option like '%Ìí¼Ó%'" + def datas = [] + sqlInstance.eachRow(sql, {r-> + datas << ["city":r.city,"region":r.region,"name":r.name, "lat":r.lat, "lng":r.lng, "option":r.option,"source":r.source] + }) + return datas + } + + def findRegionRange(city){ + def q = new BasicDBObject() + q.put("city",city) + def dbcursor = POLYLINECOLL.find(q) + def regionMap = [:] + for(def d : dbcursor){ + def region = RegionData.formatRegion(city,d.region) + regionMap.put(region, d.polyline) + } + return regionMap + } + + def isInArea(lng, lat, points){ + List pointList = InsidePolygon.createPoint2(points); + def flag = InsidePolygon.isPtInPoly(lng, lat, pointList) + return flag; + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data/FieldStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data/FieldStat.groovy index 6b07a6159..62666390b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data/FieldStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/data/FieldStat.groovy @@ -16,7 +16,140 @@ class FieldStat { // task.run() // task.run1() // task.run2() - task.run3() +// task.run3() +// task.offircRun() + task.distRun() + task.shopRun() + } + + def distRun(){ + def citys = CommonDatautils.findAllCity() + def cityMap = [:] + def fileds = ["region","name","alias","address","addr_alias","estate_type2","build_type","block","loop_line_info","street_community","household_count","curr_household_count","virescence_percent","cubage_percent","all_area","build_area","estate_charge","car_site","car_site_count","developer","estate_company","finish_building_date","live_date","start_building_date","open_date","property_life","floor_info","fitment","fitment_materials","build_structure","traffic","facilities","characteristic","sell_address","relate_info","description","total_price","mobile","building_status","licence","build_designer","garden_designer","business_quarter","bay_area","payment_pattern","land_plan_license","prj_plan_license","land_use_license","cons_license","elevators_count","build_date","divisible","status","metro_info","metro_names","cons_company","sells_company","contact_people","parking_fee","delivery_level","fitment_level","land_car_site","underground_car_site","avg_price","sell_price","standard_area","pics","loudong_count","committee","house_structure","usage_card","mainTypeArea"] + for(def c : citys){ + def dbo = findCoverPrecent(c) + if(dbo && dbo.containsField("district_detail")){ + def officeDetail = dbo.district_detail + cityMap.put(c, officeDetail) + }else{ + cityMap.put(c, [:]) + } + } + + def rets = [] + rets << ["³ÇÊÐ","ÊýÁ¿","ÇøÓò","Ãû³Æ","±ðÃû","µØÖ·","µØÖ·±ðÃû","ÎïÒµÀàÐÍ","½¨ÖþÀàÐÍ","°å¿é","»·ÏßλÖÃ","½ÖµÀÉçÇø","»§Êý","µ±Ç°»§Êý","ÂÌ»¯ÂÊ","ÈÝ»ýÂÊ","Õ¼µØÃæ»ý","½¨ÖþÃæ»ý","ÎïÒµ·Ñ","Í£³µÎ»","Í£³µÎ»Êý","¿ª·¢ÉÌ","ÎïÒµ¹«Ë¾","¿¢¹¤Ê±¼ä","Èëסʱ¼ä","¿ª¹¤Ê±¼ä","¿ªÅÌʱ¼ä","²úȨÄêÏÞ","Â¥²ãÇé¿ö","×°ÐÞÇé¿ö","×°ÐÞ²ÄÁÏ","½¨Öþ½á¹¹","½»Í¨Çé¿ö","ÖܱßÅä","Ð¡ÇøÌØÕ÷","ÊÛÂ¥µØÖ·","Ïà¹ØÐÅÏ¢","ÃèÊö","×ܼÛ","µç»°","½¨Öþ״̬","Ô¤ÊÛÐí¿ÉÖ¤","½¨Öþµ¥Î»","Ô°ÒÕÉè¼Æµ¥Î»","ÉÌȦ","»§ÐÍÃæ»ý","Ö§¸¶·½Ê½","Óõع滮Ðí¿ÉÖ¤","¹¤³Ì¹æ»®Ðí¿ÉÖ¤","ÍÁµØÊ¹ÓÃÖ¤","Ê©¹¤Ðí¿ÉÖ¤","µçÌÝÊýÁ¿","½¨ÔìÄê´ú","ÊÇ·ñ¿É·Ö¸î","״̬","µØÌúÑØÏß","µØÌúÕ¾Ãû","Ê©¹¤µ¥Î»","ÏúÊÛÆóÒµ","ÁªÏµÈË","Í£³µ·Ñ","½»¸¶±ê×¼","×°ÐÞ±ê×¼","µØÉϳµÎ»Êý","µØÏ³µÎ»Êý","¾ù¼Û","³öÊÛ¼Û¸ñ","±ê×¼²ãÃæ»ý","ͼƬ","Â¥¶°×ÜÊý","¾Óί»á","·¿Îݽṹ","ÍÁµØÊ¹ÓÃȨ֤ºÅ","Ö÷Á¦»§ÐÍ"] + def ret = [] + ret << "city" + ret << "count" + for(def f : fileds){ + ret << f + } + rets << ret + cityMap.each {k,v-> + def row = [] + row << k + row << CommonDatautils.findAllDistrictCount("district", k) + for(def filed : fileds){ + if(v){ + def val = v.get(underlineToCamel(filed)) + if(val){ + row << val.toDouble()*100 + }else{ + row << "" + } + } + } + rets << row + } + + ExcelUtils.write("d:\\Êý¾Ý\\д×ÖÂ¥\\д×ÖÂ¥¸²¸ÇÂÊ.xlsx", rets, "Ð¡Çø") + } + + def shopRun(){ + def citys = CommonDatautils.findAllCity() + def cityMap = [:] + def fileds = ["region","name","alias","address","business_quarter","property_status","rent_type","lease_term","payment_pattern","sell_price","household_count","mobile","floor","floor_info","bay_area","finish_building_date","live_date","divisible","unified_manage","car_site_count","car_site","all_area","build_area","estate_charge","developer","estate_company","metro_info","metro_names","facilities","property_info","traffic","surrounding","business_status","url","description","open_date","sell_address","block","height","loop_line_info","cubage_percent","virescence_percent","characteristic","sells_company","licence","build_designer","cons_company","property_life","insidepos","delivery_level","start_building_date","land_plan_license","prj_plan_license","land_use_license","cons_license","fitment","build_structure","enter_company","build_type","elevators_count","estate_type2","status","standard_area","relate_info","garden_designer","fitment_level","build_date","fitment_materials","rent_price","out_pics","pics","land_car_site","underground_car_site","addr_alias"] + for(def c : citys){ + def dbo = findCoverPrecent(c) + if(dbo && dbo.containsField("shop_detail")){ + def officeDetail = dbo.shop_detail + cityMap.put(c, officeDetail) + }else{ + cityMap.put(c, [:]) + } + } + + def rets = [] + rets << ["³ÇÊÐ","ÊýÁ¿","ÇøÓò","Ãû³Æ","±ðÃû","µØÖ·","ÉÌȦ","½¨Öþ״̬","×âÊÛÀàÐÍ","×âÁÞÄêÏÞ","¸¶¿î·½Ê½","³öÊÛ¼Û¸ñ","×Ü»§Êý","µç»°","½¨ÖþÂ¥²ã","Â¥²ã×´¿ö","¿ª¼äÃæ»ý","¿¢¹¤Ê±¼ä","¿ªÒµÊ±¼ä","¿É·Ö¸î","ͳһ¹ÜÀí","³µÎ»ÊýÁ¿","³µÎ»ÃèÊö","Õ¼µØÃæ»ý","½¨ÖþÃæ»ý","ÎïÒµ·Ñ","¿ª·¢ÉÌ","ÎïÒµ¹«Ë¾","µØÌúÑØÏß","µØÌúÕ¾Ãû","ÅäÌ×ÉèÊ©","ÎïÒµ¸Å¿ö","½»Í¨Çé¿ö","ÖܱßÇé¿ö","¾­ÓªÒµÌ¬","À´Ô´url","ÃèÊö","¿ªÅÌʱ¼ä","ÊÛÂ¥µØÖ·","°å¿é","Â¥¸ß","»·ÏßλÖÃ","ÈÝ»ýÂÊ","ÂÌ»¯ÂÊ","ÉÌÒµÌØÉ«","ÏúÊÛÆóÒµ","ÏúÊÛÐí¿ÉÖ¤","Éè¼Æµ¥Î»","Ê©¹¤µ¥Î»","²úȨÄêÏÞ","½»Í¨Î»ÖÃ","½»¸¶±ê×¼","¿ª¹¤Ê±¼ä","Óõع滮Ðí¿ÉÖ¤","¹¤³Ì¹æ»®Ðí¿ÉÖ¤","ÍÁµØÊ¹ÓÃÖ¤","Ê©¹¤Ðí¿ÉÖ¤","×°ÐÞ","½¨Öþ½á¹¹","ÈëפÆóÒµ","½¨ÖþÀàÐÍ","µçÌÝÊýÁ¿","ÎïÒµÀàÐÍ","״̬","±ê×¼²ãÃæ»ý","Ïà¹ØÐÅÏ¢","¾°¹ÛÉè¼Æµ¥Î»","×°ÐÞ±ê×¼","½¨ÔìÄê´ú","½¨²Ä×°ÐÞ","³ö×â¼Û¸ñ","Í⾰ͼ","ÆäËüͼ","µØÉϳµÎ»Êý","µØÏ³µÎ»Êý","µØÖ·±ðÃû"] + def ret = [] + ret << "city" + ret << "count" + for(def f : fileds){ + ret << f + } + rets << ret + cityMap.each {k,v-> + def row = [] + row << k + row << CommonDatautils.findAllDistrictCount("shop", k) + for(def filed : fileds){ + if(v){ + def val = v.get(underlineToCamel(filed)) + if(val){ + row << val.toDouble()*100 + }else{ + row << "" + } + } + } + rets << row + } + + ExcelUtils.write("d:\\Êý¾Ý\\д×ÖÂ¥\\д×ÖÂ¥¸²¸ÇÂÊ.xlsx", rets, "ÉÌÆÌ") + } + + def offircRun(){ + def citys = CommonDatautils.findAllCity() + def cityMap = [:] + def fileds = ["region","name","alias","latLng","latLng2","address","addrAlias","bedKind","estateType2","buildType","block","businessQuarter","loopLineInfo","licence","sideset","realUsePercent","buildDesigner","consCompany","estateCharge","carSiteCount","carSite","undergroundCarSite","landCarSite","parkingFee","sight","propertyLife","lobbyHeight","standardHeight","clearHeight","standardArea","foreign","register","lightingVentilation","conditionerTime","","elevatorsCount","personElevatorsCount","goodsElevatorCount","openDate","finishBuildingDate","liveDate","allArea","buildArea","cubagePercent","virescencePercent","developer","estateCompany","networkWay","fitmentLevel","buildStructure"] + for(def c : citys){ + def dbo = findCoverPrecent(c) + if(dbo && dbo.containsField("office_detail")){ + def officeDetail = dbo.office_detail + cityMap.put(c, officeDetail) + }else{ + cityMap.put(c, [:]) + } + } + + def rets = [] + rets << ["³ÇÊÐ","ÊýÁ¿","ÇøÓò","Ãû³Æ","Ãû³Æ±ðÃû","¾­Î³¶È£¨°Ù¶È£©","¾­Î³¶È£¨¸ßµÂ£©","µØÖ·","µØÖ·±ðÃû","д×ÖÂ¥µÈ¼¶","д×ÖÂ¥ÀàÐÍ","½¨ÖþÀà±ð","°å¿é","ÉÌȦ","»·ÏßλÖÃ","Ô¤ÊÛÐí¿ÉÖ¤","ÊÇ·ñ¿É·Ö¸î","µÃ·¿ÂÊ","Éè¼Æµ¥Î»","Ê©¹¤µ¥Î»","ÎïÒµ·Ñ","Í£³µÎ»Êý","Í£³µÃèÊö","µØÉϳµÎ»Êý","µØÏ³µÎ»Êý","³µÎ»×â½ð","¿ª¼äÃæ»ý","²úȨÄêÏÞ","´óÌòã¸ß","±ê×¼²ã¸ß","¾»¸ß","±ê×¼²ãÃæ»ý","ÊÇ·ñÉæÍâ","ÊÇ·ñ¿É×¢²á","¿Õµ÷","¿Õµ÷¿ª·Åʱ¼ä","¿Õµ÷·ÑÓÃ","µçÌÝÊýÁ¿","¿ÍÌÝÊý","»õÌÝÊý","¿ªÅÌʱ¼ä","¿¢¹¤Ê±¼ä","Èëסʱ¼ä","Õ¼µØÃæ»ý","½¨ÖþÃæ»ý","ÈÝ»ýÂÊ","ÂÌ»¯ÂÊ","¿ª·¢ÉÌ","ÎïÒµ¹«Ë¾","ÍøÂç","×°ÐÞ×´¿ö","½á¹¹"] + def ret = [] + ret << "³ÇÊÐ" + ret << "ÊýÁ¿" + for(def f : fileds){ + ret << f + } + rets << ret + cityMap.each {k,v-> + def row = [] + row << k + row << CommonDatautils.findAllDistrictCount("office", k) + for(def filed : fileds){ + if(v){ + def val = v.get(filed) + if(val){ + row << val.toDouble()*100 + }else{ + row << "" + } + } + } + rets << row + } + + ExcelUtils.write("d:\\Êý¾Ý\\д×ÖÂ¥\\д×ÖÂ¥¸²¸ÇÂÊ.xlsx", rets, "д×ÖÂ¥") + } def run3(){ @@ -136,4 +269,24 @@ class FieldStat { } return obj } + + + public static String underlineToCamel(String param){ + if (param==null||"".equals(param.trim())){ + return ""; + } + int len=param.length(); + StringBuilder sb=new StringBuilder(len); + for (int i = 0; i < len; i++) { + char c=param.charAt(i); + if (c=="_"){ + if (++i + def opt = d['J'] + if(opt && opt.contains("±ðÃû")){ + def dist = CommonDatautils.findDistrictById(d['H']) + if(dist){ + def alias = [] + if(dist.alias){ + alias = dist.alias + } + if(!alias.contains(d['C'])){ + alias << d['C'] + def udata = new BasicDBObject() + udata.put("alias", alias) + DbUtils.seaweed.update(new BasicDBObject('_id', dist.get("_id")), new BasicDBObject('$set', udata)) + } + + } + } + +}) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ApiTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ApiTest.groovy new file mode 100644 index 000000000..f05ae0163 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/ApiTest.groovy @@ -0,0 +1,130 @@ +package com.fangjia.script.gj.district + +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.util.DateUtils +import com.fangjia.script.util.ElasticUtils +import com.fangjia.script.util.ExcelUtils +import com.fangjia.script.util.MongoUtils +import com.mongodb.BasicDBObject +import com.mongodb.DBCollection + +import java.util.concurrent.CopyOnWriteArrayList +import java.util.concurrent.CountDownLatch +import java.util.concurrent.ExecutorService +import java.util.concurrent.Executors +import java.util.concurrent.atomic.AtomicLong + +class ApiTest { + + public static final DBCollection DISTRICT_ANALY_DATA_COLL = MongoUtils.getCollectionByName("fangjia_stat", "district_analy_data", "mongo.db.fangjia.com") + + public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(10) + + static main(args) { + def task = new ApiTest() +// task.rankRunTest() +// task.similarRunTest() + task.loupanLevelTest() + + } + + def loupanLevelTest(){ + ExcelUtils.modify("D:\\Êý¾Ý\\׿ÐÅ\\ÉϺ£ - ¸±±¾.xlsx", { d -> + if (d['A']) { + def results = com.fangjia.script.gj.OpenApiUtils.financialRating(d['A'], d['B']+d['C']) + if(results){ + d['D'] = results.consumptionRating + } + } + }) + } + + def similarRunTest(){ + + ExcelUtils.modify("D:\\Êý¾Ý\\½­ÄÏÅ©ÉÌÐÐ\\סլÐÅÏ¢V2-²îÒì°¸Àý£¨·´À¡£©.xlsx", { d -> + if(d['A']){ + def cityCode = d['U'].toString().toDouble().toInteger() + def proCode = d['V'].toString().toDouble().toInteger() + def regionCode = d['T'].toString().toDouble().toInteger() + def name = d['D'] + def area = d['F'] + def floor = d['H'].toString().toDouble().toInteger() + def height = d['G'].toString().toDouble().toInteger() + def results = com.fangjia.script.gj.OpenApiUtils.similarRank(proCode, cityCode,regionCode, name, area, floor, height) + if(results){ + def str = "" + for(def r : results){ + str = str + r.buildingName+"-"+r.strctureArea+"-"+r.unitPrice+"\n" + } + d['Y'] = str + } + } + }) + } + + def rankRunTest(){ + def dists = CommonDatautils.findAllDistrictByCity("ÉϺ£","district", ["city","region","name"]) + //def dists = CommonDatautils.findDistrictByCityAndRegions("ÉϺ£","district", ["ÆÖ¶«"], ["city","region","name"]) + def rets = createCityDatas(dists) + for(def r : rets){ + println r + } + ExcelUtils.write("d:\\Êý¾Ý\\ÆÖ¶«Ð¡ÇøÅÅÃû.xlsx", rets, "²âÊÔ") + } + + + + def createCityDatas(def dists){ + def rets = new CopyOnWriteArrayList() + def totalCount = new AtomicLong() + final CountDownLatch latch = new CountDownLatch(dists.size()) + for(def i=0;i + headers << fieldsNameMap.get(it) + } + + headers << "ץȡÁ¿" + headers << "Æ¥ÅäÁ¿" + headers << "0.9·ÖÒÔÉÏÁ¿" + headers << "Æ¥ÅäÂÊ" + headers << "0.9ÒÔÉÏÆ¥ÅäÂÊ" +// analysRets << headers + + for(def c : citys){ + def totalCount = CommonDatautils.findAllDistrictCount("district", c) + if(totalCount){ +// rh_analysRets = addFieldFromRonghe(c, totalCount, rh_analysRets) + analysRets = addFieldFromMatch(c, totalCount, analysRets) + } + } + println analysRets.toString() + sendStatEmail(headers, analysRets, rh_analysRets) +// ExcelUtils.write("D:\\Êý¾Ý\\Ð¡Çø\\¸²¸ÇÂÊ.xlsx", analysRets, "Êý¾Ý") + } + + def addFieldFromMatch(c, totalCount, analysRets){ + def fields = fieldsMap.keySet() as List + + sourceMap.each { seaweedmapSource, esWebSource -> + def esRets = findEsDatas(c, esWebSource) + def matchRets1 = matchApi(esRets) + def matchRets2 = selectRestByCredit(matchRets1) + println esWebSource +" ץȡÁ¿£º"+esRets.size()+" Æ¥ÅäÁ¿£º"+matchRets1.size()+" 0.9·ÖÒÔÉÏÁ¿£º"+matchRets2.size() + + def updateRets = processFieldsFromMatch(c , matchRets2) + println "¡¾Í¨¹ýÆ¥ÅäÌî³ä×ֶΡ¿ÍøÕ¾£º"+seaweedmapSource +" Es:"+esRets.size()+" ÈÚºÏÐ¡ÇøÕ¼±È£º"+DataHandleUtils.getDoubleRound(2, matchRets2.size()*100/totalCount)+"%" + def precentMap = fieldUpdate(totalCount, updateRets) + println c +" "+precentMap.toString() + updateDB(c, updateRets) + println "------------------------------------------------------------------------------" + def pre1 = 0 + def pre2 = 0 + if(esRets){ + pre1 = DataHandleUtils.getDoubleRound(2, matchRets1.size()*100/esRets.size()) + pre2 = DataHandleUtils.getDoubleRound(2, matchRets2.size()*100/esRets.size()) + } + def analyRet = [] + analyRet << seaweedmapSource + analyRet << c + fields.each{key-> + analyRet << precentMap.get(key) + } + analyRet << esRets.size() + analyRet << matchRets1.size() + analyRet << matchRets2.size() + analyRet << pre1 + analyRet << pre2 + analysRets << analyRet + } + return analysRets; + } + + + + + def addFieldFromRonghe(c, totalCount, rh_analysRets){ + def fields = fieldsMap.keySet() as List + sourceMap.each{seaweedmapSource,esWebSource-> + def rhRets = findRongheDists(c, seaweedmapSource) + def esRets = findEsDistrict(c, esWebSource) + def updateRets = processFieldsFromRh(c, rhRets, esRets) + + println "¡¾Í¨¹ýÈںϹØÏµÌî³ä×ֶΡ¿ÍøÕ¾£º"+seaweedmapSource +" µÚÈý·½ÈÚºÏ±í£º"+rhRets.size() +" Es:"+esRets.size()+" ÈÚºÏÐ¡ÇøÕ¼±È£º"+DataHandleUtils.getDoubleRound(2, rhRets.size()*100/totalCount)+"%" + def precentMap = fieldUpdate(totalCount, updateRets) + println c +" "+precentMap.toString() + updateDB(c, updateRets) + println "----------------------------------------------------------------------------------" + def pre1 = 0 + def pre2 = 0 + if(esRets){ + pre1 = DataHandleUtils.getDoubleRound(2, rhRets.size()*100/esRets.size()) + pre2 = DataHandleUtils.getDoubleRound(2, esRets.size()*100/esRets.size()) + } + def analyRet = [] + analyRet << seaweedmapSource + analyRet << c + fields.each{key-> + analyRet << precentMap.get(key) + } + analyRet << esRets.size() + analyRet << rhRets.size() + analyRet << esRets.size() + analyRet << pre1 + analyRet << pre2 + rh_analysRets << analyRet + } + return rh_analysRets; + } + + def processFieldsFromRh(c, rhRets, esRets){ + def fields = fieldsMap.keySet() as List + def fieldValueMap = [:] + for(def rhDist : rhRets){ + if(rhDist.commid && rhDist.commid!="null"){ + continue + } + def dist = CommonDatautils.findDistrictFieldById(rhDist.commid, fields) + if(!dist){ + println c+" "+rhDist.commid+" ²»´æÔÚ" + continue + } + def esDbo = esRets.get(c + "#" + rhDist.id) + if(!esDbo){ + println c+" "+rhDist.id+" ²»´æÔÚ[ES]" + continue + } + def newValues = strandField(c, dist, esDbo) + if(newValues){ + fieldValueMap.put(dist._id.toString(), newValues) + } + } + + println fieldValueMap.size() + return fieldValueMap; + + } + + def processFieldsFromMatch(c,matchRets){ + def fields = fieldsMap.keySet() as List + fields << "city" + fields << "estate_type2" + def fieldValueMap = [:] + for(def matchDist : matchRets){ + def dist = CommonDatautils.findDistrictFieldById(matchDist.match_id, fields) + if(!dist){ + println c+" "+matchDist.match_id+" ²»´æÔÚ" + continue + } + def newValues = strandField(c, dist, matchDist) + if(newValues){ + println dist._id.toString()+" "+newValues.toString() + fieldValueMap.put(dist._id.toString(), newValues) + } + } + + return fieldValueMap; + } + + def strandField(c,dist, matchDist){ + def newValues = [:] + fieldsMap.each{seaweedfield,esField-> + def val = dist.get(seaweedfield) + if(!val){ + def esVal = matchDist.get(esField) + if(esVal){ + def newVal = null + if(seaweedfield == "estate_charge"){ + newVal = FiledStrand.processEstateCharge(c, FiledStrand.getNumber(esVal), dist.estate_type2) + newVal = newVal.toString() + } + if(seaweedfield == "build_date" || seaweedfield == "live_date"){ + newVal = FiledStrand.processFinishBuildingDate(esVal) + } + if(seaweedfield == "estate_company" || seaweedfield == "developer"){ + newVal = FiledStrand.processCompany(esVal) + } + if(seaweedfield =="virescence_percent"){ + newVal = FiledStrand.processVirescencePercent(esVal) + } + + if(seaweedfield =="cubage_percent"){ + newVal = FiledStrand.processCubagePercent(esVal) + } + + if(seaweedfield =="all_area" || seaweedfield =="build_area"){ + newVal = FiledStrand.processArea(esVal) + if(newVal){ + newVal = newVal.toString() + } + } + if(seaweedfield =="household_count"){ + newVal = FiledStrand.processHouseholdCount(esVal, dist.estate_type2) + } + + if(seaweedfield =="loudong_count"){ + newVal = FiledStrand.processLoudongCount(esVal) + } + + if(seaweedfield =="car_site_count"){ + newVal = FiledStrand.processCarSite(esVal) + } + if(seaweedfield =="car_site"){ + newVal = FiledStrand.processCarSiteDesc(esVal) + } + + if(seaweedfield =="property_life"){ + newVal = FiledStrand.processPropertyLife(esVal) + } + + if(seaweedfield =="alias"){ + newVal = FiledStrand.processAlias(esVal, dist.name, dist.alias) + } + + if(seaweedfield =="address"){ + newVal = FiledStrand.processAddress(esVal, dist.city) + } + if(seaweedfield =="block"){ + newVal = FiledStrand.processBlock(dist.city, dist.region, esVal) + } + + if(seaweedfield == "build_type"){ + newVal = FiledStrand.processBuildType(esVal, dist.estate_type2) + } + + if(seaweedfield == "land_property"){ + newVal = FiledStrand.processlandProperty(esVal) + } + + if(seaweedfield == "build_structure"){ + newVal = FiledStrand.processBuildStructure(esVal) + } + + if(newVal){ + newValues.put(seaweedfield, newVal) + } + } + } + } + return newValues; + } + + + + def findRongheDists(def city, def source){ + def keys = new BasicDBObject() + keys.put("commid", 1) + keys.put("city", 1) + keys.put("id", 1) + keys.put("source", 1) + def dbcursor = SEAWEEDMAP_COLL.find(new BasicDBObject().append("city", city).append("source", source), keys) + def rets = [] + for(def d : dbcursor){ + rets << ["commid":d.commid, "city":d.city, "source":d.source, "id":d.id] + } + return rets; + } + + def findEsDistrict(c, esWebSource){ + def map = [:] + ElasticUtils.executeSqlQuery("select * from community where city='${c}' and source='${esWebSource}'", {r-> + if(r.id && !map.containsKey(c+"#"+r.id)){ + map.put(c+"#"+r.id, r) + } + }) + return map + } + + + def findEsDatas(c, esWebSource){ + def list = [] + ElasticUtils.executeSqlQuery("select * from community where city='${c}' and source='${esWebSource}'", {r-> + list << r + }) + return list + } + + def fieldUpdate(total,updateRets){ + + def countMap = [:] + + for(def rm : updateRets){ + def valMap = rm.value + fieldsMap.each{seaweedfield,esField-> + if(valMap.containsKey(seaweedfield)) { + if(countMap.containsKey(seaweedfield)) { + countMap.put(seaweedfield, countMap.get(seaweedfield) + 1) + }else{ + countMap.put(seaweedfield, 1) + } + } + } + } + + println countMap.toString() + def precentMap = [:] + fieldsMap.each() {key,skey-> + if(countMap.containsKey(key)) { + precentMap.put(key, DataHandleUtils.getDoubleRound(2, countMap.get(key)*100/total)) + }else { + precentMap.put(key, 0) + } + } + return precentMap; + } + + + def matchApi(esRets){ + def rets = new CopyOnWriteArrayList() + def totalCount = new AtomicLong() + final CountDownLatch latch = new CountDownLatch(esRets.size()) + for(def i=0;i=0.9){ + matchRets1 << r + } + } + return matchRets1 + } + + def matching(data){ + def name = data.name + if(data.name && data.name.contains("¡¤")){ + name = data.name.replace("¡¤", "") + } + + def flag = "Ãû³ÆÆ¥Åä" + def dist = matchDist(data.city, data.region, name) + + if(!dist){ + dist = CommonDatautils.findSeaweedByMappingAlias(data.city, data.region, name,"district") + flag = "Ó³Éä±ðÃûÆ¥Åä" + } + if(!dist) { + def rets = CommonDatautils.findDistrictByAlias(data.city, data.region, name, "district") + if(rets && rets.size()==1){ + flag = "±ðÃûÆ¥Åä" + dist = rets[0] + } + } + + if(dist){ + data.flag = flag + data.match_id = dist._id.toString() + data.match_region = dist.region + data.match_name = dist.name + data.credit = 0.95 + }else{ + def jsonObject = OpenApiClient.addressMatch(data.city, name, "property", false,data.region, null) + if(jsonObject!=null && jsonObject.precise==-1){ + if(data.address && isStandardRoad(data.address)){ + jsonObject = OpenApiClient.addressMatch(data.city, data.address, "property", false,data.region, name) + }else{ + data.flag = "Æ¥Åä½Ó¿Ú-µØÖ·" + } + }else{ + data.flag = "Æ¥Åä½Ó¿Ú-Ãû³Æ" + } + if(jsonObject != null && jsonObject.precise!=-1) { + data.match_id = jsonObject.get("id") + data.match_region = jsonObject.get("district") + data.match_name = jsonObject.get("name") + data.credit = jsonObject.get("credit") + } + } + if(data.match_id){ + return data + } + return null + } + + + def updateDB(c, updateRets){ + + for(def rm : updateRets) { + def id = rm.key + def valMap = rm.value + + BasicDBObject udata = new BasicDBObject() + valMap.each {k,v-> + udata.put(k,v) + } + udata.put("m_date", new Date()) + DbUtils.seaweed.update(new BasicDBObject('_id',new ObjectId(id)),new BasicDBObject('$set',udata)) + } + } + + def matchDist(city, region, name){ + def dist = CommonDatautils.findDistrict(city, region, name, "district") + return dist; + } + + + + def isStandardRoad(def s){ + def pattern = Pattern.compile("[·|½Ö|´óµÀ|Ïï]\\d+(ºÅ|Ū)"); + def matcher = pattern.matcher(s) + if(matcher.find()){ + return true; + } + return false + } + + def sendStatEmail(headers, analysRets, rh_nalysRets){ + Date dateTime = DateUtils.mins(1); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd"); + StringBuffer sb = new StringBuffer(); + if(analysRets){ + sb.append("") + sb.append("×ֶβ¹³äÇé¿ö·ÖÎö") + sb.append("") + headers.each{it-> + if(it=="À´Ô´" || it=="³ÇÊÐ"){ + sb.append("") + }else{ + sb.append("") + } + } + sb.append("") + + for(def ret : analysRets){ + sb.append(""); + ret.each{it-> + sb.append("") + } + sb.append(""); + } + sb.append("
    "+ it+""+ it+"
    " + it + "

    "); + } + + + StringBuffer rh_sb = new StringBuffer(); + if(rh_nalysRets){ + rh_sb.append("") + rh_sb.append("×ֶβ¹³äÇé¿ö·ÖÎö") + rh_sb.append("") + headers.each{it-> + if(it=="À´Ô´" || it=="³ÇÊÐ"){ + rh_sb.append("") + }else{ + rh_sb.append("") + } + } + rh_sb.append("") + + for(def ret : rh_nalysRets){ + rh_sb.append(""); + ret.each{it-> + rh_sb.append("") + } + rh_sb.append(""); + } + rh_sb.append("
    "+ it+""+ it+"
    " + it + "

    "); + } + + for (def email : EMAILS) { + jms.sendMail(email, "×Ö¶ÎÌî³äÇé¿ö·ÖÎö", sb.toString()+rh_sb.toString()); + } + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictFiledStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictFiledStat.groovy new file mode 100644 index 000000000..e3d7eb51c --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/DistrictFiledStat.groovy @@ -0,0 +1,69 @@ +package com.fangjia.script.gj.district + +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.common.DataHandleUtils +import com.fangjia.script.util.DateUtils +import com.fangjia.script.util.ExcelUtils +import com.fangjia.script.util.MongoUtils +import com.mongodb.BasicDBObject +import com.mongodb.DBCollection + +/** + * ×Ö¶ÎÌáÉýÂÊͳ¼Æ + */ +DBCollection CITY_INFO_CONN = MongoUtils.getCollectionByName("fangjia_data_ana", "city_info", MongoUtils.MongoDB_Domain_mongo); + +def fieldsMap = ["district_count":"Ð¡ÇøÊýÁ¿","name":"Ãû³Æ" ,"region":"ÇøÓò" ,"block":"°å¿é" ,"address":"µØÖ·" ,"estateType2":"ÎïÒµÀàÐÍ" ,"householdCount":"»§Êý" ,"openDate":"¿ªÅÌʱ¼ä" ,"liveDate":"Èëסʱ¼ä" ,"buildDate":"½¨ÖþÄê´ú" ,"allArea":"Õ¼µØÃæ»ý" ,"buildArea":"½¨ÖþÃæ»ý" ,"buildType":"½¨ÖþÀàÐÍ" ,"developer":"¿ª·¢ÉÌ" ,"estateCompany":"ÎïÒµ¹«Ë¾" ,"cubagePercent":"ÈÝ»ýÂÊ" ,"virescencePercent":"ÂÌ»¯ÂÊ" ,"carSite":"Í£³µÎ»" ,"estateCharge":"ÎïÒµ·Ñ" ,"floorplanPics":"»§ÐÍͼ" ,"outPics":"Í⾰ͼ" ,"finishBuildingDate":"¿¢¹¤Ê±¼ä" ,"businessQuarter":"ÉÌȦ" ,"startBuildingDate":"¿ª½¨Ê±¼ä" ,"loopLineInfo":"»·Ïß" ,"propertyLife":"²úȨÄêÏÞ" ,"houseProperty":"²úȨÐÔÖÊ" ,"licence":"Ô¤ÊÛÐí¿ÉÖ¤" ,"buildStructure":"½¨Öþ½á¹¹" ,"lat":"°Ù¶Èγ¶È" ,"pics":"ͼƬ" ,"streetCommunity":"½ÖµÀ" ,"schools":"ѧУ" ,"houseStructure":"·¿Îݽṹ" ,"alias":"±ðÃû" ,"addrAlias":"µØÖ·±ðÃû" ,"mainTypeArea":"Ö÷Á¦Ãæ»ý" ,"loudongCount":"Â¥¶°Êý" ,"latLng" :"¸ßµÂ¾­¶È" ,"rentPrice":"×â½ð" ] +def weeknd = DateUtils.getFirstDayOfWeek(new Date()) +def lastWeeknd = DateUtils.getFirstDayOfWeek(new Date()-7) + + +def weekendDatas = CITY_INFO_CONN.find(new BasicDBObject("weekend", weeknd)) +def lastWeekendDatas = CITY_INFO_CONN.find(new BasicDBObject("weekend", lastWeeknd)) + +def weekendMapDatas = findDataByCity(weekendDatas) +def lastWeekendMapDatas = findDataByCity(lastWeekendDatas) + +def citys = CommonDatautils.findAllCity() + +def fields = fieldsMap.keySet() as List +def rets = [] +def headers = [] +headers << "³ÇÊÐ" +fields.each{k-> + headers << fieldsMap.get(k) +} +rets << headers +for(def c : citys){ + def weekendDetailMap = weekendMapDatas.get(c) + def lastWeekendDetailMap = lastWeekendMapDatas.get(c) + def ret = [] + ret << c + fields.each{key-> + if(weekendDetailMap){ + def v1 = weekendDetailMap.get(key) + def v2 = lastWeekendDetailMap.get(key) + if(v1 && v2){ + ret << DataHandleUtils.getDoubleRound(4, v1-v2)*100 + }else{ + ret << "-" + } + }else{ + ret << "-" + } + } + rets << ret +} + +ExcelUtils.write("D:\\Êý¾Ý\\Ð¡Çø\\×Ö¶ÎÌáÉýÂÊ"+DateUtils.formatDateByPattern(weeknd,"yyyy-MM-dd")+".xlsx", rets, "×Ö¶ÎÌáÉýÂÊͳ¼Æ") + + + +def findDataByCity(weekendDatas){ + def map = [:] + for(def d : weekendDatas){ + d.district_detail.district_count = d.existing_district_count + map.put(d.city, d.district_detail) + } + return map +} \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy index ae1dee2e4..70249a1f9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/FangjiaClientUtils.groovy @@ -73,7 +73,10 @@ class FangjiaClientUtils { def content = null try { address = address.replace("{","") - def url = "http://192.168.0.19:31080/FangJiaNlpService/ner?address="+URLEncoder.encode(address,"UTF-8")+"&city="+URLEncoder.encode(city,"UTF-8") + def url = "http://192.168.0.19:31080/FangJiaNlpService/ner?address="+URLEncoder.encode(address,"UTF-8") + if(city){ + url = url +"&city="+URLEncoder.encode(city,"UTF-8") + } // def url = "http://192.168.0.19:39080/FangJiaAddressService/structure?address="+URLEncoder.encode(address,"UTF-8") content = new HttpRequest().newGet(url, null, "utf-8") @@ -90,10 +93,15 @@ class FangjiaClientUtils { def jsonObj = null def content = null try { - address = address.replace("{","") - def url = "http://192.168.0.19:31080/FangJiaAddressService/structure/v2?address="+URLEncoder.encode(address,"UTF-8")+"&city="+URLEncoder.encode(city,"UTF-8") - content = new HttpRequest().newGet(url, null, "utf-8") - jsonObj = JSONObject.fromObject(content) + if(address){ + address = address.replace("{","") + def url = "http://192.168.0.19:31080/FangJiaAddressService/structure/v2?address="+URLEncoder.encode(address,"UTF-8") + if(city){ + url = url +"&city="+URLEncoder.encode(city,"UTF-8") + } + content = new HttpRequest().newGet(url, null, "utf-8") + jsonObj = JSONObject.fromObject(content) + } } catch (Exception e) { println address +" "+content e.printStackTrace(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/SameDistName.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/SameDistName.groovy new file mode 100644 index 000000000..945227e7a --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/SameDistName.groovy @@ -0,0 +1,71 @@ +package com.fangjia.script.gj.district + +import com.fangjia.core.RegionData +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.looplineinfo.InsidePolygon +import com.fangjia.script.looplineinfo.Point +import com.fangjia.script.util.ExcelUtils +import com.fangjia.script.util.MongoUtils +import com.mongodb.BasicDBObject +import com.mongodb.DBCollection + +class SameDistName { + + static DBCollection POLYLINECOLL = MongoUtils.getCollectionByAuth20190102("fangjia_crawl", "region_polyline") + + static main(args) { + def task = new SameDistName() + task.run() + } + + def run(){ + def dists = CommonDatautils.findAllDistrictByCity("³£ÖÝ", "district", ["city","region", "name", "address","lat", "lng"]) + def map = [:] + for(def d : dists){ + def list = map.get(d.name) + if(!list){ + list = [] + map.put(d.name, list) + } + list << d + } + + def datas = [] + map.each {k,v-> + if(v && v.size()>=2){ + datas.addAll(v) + } + } + + def retDats = [] + retDats << ["³ÇÊÐ","ÇøÓò","Ãû³Æ","µØÖ·","ÇøÓò×´¿ö"] + if(datas){ + def regionPointsMap = findRegionRange("³£ÖÝ") + for(def d : datas){ + def lng = d.lng/10000000000.0 + def lat = d.lat/10000000000.0 + def flag = isInArea(lng, lat, regionPointsMap.get(d.region)) + retDats << [d.city, d.region, d.name, d.address, flag] + } + } + ExcelUtils.write("D:\\Êý¾Ý\\Ð¡Çø\\ÏàÍ¬Ð¡Çø²»Í¬ÇøÓò.xlsx", retDats, "Êý¾Ý") + } + + def findRegionRange(city){ + def q = new BasicDBObject() + q.put("city",city) + def dbcursor = POLYLINECOLL.find(q) + def regionMap = [:] + for(def d : dbcursor){ + def region = RegionData.formatRegion(city,d.region) + regionMap.put(region, d.polyline) + } + return regionMap + } + + def isInArea(lng, lat, points){ + List pointList = InsidePolygon.createPoint2(points); + def flag = InsidePolygon.isPtInPoly(lng, lat, pointList) + return flag; + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/SeaweedDataMatchProcess.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/SeaweedDataMatchProcess.groovy index 319e44ef4..a59b0747a 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/SeaweedDataMatchProcess.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/district/SeaweedDataMatchProcess.groovy @@ -26,8 +26,10 @@ class SeaweedDataMatchProcess { rMap.region = obj.region rMap.alias = obj.alias rMap.name = obj.name - rMap.lat = obj.lat/10000000000.0 - rMap.lng = obj.lng/10000000000.0 + if(obj.lat){ + rMap.lat = obj.lat/10000000000.0 + rMap.lng = obj.lng/10000000000.0 + } rMap.id = obj._id.toString() rMap.address = obj.address } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/EsMonthHouseStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/EsMonthHouseStat.groovy index 3d79e39fb..9be75aeb0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/EsMonthHouseStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/EsMonthHouseStat.groovy @@ -1,7 +1,9 @@ package com.fangjia.script.gj.es +import com.fangjia.core.RegionData import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.common.DataHandleUtils +import com.fangjia.script.gj.OpenApiUtils import com.fangjia.script.util.DateUtils import com.fangjia.script.util.ElasticUtils import com.fangjia.script.util.ExcelUtils @@ -23,7 +25,40 @@ class EsMonthHouseStat { // task.statHouseUpdateCount() - task.statDistHouse() +// task.statDistHouse() + task.statRent() + } + + def statRent(){ + def index = 0 + ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\ÆäËü\\×â½ð.xlsx", { d -> + index++ + def region = RegionData.formatRegion(d['A'], d['B']) + if(region){ + def dist = CommonDatautils.findDistrict(d['A'], region, d['C'], "district") + if(!dist){ + dist = OpenApiUtils.matchDistrictByAddr(d['A'], d['C'], region) + if(dist){ + dist = CommonDatautils.findDistrictById(dist.id) + } + } + def alias = [] + if(dist.alias){ + if(!dist.alias.contains(dist.name)){ + dist.alias << dist.name + } + alias = dist.alias + }else{ + alias << dist.name + } + + def distCount = findHouseCount(dist.city, dist.region, alias, 20220501, 20230501) + d['G'] = distCount + d['E'] = dist.region + d['F'] = dist.name + println index+" "+ d['C'] +" "+distCount + } + }); } def statDistHouse(){ @@ -136,8 +171,8 @@ class EsMonthHouseStat { def houseRun(){ ExcelUtils.multiThreadingModify("d:\\Êý¾Ý\\½¨ÐÐ\\³ÇÊи²¸ÇÂÊͳ¼Æ.xlsx",{d-> def city = d['A'] - def count = findHouseCount(city, 20190709, 20210709) - d['E'] = count + def count = findHouseCount(city, 20221101, 20230201) + d['B'] = count def districts = CommonDatautils.findAllDistricts(city, "district", ["city", "region", "name", "alias"]); def disthouseCount = 0 @@ -152,8 +187,8 @@ class EsMonthHouseStat { alias << dist.name } - def distCount = findHouseCount(dist.city, dist.region, alias, 20190709, 20210709) - if(distCount){ + def distCount = findHouseCount(dist.city, dist.region, alias, 20221101, 20230201) + if(distCount && distCount>=3){ disthouseCount++ } println dist.city+" "+dist.region+" "+dist.name+" "+distCount @@ -162,7 +197,7 @@ class EsMonthHouseStat { println "disthouseCount:"+disthouseCount println districts.size() def precent = DataHandleUtils.getDoubleRound(2, disthouseCount*100.0/districts.size()) - d['F'] = precent+"%" + d['C'] = precent+"%" },0) } @@ -172,7 +207,7 @@ class EsMonthHouseStat { def total = 0 try{ aliasStr = escapeExprSpecialWord(alias.join("','")) - String sql = "select count(*) as c from latest_seawater where cat='sell' and city='${city}' and p_date >= ${startDate} and p_date<${endDate} and region='${region}' and district_name in ('${aliasStr}')" + String sql = "select count(*) as c from latest_seawater where cat='rent' and city='${city}' and p_date >= ${startDate} and p_date<${endDate} and region='${region}' and district_name in ('${aliasStr}') and root='lianjia.com'" ElasticUtils.executeSqlQuery(sql,{data-> total = data.c diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/FangjiaCorestieLogAnaly.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/FangjiaCorestieLogAnaly.groovy new file mode 100644 index 000000000..aa3c3c62c --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/FangjiaCorestieLogAnaly.groovy @@ -0,0 +1,111 @@ +package com.fangjia.script.gj.es + +import com.fangjia.core.util.DateUtil +import com.fangjia.script.util.ElasticUtils +import com.fangjia.script.util.ExcelUtils +import org.elasticsearch.index.query.QueryBuilder +import org.elasticsearch.index.query.QueryBuilders +import org.elasticsearch.xpack.sql.jdbc.EsDataSource + +EsDataSource dataSource = new EsDataSource(); +String address = "jdbc:es://http://192.168.0.86:9200/timezone=UTC&page.size=250&connect.timeout=120s&network.timeout=120s&page.timeout=120s"; + +//findLogs() +//findFangjiaLogs() +stat() + +def stat(){ + def datas = ExcelUtils.read("D:\\Êý¾Ý\\fjw-Ìá½».xlsx",0,1) + def map=[:] + for(def d : datas){ + def count = map.get(d['C']) + if(!count){ + map.put(d['C'], 1) + }else{ + map.put(d['C'], count+1) + } + } + + map.each {k,v-> + println k +" "+v + } +} +def findLogs(){ + def total = 0 + try{ + +// String sql = "select * from fangjia-log* where request like '/jnBank%'" +// BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery(); + +// def startDate = DateUtil.parseDate("20230427", "yyyyMMdd") +// def endDate = DateUtil.parseDate("20230428", "yyyyMMdd") +// QueryBuilder date_range = QueryBuilders.rangeQuery("time_local").from(startDate).to(endDate).includeLower(true).includeUpper(false); + + def q = QueryBuilders.fuzzyQuery("domain", ".fangjia.com") + QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(q).must(date_range) + def houses = ElasticUtils.executeSimpleQuery("192.168.0.86", "fangjia-log*", queryBuilder); + println houses.size() + def set = new HashSet() + def index = 0 + if(houses) { + for (def d : houses) { + def request = d.request + if(request && !d.domain.contains("k8s2.fangjia.com")){ + index ++ + println "[${index}] "+d.domain +" "+ request + } + } + } + + println set + + }catch(Exception e){ + e.printStackTrace() + } + + return total +} + + +def findFangjiaLogs(){ + + def startDate = DateUtil.parseDate("20230329", "yyyyMMdd") + def endDate = DateUtil.parseDate("20230429", "yyyyMMdd") + Calendar calendar = Calendar.getInstance() + calendar.setTime(startDate) + def list = [] + def data = [["mid", "ip", "·ÃÎÊʱ¼ä"]] + while (startDate.before(endDate)) { + calendar.add(Calendar.DATE, 1) + def nextDate = calendar.getTime() + +// def startDate = DateUtil.parseDate("20230427", "yyyyMMdd") +// def endDate = DateUtil.parseDate("20230428", "yyyyMMdd") + QueryBuilder date_range = QueryBuilders.rangeQuery("@timestamp").from(startDate).to(nextDate).includeLower(true).includeUpper(false); + + + def q = QueryBuilders.fuzzyQuery("request", "/doAdd2") + QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(q).must(date_range) + def houses = ElasticUtils.executeSimpleQuery("192.168.0.86", "fangjia-log*", queryBuilder); + println houses.size() + + if (houses) { + for (def d : houses) { + def reqStr = d.request.toString() + def mid = null + if (reqStr.contains("mid=")) { + + mid = reqStr.substring(reqStr.indexOf("mid=") + 4, reqStr.indexOf("mid=") + 8) + } + def time = d.get("@timestamp").toString() + time = time.substring(0, time.indexOf("T")) + def ip = d.remote_addr + data << [mid, ip, time] + } + } + + startDate = nextDate + } + + ExcelUtils.write("D:\\Êý¾Ý\\fjw-Ìá½».xlsx", data, "²éѯÈÕÖ¾") +} \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/JnBlankLog.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/JnBlankLog.groovy index 444fddbfc..ea7d46e2b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/JnBlankLog.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/es/JnBlankLog.groovy @@ -1,5 +1,6 @@ package com.fangjia.script.gj.es +import com.fangjia.core.util.DateUtil import com.fangjia.script.util.ElasticUtils import org.elasticsearch.index.query.BoolQueryBuilder import org.elasticsearch.index.query.QueryBuilder @@ -9,14 +10,18 @@ import org.elasticsearch.xpack.sql.jdbc.EsDataSource EsDataSource dataSource = new EsDataSource(); String address = "jdbc:es://http://192.168.0.25:9200/timezone=UTC&page.size=250&connect.timeout=120s&network.timeout=120s&page.timeout=120s"; -findLogs() - +//findLogs() +findFangjiaLogs() def findLogs(){ def total = 0 try{ // String sql = "select * from fangjia-log* where request like '/jnBank%'" // BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery(); + def startDate = DateUtil.parseDate("20230427", "yyyyMMdd") + def endDate = DateUtil.parseDate("20230428", "yyyyMMdd") + + QueryBuilder date_range = QueryBuilders.rangeQuery("time_local").from(startDate).to(endDate).includeLower(true).includeUpper(false); def q = QueryBuilders.fuzzyQuery("request", "/jnBank") QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(q) def houses = ElasticUtils.executeSimpleQuery("192.168.0.25", "fangjia-log*", queryBuilder); @@ -53,3 +58,35 @@ def findLogs(){ return total } + + + + + +def findFangjiaLogs(){ + def total = 0 + try{ + +// String sql = "select * from fangjia-log* where request like '/jnBank%'" +// BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery(); + def startDate = DateUtil.parseDate("20230427", "yyyyMMdd") + def endDate = DateUtil.parseDate("20230428", "yyyyMMdd") + + QueryBuilder date_range = QueryBuilders.rangeQuery("time_local").from(startDate).to(endDate).includeLower(true).includeUpper(false); + def q = QueryBuilders.fuzzyQuery("request", "/enquire") + QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(q) + def houses = ElasticUtils.executeSimpleQuery("192.168.0.25", "fangjia-log*", queryBuilder); + println houses.size() + def set = new HashSet() + if(houses) { + for (def d : houses) { + + } + } + println set + }catch(Exception e){ + e.printStackTrace() + } + + return total +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/GaoDeMapSearchTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/GaoDeMapSearchTest.groovy new file mode 100644 index 000000000..ee95b0621 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/location/GaoDeMapSearchTest.groovy @@ -0,0 +1,556 @@ +package com.fangjia.script.gj.location + +import com.fangjia.core.RegionData +import com.fangjia.core.util.BaiDuApiUtils +import com.fangjia.core.util.GeocodeUtils +import com.fangjia.core.util.HttpRequest +import com.fangjia.script.gj.OpenApiUtils +import com.fangjia.script.gj.district.FangjiaClientUtils +import com.fangjia.script.linxsh.util.AddressUtil +import com.fangjia.script.util.CosineSimilarAlgorithm +import com.fangjia.script.util.ExcelUtils +import com.fangjia.script.util.OpenApiClient +import net.sf.json.JSONObject + +import java.util.regex.Pattern + +class GaoDeMapSearchTest { + + def baiduCityCodeMap = ["±±¾©": "131", "Ìì½ò": "332", "ʯ¼Òׯ": "150", "ÌÆÉ½": "265", "ÇØ»Êµº": "148", "ºªµ¦": "151", "ÐĮ̈": "266", "±£¶¨": "307", "ÕżҿÚ": "264", "³ÐµÂ": "207", "²×ÖÝ": "149", "ÀÈ·»": "191", "ºâË®": "208", "̫ԭ": "176", "´óͬ": "355", "ÑôȪ": "357", "³¤ÖÎ": "356", "½ú³Ç": "290", "Ë·ÖÝ": "237", "½úÖÐ": "238", "Ô˳Ç": "328", "ÐÃÖÝ": "367", "ÁÙ·Ú": "368", "ÂÀÁº": "327", "ºôºÍºÆÌØ": "321", "°üÍ·": "229", "ÎÚº£": "123", "³à·å": "297", "ͨÁÉ": "64", "¶õ¶û¶à˹": "283", "ºôÂ×±´¶û": "61", "°ÍÑåÄ×¶û": "169", "ÎÚÀ¼²ì²¼": "168", "Ð˰²ÃË": "62", "ÎýÁÖ¹ùÀÕÃË": "63", "°¢À­ÉÆÃË": "230", "ÉòÑô": "58", "´óÁ¬": "167", "°°É½": "320", "¸§Ë³": "184", "±¾Ïª": "227", "µ¤¶«": "282", "½õÖÝ": "166", "Óª¿Ú": "281", "¸·ÐÂ": "59", "ÁÉÑô": "351", "Å̽õ": "228", "ÌúÁë": "60", "³¯Ñô": "280", "ºù«µº": "319", "³¤´º": "53", "¼ªÁÖÊÐ": "55", "ËÄÆ½": "56", "ÁÉÔ´": "183", "ͨ»¯": "165", "°×ɽ": "57", "ËÉÔ­": "52", "°×³Ç": "51", "Ñӱ߳¯ÏÊ×å×ÔÖÎÖÝ": "54", "¹þ¶û±õ": "48", "ÆëÆë¹þ¶û": "41", "¼¦Î÷": "46", "º×¸Ú": "43", "˫Ѽɽ": "45", "´óÇì": "50", "ÒÁ´º": "40", "¼Ñľ˹": "42", "Æß̨ºÓ": "47", "ĵµ¤½­": "49", "ºÚºÓ": "39", "Ë绯": "44", "´óÐ˰²ÁëµØÇø": "38", "ÉϺ£": "289", "ÄϾ©": "315", "ÎÞÎý": "317", "ÐìÖÝ": "316", "³£ÖÝ": "348", "ËÕÖÝ": "224", "ÄÏͨ": "161", "Á¬ÔƸÛ": "347", "»´°²": "162", "ÑγÇ": "223", "ÑïÖÝ": "346", "Õò½­": "160", "Ì©ÖÝ": "276", "ËÞǨ": "277", "º¼ÖÝ": "179", "Äþ²¨": "180", "ÎÂÖÝ": "178", "¼ÎÐË": "334", "ºþÖÝ": "294", "ÉÜÐË": "293", "½ð»ª": "333", "áéÖÝ": "243", "ÖÛɽ": "245", "̨ÖÝ": "244", "ÀöË®": "292", "ºÏ·Ê": "127", "Îߺþ": "129", "°ö²º": "126", "»´ÄÏ": "250", "Âí°°É½": "358", "»´±±": "253", "Í­Áê": "337", "°²Çì": "130", "»ÆÉ½": "252", "³üÖÝ": "189", "¸·Ñô": "128", "ËÞÖÝ": "370", "³²ºþ": "251", "Áù°²": "298", "ÙñÖÝ": "188", "³ØÖÝ": "299", "Ðû³Ç": "190", "¸£ÖÝ": "300", "ÏÃÃÅ": "194", "ÆÎÌï": "195", "ÈýÃ÷": "254", "ȪÖÝ": "134", "ÕÄÖÝ": "255", "ÄÏÆ½": "133", "ÁúÑÒ": "193", "ÄþµÂ": "192", "Äϲý": "163", "¾°µÂÕò": "225", "ƼÏç": "350", "¾Å½­": "349", "ÐÂÓà": "164", "ӥ̶": "279", "¸ÓÖÝ": "365", "¼ª°²": "318", "ÒË´º": "278", "¸§ÖÝ": "226", "ÉÏÈÄ": "364", "¼ÃÄÏ": "288", "Çൺ": "236", "×Ͳ©": "354", "Ôæ×¯": "172", "¶«Óª": "174", "ÑĮ̀": "326", "Ϋ·»": "287", "¼ÃÄþ": "286", "Ì©°²": "325", "Íþº£": "175", "ÈÕÕÕ": "173", "À³Îß": "124", "ÁÙÒÊ": "234", "µÂÖÝ": "372", "ÁijÇ": "366", "±õÖÝ": "235", "ºÊÔó": "353", "Ö£ÖÝ": "268", "¿ª·â": "210", "ÂåÑô": "153", "ƽ¶¥É½": "213", "°²Ñô": "267", "º×±Ú": "215", "ÐÂÏç": "152", "½¹×÷": "211", "å§Ñô": "209", "Ðí²ý": "155", "äðºÓ": "344", "ÈýÃÅÏ¿": "212", "ÄÏÑô": "309", "ÉÌÇð": "154", "ÐÅÑô": "214", "ÖÜ¿Ú": "308", "פÂíµê": "269", "Î人": "218", "»ÆÊ¯": "311", "Ê®Ñß": "216", "Ò˲ý": "270", "ÏåÑô": "156", "¶õÖÝ": "122", "¾£ÃÅ": "217", "Т¸Ð": "310", "¾£ÖÝ": "157", "»Æ¸Ô": "271", "ÏÌÄþ": "362", "ËæÖÝ": "371", "¶÷Ê©ÍÁ¼Ò×åÃç×å×ÔÖÎÖÝ": "373", "ÏÉÌÒ": "1713", "DZ½­": "1293", "ÌìÃÅ": "2654", "ÉñÅ©¼ÜÁÖÇø": "2734", "³¤É³": "158", "ÖêÖÞ": "222", "ÏæÌ¶": "313", "ºâÑô": "159", "ÉÛÑô": "273", "ÔÀÑô": "220", "³£µÂ": "219", "Õżҽç": "312", "ÒæÑô": "272", "³»ÖÝ": "275", "ÓÀÖÝ": "314", "»³»¯": "363", "¦µ×": "221", "ÏæÎ÷ÍÁ¼Ò×åÃç×å×ÔÖÎÖÝ": "274", "¹ãÖÝ": "257", "ÉØ¹Ø": "137", "ÉîÛÚ": "340", "Ö麣": "140", "ÉÇÍ·": "303", "·ðɽ": "138", "½­ÃÅ": "302", "Õ¿½­": "198", "ïÃû": "139", "ÕØÇì": "338", "»ÝÖÝ": "301", "÷ÖÝ": "141", "ÉÇβ": "339", "ºÓÔ´": "200", "Ñô½­": "199", "ÇåÔ¶": "197", "¶«Ý¸": "119", "ÖÐɽ": "187", "³±ÖÝ": "201", "½ÒÑô": "259", "ÔÆ¸¡": "258", "ÄÏÄþ": "261", "ÁøÖÝ": "305", "¹ðÁÖ": "142", "ÎàÖÝ": "304", "±±º£": "295", "·À³Ç¸Û": "204", "ÇÕÖÝ": "145", "¹ó¸Û": "341", "ÓñÁÖ": "361", "°ÙÉ«": "203", "ºØÖÝ": "260", "ºÓ³Ø": "143", "À´±ö": "202", "³ç×ó": "144", "º£¿Ú": "125", "ÈýÑÇ": "121", "Îåָɽ": "1644", "Çíº£": "2358", "ÙÙÖÝ": "1215", "ÎIJý": "2758", "ÍòÄþ": "1216", "¶«·½": "2634", "¶¨°²": "1214", "ÍͲý": "1641", "³ÎÂõ": "2757", "ÁÙ¸ß": "2033", "°×ɳÀè×å×ÔÖÎ": "2359", "²ý½­Àè×å×ÔÖÎ": "1642", "ÀÖ¶«Àè×å×ÔÖÎ": "2032", "ÁêË®Àè×å×ÔÖÎ": "1643", "±£Í¤Àè×åÃç×å×ÔÖÎ": "1217", "ÇíÖÐÀè×åÃç×å×ÔÖÎ": "2031", "ÖØÇì": "132", "³É¶¼": "75", "×Ô¹±": "78", "ÅÊÖ¦»¨": "81", "ãòÖÝ": "331", "µÂÑô": "74", "ÃàÑô": "240", "¹ãÔª": "329", "ËìÄþ": "330", "ÄÚ½­": "248", "ÀÖɽ": "79", "Äϳä": "291", "üɽ": "77", "Ò˱ö": "186", "¹ã°²": "241", "´ïÖÝ": "369", "ÑŰ²": "76", "°ÍÖÐ": "239", "×ÊÑô": "242", "°¢°Ó²Ø×åǼ×å×ÔÖÎÖÝ": "185", "¸Ê×βØ×å×ÔÖÎÖÝ": "73", "Á¹É½ÒÍ×å×ÔÖÎÖÝ": "80", "¹óÑô": "146", "ÁùÅÌË®": "147", "×ñÒå": "262", "°²Ë³": "263", "Í­ÈʵØÇø": "205", "Ç­Î÷Äϲ¼ÒÀ×åÃç×å×ÔÖÎÖÝ": "343", "±Ï½ÚµØÇø": "206", "Ç­¶«ÄÏÃç×å¶±×å×ÔÖÎÖÝ": "342", "Ç­Äϲ¼ÒÀ×åÃç×å×ÔÖÎÖÝ": "306", "À¥Ã÷": "104", "Çú¾¸": "249", "ÓñϪ": "106", "±£É½": "112", "ÕÑͨ": "336", "Àö½­": "114", "ÁÙ²×": "110", "³þÐÛÒÍ×å×ÔÖÎÖÝ": "105", "ºìºÓ¹þÄá×åÒÍ×å×ÔÖÎÖÝ": "107", "ÎÄɽ׳×åÃç×å×ÔÖÎÖÝ": "177", "ÆÕ¶ý": "108", "Î÷Ë«°æÄÉ´ö×å×ÔÖÎÖÝ": "109", "´óÀí°××å×ÔÖÎÖÝ": "111", "µÂºê´ö×å¾°ÆÄ×å×ÔÖÎÖÝ": "116", "Å­½­ÀüËÛ×å×ÔÖÎÖÝ": "113", "µÏÇì²Ø×å×ÔÖÎÖÝ": "115", "À­Èø": "100", "²ý¶¼µØÇø": "99", "ɽÄϵØÇø": "97", "ÈÕ¿¦ÔòµØÇø": "102", "ÄÇÇúµØÇø": "101", "°¢ÀïµØÇø": "103", "ÁÖÖ¥µØÇø": "98", "Î÷°²": "233", "Í­´¨": "232", "±¦¼¦": "171", "ÏÌÑô": "323", "μÄÏ": "170", "ÑÓ°²": "284", "ººÖÐ": "352", "ÓÜÁÖ": "231", "°²¿µ": "324", "ÉÌÂå": "285", "À¼ÖÝ": "36", "¼ÎÓø¹Ø": "33", "½ð²ý": "34", "°×Òø": "35", "ÌìË®": "196", "ÎäÍþ": "118", "ÕÅÒ´": "117", "ƽÁ¹": "359", "¾ÆÈª": "37", "ÇìÑô": "135", "¶¨Î÷": "136", "¤ÄÏ": "256", "ÁÙÏÄ»Ø×å×ÔÖÎÖÝ": "182", "¸ÊÄϲØ×å×ÔÖÎÖÝ": "247", "Î÷Äþ": "66", "º£¶«µØÇø": "69", "º£±±²Ø×å×ÔÖÎÖÝ": "67", "»ÆÄϲØ×å×ÔÖÎÖÝ": "70", "º£ÄϲØ×å×ÔÖÎÖÝ": "68", "¹ûÂ岨×å×ÔÖÎÖÝ": "72", "ÓñÊ÷²Ø×å×ÔÖÎÖÝ": "71", "º£Î÷ÃɹÅ×岨×å×ÔÖÎÖÝ": "65", "Òø´¨": "360", "ʯ×ìɽ": "335", "ÎâÖÒ": "322", "¹ÌÔ­": "246", "ÖÐÎÀ": "181", "ÎÚ³ľÆë": "92", "¿ËÀ­ÂêÒÀ": "95", "ͳ·¬µØÇø": "89", "¹þÃܵØÇø": "91", "²ý¼ª»Ø×å×ÔÖÎÖÝ": "93", "²©¶ûËþÀ­ÃɹÅ×ÔÖÎÖÝ": "88", "°ÍÒô¹ùÀãÃɹÅ×ÔÖÎÖÝ": "86", "°¢¿ËËÕµØÇø": "85", "¿Ë×ÎÀÕËտ¶û¿Ë×Î×ÔÖÎÖÝ": "84", "¿¦Ê²µØÇø": "83", "ºÍÌïµØÇø": "82", "ÒÁÀç": "90", "Ëþ³ÇµØÇø": "94", "°¢ÀÕÌ©µØÇø": "96", "ʯºÓ×Ó": "770", "°¢À­¶û": "731", "Í¼Ä¾Êæ¿Ë": "792", "Îå¼ÒÇþ": "789", "Ïã¸ÛÌØ±ðÐÐÕþÇø": "2912", "°ÄÃÅÌØ±ðÐÐÕþÇø": "2911"] + + + static main(args) { + def task = new GaoDeMapSearchTest(); + def path = "D:\\Êý¾Ý\\¹â´ó\\¹â´ó²âÊÔ-V2.xlsx" + +// task.structureV2(path) +// task.match(path) +// task.mapSearch(path) + task.baiduMapSearch(path) + task.checkTrue(path) + } + + def checkTrue(path){ + ExcelUtils.multiThreadingModify(path,{row-> + if(!row['Z']){ + if(row['Q']){ + row['Z'] = "T" + }else{ + if(row['Y']){ + def address = '' + def poi = row['G'] + if(row['E']){ + address = address + row['E'] + } + if(row['F']){ + address = address + row['F'] + } + if(address && isStandardRoad(address)){ + def mapAddr = row['U'] + if(mapAddr && mapAddr.contains(address)){ + row['Z'] = "T" + } + }else if(poi){ + def mapName = row['T'] + if(mapName && mapName==poi){ + row['Z'] = "T" + } + } + } + } + } + }) + } + + + def isStandardRoad(def s){ + def pattern = Pattern.compile("[·|½Ö|´óµÀ|Ïï]\\d+(ºÅ|Ū)"); + def matcher = pattern.matcher(s) + if(matcher.find()){ + return true; + } + return false + } + + + def mapSearch(filePath){ + ExcelUtils.multiThreadingModify(filePath,{row-> + if(!row['M'] && !row['R']){ + def city = row['C'] + def region = row['D'] + def address = '' + def poi = row['G'] + if(row['E']){ + address = address + row['E'] + } + if(row['F']){ + address = address + row['F'] + } + def rets = [] + if(address){ + def ret1 = OpenApiUtils.getGaoDeSearchLocation(city, region, address) + rets.addAll(ret1) + } + if(!rets && poi){ + def ret2 = OpenApiUtils.getGaoDeSearchLocation(city, region, poi) + rets.addAll(ret2) + } + +// if(!map && rets && rets.size()>0){ +// map = rets[0] +// } + + def bdRes = searchMapBySimilar(city, region, poi, address, rets); + if (bdRes) { + row['R'] = bdRes.uid + row['S'] = bdRes.region + row['T'] = bdRes.name + row['U'] = bdRes.address + row['V'] = bdRes.type + row['W'] = bdRes.score + if(bdRes.matchType){ + row['X'] = bdRes.matchType + } + row['Y'] = "¸ßµÂ" + } + } + },0) + } + + + + def findStandardObject(def city, def name, def rets) { + def map; + if (rets) { + if (rets.size() >= 1) { + //ÏàËÆÀïÕÒÓо«È·µØÖ· + for (def mapObj : rets) { + mapObj.address = com.fangjia.script.util.DataUtil.formateAddress(city, mapObj.address); + if (mapObj.address && findPattern(mapObj.address)) { + map = mapObj; + break; + } + } + if(!map){ + //½»´øÓн»²æ¿ÚµØÖ· + for (def mapObj : rets) { + if (mapObj.address && (mapObj.address.contains("½»»ã")||mapObj.address.contains("½»²æ"))) { + if(!mapObj.address.contains("Óë;") && !mapObj.address.startsWith("·") && !mapObj.address.startsWith("·;")){ + map = mapObj; + break; + } + } + } + } + } +// if (!map) { +// map = rets[0] +// } + } + return map; + } + + + def structureV2(path){ + ExcelUtils.multiThreadingModify(path, { row -> + if(row['A']){ + def jsonObj = FangjiaClientUtils.addressStructure(null, row['A']) + if(jsonObj && jsonObj.result){ + if(jsonObj.result.province){ + row['B'] = jsonObj.result.province + } + if(jsonObj.result.city){ + def cityStr = null + if(jsonObj.result.city=="ÊÐÏ½Çø"){ + cityStr = jsonObj.result.province + }else{ + cityStr = jsonObj.result.city + } + row['C'] = RegionData.formatCity(cityStr) + } + + if(jsonObj.result.district){ + row['D'] = jsonObj.result.district + } + + if(jsonObj.result.street){ + row['E'] = jsonObj.result.street + } + + if(jsonObj.result.streetNumber){ + row['F'] = jsonObj.result.streetNumber + } + + if(jsonObj.result.name){ + row['G'] = jsonObj.result.name + } + + if(jsonObj.result.buildingNumber){ + row['H'] = jsonObj.result.buildingNumber + } + + if(jsonObj.result.unitNumber){ + row['I'] = jsonObj.result.unitNumber + } + if(jsonObj.result.roomNumber){ + row['J'] = jsonObj.result.roomNumber + } + + if(jsonObj.result.formatAddress){ + row['K'] = jsonObj.result.formatAddress + } + + if(jsonObj.result.addrVerify){ + row['L'] = jsonObj.result.addrVerify + } + } + } + }) + } + + + + //¿ÉÒÔ¸ù¾Ý²âÊÔÊý¾ÝÌí¼Ó ÍÆ¼öÂ¥ÅÌÃû + def match(path){ + ExcelUtils.modify(path, { row -> + def city = row['C'] + if(city && !row['M']){ + def address = '' + def suggestName = row['G'] + if(row['E']){ + address = address + row['E'] + } + if(row['F']){ + address = address + row['F'] + } + def region = row['D'] + if(!row['M'] && address){ + city = RegionData.formatCity(city) + if(city){ + region = RegionData.formatRegion(city, region) + } + println "[match] city:"+city+" region:"+region+" address:"+address + def jsonObject = OpenApiClient.addressMatch(city, address, null, true, region, suggestName)//"property" + Thread.sleep(2000) + if(jsonObject != null && jsonObject.precise!=-1) { + row['M'] = jsonObject.get("city") + row['N'] = jsonObject.get("district") + row['O'] = jsonObject.get("name") + row['P'] = jsonObject.get("propertyType") + row['Q'] = jsonObject.get("id") + } + } + } + }) + } + + def baiduMapSearch(path){ + ExcelUtils.multiThreadingModify(path, { row -> + if(row['C'] && !row['M'] && !row['R']){ + def city = row['C'] + def region = row['D'] + def address = '' + def poi = row['G'] + if(row['E']){ + address = address + row['E'] + } + if(row['F']){ + address = address + row['F'] + } + def baiduCode = getBaiduMapCode(city); + if(baiduCode){ + def rets = null + if(address && row['G']){ + rets = getBiduSearchDatas(baiduCode , address, row['G'], null) + }else if(row['G']){ + rets = getBiduSearchDatas(baiduCode , null, row['G'], rets) + }else if(address){ + rets = getBiduSearchDatas(baiduCode , null, address, rets) + } + + def bdRes = searchMapBySimilar(city, region, poi, address, rets); + if (bdRes) { + row['R'] = bdRes.uid + row['S'] = bdRes.region + row['T'] = bdRes.name + row['U'] = bdRes.address + row['V'] = bdRes.type + row['W'] = bdRes.score + if(bdRes.matchType){ + row['X'] = bdRes.matchType + } + row['Y'] = "°Ù¶È" + } + println row['B'] +" "+ bdRes + } + } + }); + } + + + def getSimpleAddress(city, address){ + def jsonObj = FangjiaClientUtils.addressStructure(city, address) + def old_addr = "" + def map = [:] + if(jsonObj && jsonObj.result){ + + if(jsonObj.result.province){ + map.pro = jsonObj.result.province + } + + if(jsonObj.result.city){ + if(jsonObj.result.city=="ÊÐÏ½Çø"){ + map.city = jsonObj.result.province + }else{ + map.city = jsonObj.result.city + } + map.city = RegionData.formatCity(map.city) + } + + if(jsonObj.result.district){ + map.region = jsonObj.result.district + } + if(jsonObj.result.street){ + def street = jsonObj.result.street + if(street){ + old_addr = street + map.street = street.replace("½»²æ¿Ú","").replace("½»²æ","") + } + } + if(jsonObj.result.streetNumber){ + def street_number = jsonObj.result.streetNumber + if(street_number){ + old_addr = old_addr + street_number + } + } + } + map.addr = old_addr.replace("½»²æ¿Ú","").replace("½»²æ","") + return map; + } + + def getBaiduMapCode(city){ + if(city){ + return baiduCityCodeMap[city] + } + return city + } + + def getBiduSearchDatas(baiduCode , simpleAddr, nameKey, rets){ + def searchKey = "" + if(simpleAddr){ + searchKey = simpleAddr +" "+nameKey + }else{ + searchKey = nameKey + } + def datas = searchBaiDuMap(searchKey, baiduCode.toInteger()); + if(!rets){ + return datas; + }else{ + def ids = [] + for(def r : rets){ + if(!ids.contains(r.uid)){ + ids << r.uid + } + } + for(def d : datas){ + if(!ids.contains(d.uid)){ + rets << d + } + } + return rets; + } + return null; + } + + + static def searchBaiDuMap(String address, int cityCode) { + def rets = [] + try { + Thread.sleep(500) + // String url = "https://map.baidu.com/?newmap=1&reqflag=pcmap&biz=1&from=webmap&da_par=baidu&pcevaname=pc4.1&qt=s&da_src=searchBox.button&wd="+URLEncoder.encode(address,"UTF-8")+"&c=${cityCode}&src=0&wd2=&pn=0&sug=0&l=11&from=webmap&sug_forward=&device_ratio=1&tn=B_NORMAL_MAP&nn=0&u_loc=13509900,3640104&ie=utf-8&t=${System.currentTimeMillis()}&&auth=Dae1RaNR1LK8xdJTxN8SQOTRa2AH%3DL7vuxLNVENTxRBt6BG6B6WJWwGvzBU%40yYxvkGcuVtvvhguVtvyheuVtcvY1SGpuLtB2QKAZzvCQMuVtvIPcuxtw8wkv7uvZgMuVtv%40vcuVtvc3CuVtvcPPuztxgHxwBVDzvFosSE21wiKDv7uvhgMuzVVtvrMhuENLtSrrlrIKHf0wd0vyMO7FOUySy&seckey=Im7p%2FanwNmQx078ijew%2FsyQrDC7YJnynqrZ43JVFlM0%3D%2C0-Ulo82T3hd3wuKMf_tTM-ZXYa3S1Y21RX3DV_l5MHgI_1U55ZQrzxTIKi3BRb2x59mVOurDjnW_8CwMEmjK3y8JfHyV0kv70GMQXxnIEcHpM3Dqhs5EdrN6ciDtoxyrcRfowp_xTBkEgU49ZrCz2KeLyujCOypqjKS3rAmPOfEp1kIZPD4W6RDQzrsWTe7a"; + String url = "https://map.baidu.com/?newmap=1&reqflag=pcmap&biz=1&from=webmap&da_par=after_baidu&pcevaname=pc4.1&qt=s&da_src=searchBox.button&wd="+URLEncoder.encode(address,"UTF-8")+"&c=${cityCode}&src=0&wd2=&pn=0&sug=0&l=19&from=webmap&sug_forward=&auth=E8LCawOwRbEOx6JVTvCIBI6W7zSz5vSXuxLNVENTRVLtUDHUDUYKYyHxzBU%40yYxvkGcuVtvvhguVtvyheuVtvCMGuVtvCQMuVtvIPcuxtw8wkv7uvZgMuVtv%40vcuVtvc3CuVtvcPPuztxgHxwDWBWvveh3uxtwiKDv7uvhgMuzVVtcvY1SGpuxRtKHZz3VP8JSrrlrIKHf0wd0vyMO7FOUS7F&seckey=Im7p%2FanwNmQx078ijew%2FsyQrDC7YJnynqrZ43JVFlM0%3D%2C0-Ulo82T3hd3wuKMf_tTM-ZXYa3S1Y21RX3DV_l5MHgI_1U55ZQrzxTIKi3BRb2x59mVOurDjnW_8CwMEmjK3y8JfHyV0kv70GMQXxnIEcHpM3Dqhs5EdrN6ciDtoxyrcRfowp_xTBkEgU49ZrCz2KeLyujCOypqjKS3rAmPOfEp1kIZPD4W6RDQzrsWTe7a&device_ratio=2&tn=B_NORMAL_MAP&nn=0&u_loc=13513133,3631861&ie=utf-8&t=${System.currentTimeMillis()}&newfrom=zhuzhan_webmap" + def content = new HttpRequest().get(url, null, "utf-8") + JSONObject json = JSONObject.fromObject(content) + if (json && json.content && json.content.size() > 0) { + for (def loc : json.content) { +// String name = formatName(address) + def x = loc.x + def y = loc.y + if(x){ + x = x/100 + } + if(y){ + y = y/100 + } + if(x && y){ + def locJson = BaiDuApiUtils.geoconv(x, y, 6) + if(locJson){ + def baiduCity = RegionData.parseCityInAddress(loc.area_name) + def bean = [:] +// def lng2 = locJson.get("x") +// def lat2 = locJson.get("y") +// def gmap = GeocodeUtils.geoconvBaiduToGoogle(lng2, lat2) +// def lng = gmap.get("lng") +// def lat = gmap.get("lat") + bean.uid = loc.uid +// bean.baidu_lng2 = lng2 +// bean.baidu_lat2 = lat2 +// bean.longitude = lng +// bean.latitude = lat + bean.name = loc.name +// if(loc.address_norm){ +// bean.address = getAddressInfo(loc.address_norm, loc.addr); +// } + bean.address = loc.addr + + if(!baiduCity){ + baiduCity = RegionData.formatCity(loc.city_name) + } + bean.cityname = baiduCity + if(loc.city_name){ + def regionStr = loc.area_name.replace(loc.city_name, "") + def baiduRegion = RegionData.formatRegion(baiduCity, regionStr); + bean.region = baiduRegion + } + + if(loc.std_tag){ + bean.type = loc.std_tag + } + bean.flag = loc.acc_flag + rets << bean; + } + } + } + } + } catch(Exception e) { + searchBaiDuMap(address, cityCode) + } + return rets; + } + + + def searchMapBySimilar(def city, def region, def newKey, def inpAddr, def rets){ + def bo = null; + if(rets){ + def maxScore = 0; + if(!bo || !maxScore){ + for(def o :rets){ + def addr = o.address + def mapKey = o.name + if(mapKey){ + def score = 0 + def nameScore = 0 + if(newKey){ + nameScore = CosineSimilarAlgorithm.getSimilarityRatio(mapKey, newKey); + } + + def addr_score = 0 + if(inpAddr) { + def baidu_addr_map = getSimpleAddress(o.cityname, o.address) + if(!baidu_addr_map.addr){ + baidu_addr_map.addr = AddressUtil.formatAddress(o.cityname, o.address) + } +// def baidu_addr_map = AddressUtil.formatAddress(o.cityname, o.address) + if(!baidu_addr_map.addr){ + if(o.region && !region.contains(o.region)){ + continue; + } + if(city!=o.cityname){ + continue; + } + } + if (baidu_addr_map.addr) { + if(baidu_addr_map.addr.contains("Óë")){ + def arrs = baidu_addr_map.addr.split("Óë") + for(def s1 : arrs){ + def temp_addr_score = CosineSimilarAlgorithm.getSimilarityRatio(inpAddr, s1); + if(temp_addr_score > addr_score && (inpAddr.contains(baidu_addr_map.addr) || baidu_addr_map.addr.contains(inpAddr))){ + addr_score = temp_addr_score + } + } + }else{ + addr_score = CosineSimilarAlgorithm.getSimilarityRatio(inpAddr, baidu_addr_map.addr); + if(addr_score>0 && inpAddr && baidu_addr_map.street && !inpAddr.contains(baidu_addr_map.street) && !baidu_addr_map.street.contains(inpAddr)){ + addr_score = 0 + } + } + + } + } + + if(addr_score>0 && score==0){ + addr_score = addr_score/2 + } + def total_score = nameScore + addr_score +// if(city==o.cityname){ + if(total_score > maxScore){ + maxScore = total_score; + o.city = o.cityname + bo = o + bo.score = maxScore + + def list = [] + if(addr_score>0){ + list << "µØÖ·ÓйØ" + } + if(nameScore>0){ + list << "Ãû³ÆÏàËÆ" + } + if(list){ + o.matchType = list.join(",") + } + } +// if(bo && score!=1){ +// if(inpAddr){ +// def baidu_addr = getSimpleAddress(o.cityname, o.old_addr) +// if(baidu_addr){ +// def addr_score = CosineSimilarAlgorithm.getSimilarityRatio(inpAddr, baidu_addr); +// //if(addr_score==1){ +// // o.matchType = "³ÇÊÐÏàͬ£¬Ãû³ÆÏàËÆ£¬µØÖ·ÓйØ" +// bo.score = bo.score + addr_score +// maxScore = bo.score; +// //} +// } +// } + +// for(def word : filters){ +// if(mapKeyName.toString().endsWith(word)){ +// mapKeyName = mapKeyName.replace(word, "") +// } +// if(newName.toString().endsWith(word)){ +// newName = newName.replace(word, ""); +// } +// } +// +// +// if(mapKeyName && newName && mapKeyName.length()>=2){ +// score = CosineSimilarAlgorithm.getSimilarityRatio(mapKeyName, newName); +// if(score > maxScore){ +// maxScore = score +// o.matchType = "Ãû³ÆÏàËÆ" +// o.city = obj.city +// bo = o +// bo.score = maxScore +// }else{ +// if(mapKeyName.length() == newName.length()){ +// def mapKeyNameBY = com.fangjia.core.util.DataUtil.hanyuQuanpin(mapKeyName, " ") +// def newNameBY = com.fangjia.core.util.DataUtil.hanyuQuanpin(newName, " ") +// if(mapKeyNameBY == newNameBY){ +// maxScore = 0.977; +// o.matchType = "Æ´ÒôÏàËÆ" +// o.city = obj.city +// bo = o +// bo.score = maxScore +// } +// } +// } +// } +// } +// } + } + } + } + } + return bo; + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/BeiKeCrawlByChrome.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/BeiKeCrawlByChrome.groovy index b63201d66..4961abd56 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/BeiKeCrawlByChrome.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/BeiKeCrawlByChrome.groovy @@ -3,6 +3,7 @@ package com.fangjia.script.gj.paimai import com.fangjia.core.RegionData import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.crawl.JQueryUtils +import com.fangjia.script.gj.ccb.FileUtils import com.fangjia.script.thirdPriceCrawl.CrawalDBUtil import com.fangjia.script.util.DateUtils import com.fangjia.script.util.MongoUtils @@ -32,13 +33,14 @@ public class BeiKeCrawlByChrome { def DBCollection thirdPartyColl = CrawalDBUtil.getThirdPartyCol(); def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) - def startMonth = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -2, "yyyy-MM") + def startMonth = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -1, "yyyy-MM") + //¹ãÖÝ£¬·ðɽ ÖØÇì static main(args) { def task = new BeiKeCrawlByChrome(); task.run() // task.run1() - task.addDealRegion(); +// task.addDealRegion(); } @@ -49,27 +51,8 @@ public class BeiKeCrawlByChrome { WebDriver driver = new ChromeDriver() def citys = getAllCityUrls(driver) -// citys = citys.reverse() -// def index = 0 -// for(def c : citys){ -// index++ -// if(c.city=="ºÏ·Ê"){ -// break -// } -// } -// citys = citys[index..citys.size()-1] - def start = 0 -// for(def i=0;iµÇ¼"))){ + driver = getLogin(driver, url) + driver.get(url) + Thread.sleep(5000) + s = driver.getPageSource() + }else{ + flag = false + } + } + return Jsoup.parse(s); + } + def crawlData(driver, citys){ def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) + def runedCitys = FileUtils.readTxt("d:\\Êý¾Ý\\³É½»×¥È¡\\±´¿ÇÒÑ×¥³ÇÊÐ.txt") + for(def m : citys){ - driver.get(m.url+"/chengjiao/") + def city = m[0] + if(runedCitys.contains(city)){ + println city +" ÒÑÔËÐÐ" + continue + } + def url = m[1] + def newUrl = url+"/chengjiao/" + driver.get(newUrl) Thread.sleep(10000) - def doc = Jsoup.parse(driver.getPageSource()); + def doc = checkDocument(driver, newUrl); def regions = JQueryUtils.select(".position dl:contains(λÖÃ)+dl a", doc) if(regions){ for(def r : regions){ def regionText = r.text() - def href = m.url+ r.attr("href") + def href = url+ r.attr("href") - println "¿ªÊ¼×¥È¡¡¾${m.city}¡¿¡¾${regionText}¡¿¡¾${href}¡¿" - def detailUrls = getPageDeail(driver, m.city, href, regionText) - println m.url +" ÏêÇéÁ´½Ó£º"+detailUrls.size() + println "¿ªÊ¼×¥È¡¡¾${city}¡¿¡¾${regionText}¡¿¡¾${href}¡¿" + def detailUrls = getPageDeail(driver, city, href, regionText) + println url +" ÏêÇéÁ´½Ó£º"+detailUrls.size() } } - + FileUtils.batchCreateFile([[city]], "d:\\Êý¾Ý\\³É½»×¥È¡\\±´¿ÇÒÑ×¥³ÇÊÐ.txt", [], "utf-8", true); // def detailUrls = getPageDeail(driver, m.city, m.url) // println m.city +" ÏêÇéÁ´½Ó£º"+detailUrls.size() // crawlDetail(driver, DEAL_PRICE_COLL, detailUrls) + } } @@ -170,20 +179,16 @@ public class BeiKeCrawlByChrome { def detailUrls = [] while(!stop){ def url = cityUrl + "pg${page}/" - try{ - driver.get(url) - }catch(Exception e){ - println url +" ³ö´í" - } - - def doc = Jsoup.parse(driver.getPageSource()); + driver.get(url) +// def doc = Jsoup.parse(driver.getPageSource()); + def doc = checkDocument(driver, url); def elements = JQueryUtils.select(".listContent li", doc) if(elements){ for(def e : elements){ def durl = e.select(".title a").attr("href") def dealDate = e.select(".dealDate").text() dealDate = DateUtils.parseFromTightByPattern(dealDate, "yyyy.MM.dd") - def endDate = DateUtils.parseFromTightByPattern(startMonth + "-20", "yyyy-MM-dd") + def endDate = DateUtils.parseFromTightByPattern(startMonth + "-01", "yyyy-MM-dd") if(dealDate && dealDate.getTime()>=endDate.getTime()){ detailUrls << durl parse(city, e, region) @@ -218,6 +223,9 @@ public class BeiKeCrawlByChrome { } def roomStr = arrs[1] + if(roomStr && !roomStr.contains("ÊÒ")){ + roomStr = arrs[2] + } if (roomStr) { if (roomStr.indexOf("ÊÒ") > 0) { roomStr = roomStr.substring(0, roomStr.indexOf("ÊÒ")) @@ -233,14 +241,20 @@ public class BeiKeCrawlByChrome { } } - def areaStr = arrs[2].replace("ƽÃ×", "") + def areaStr = arrs[2] + if(areaStr && !areaStr.contains("ƽÃ×")){ + if(arrs.size()>=4){ + areaStr = arrs[3] + } + } + areaStr = areaStr.replace("ƽÃ×","") if (areaStr && areaStr.isNumber()) { detail.area = areaStr.toDouble() } def price = e.select(".totalPrice .number").text() if (price && price.isNumber()) { - detail.total_price = price.toInteger() * 10000 + detail.total_price = (int)(price.toDouble() * 10000) } if (detail.total_price && detail.area) { @@ -251,26 +265,29 @@ public class BeiKeCrawlByChrome { detail.trade_date = DateUtils.parseFromTightByPattern(tradeStr, "yyyy.MM.dd") } detail.source = "±´¿ÇÕÒ·¿" - def detailUrl = e.select(".title a").attr("href") - detail.url = detailUrl - def dbo = findTrade(detail) - if (!dbo) { - def houseInfo = e.select(".houseInfo").text() - def houseInfos = houseInfo.split("\\|") - detail.direction = houseInfos[0] - detail.fitment = houseInfos[1] - def floorStr = e.select(".positionInfo").text() - if (floorStr && floorStr.contains("¹²") && floorStr.contains("²ã)")) { - floorStr = floorStr.substring(floorStr.indexOf("¹²") + 1, floorStr.indexOf("²ã)")) - if (floorStr && floorStr.isNumber()) { - detail.height = floorStr.toInteger() - } - } - detail.create_date = new Date() - detail.m_date = new Date() - println detail - DEAL_PRICE_COLL.save(detail) + if(detail.total_price && detail.avg_price){ + def detailUrl = e.select(".title a").attr("href") + detail.url = detailUrl + def dbo = findTrade(detail) + if (!dbo) { + def houseInfo = e.select(".houseInfo").text() + def houseInfos = houseInfo.split("\\|") + detail.direction = houseInfos[0] + detail.fitment = houseInfos[1] + def floorStr = e.select(".positionInfo").text() + if (floorStr && floorStr.contains("¹²") && floorStr.contains("²ã)")) { + floorStr = floorStr.substring(floorStr.indexOf("¹²") + 1, floorStr.indexOf("²ã)")) + if (floorStr && floorStr.isNumber()) { + detail.height = floorStr.toInteger() + } + } + + detail.create_date = new Date() + detail.m_date = new Date() + println detail + DEAL_PRICE_COLL.save(detail) + } } } }catch(Exception ex){ @@ -395,40 +412,45 @@ public class BeiKeCrawlByChrome { def cityDoc = Jsoup.parse(driver.getPageSource()); def cityEles = JQueryUtils.select(".city_list_ul .city_province a", cityDoc) def list = [] + def citys = ["¸£ÖÝ"] if(cityEles){ for(def e : cityEles){ - def href = e.attr("href") -// if(e.text().contains("ºÏ·Ê")){ - def cityMap = [:] - cityMap.city = e.text() - cityMap.url = "https:"+href - list << cityMap -// cityMap.put(e.text(), "https:"+href) + def href = "https:"+e.attr("href") +// if (citys.contains(e.text())){ + list << [e.text(), href] // } } } return list } - def getLogin(driver){ - driver.get("https://clogin.ke.com/login?service=https%3A%2F%2Fwww.ke.com%2Fuser%2Fchecklogin%3Fredirect%3Dhttps%253A%252F%252Fsh.ke.com%252Fchengjiao%252F"); + def getLogin(driver, url){ +// WebDriver driver = new ChromeDriver() + def root = url.toString().substring(url.toString().indexOf("//")+2, url.toString().indexOf(".com")+4) + driver.get("https://clogin.ke.com/login?service=https%3A%2F%2Fwww.ke.com%2Fuser%2Fchecklogin%3Fredirect%3Dhttps%253A%252F%252F"+root+"%252Fchengjiao%252F"); WebDriverWait wait = new WebDriverWait(driver,20) Thread.sleep(10000) - wait.until(ExpectedConditions.visibilityOf(driver.findElement(By.className("username")))); + try{ + wait.until(ExpectedConditions.visibilityOf(driver.findElement(By.className("username")))); - WebElement elemUsername = driver.findElement(By.id("username")); //»ñÈ¡Óû§Ãû¿ò + WebElement elemUsername = driver.findElement(By.id("username")); //»ñÈ¡Óû§Ãû¿ò - WebElement elemPassword = driver.findElement(By.id("password")); //»ñÈ¡ÃÜÂë¿ò + WebElement elemPassword = driver.findElement(By.id("password")); //»ñÈ¡ÃÜÂë¿ò - WebElement btn = driver.findElement(By.cssSelector("button[class='ant-btn btn-login ant-btn-primary']")); //»ñÈ¡µã»÷µÇ½°´Å¥¡£ + WebElement btn = driver.findElement(By.cssSelector("button[class='ant-btn btn-login ant-btn-primary']")); //»ñÈ¡µã»÷µÇ½°´Å¥¡£ - elemUsername.sendKeys("15021384995"); + elemUsername.sendKeys("15021384995"); - elemPassword.sendKeys("12qwaszx"); + elemPassword.sendKeys("12qwaszx"); - btn.submit(); // µã»÷ÐÐΪ£» + btn.submit(); // µã»÷ÐÐΪ£» + Thread.sleep(10000) + }catch(Exception e){ + Thread.sleep(10000) + } + return driver } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/LianjiaCrawlByChrome.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/LianjiaCrawlByChrome.groovy index c902929c4..aaf0c9c0d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/LianjiaCrawlByChrome.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/paimai/LianjiaCrawlByChrome.groovy @@ -3,6 +3,7 @@ package com.fangjia.script.gj.paimai import com.fangjia.core.RegionData import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.crawl.JQueryUtils +import com.fangjia.script.gj.ccb.FileUtils import com.fangjia.script.thirdPriceCrawl.CrawalDBUtil import com.fangjia.script.util.DateUtils import com.fangjia.script.util.MongoUtils @@ -31,14 +32,14 @@ public class LianjiaCrawlByChrome { def DBCollection thirdPartyColl = CrawalDBUtil.getThirdPartyCol(); def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) - def startMonth = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -2, "yyyy-MM") + def startMonth = DateUtils.addMonth(DateUtils.formatDateByPattern(new Date(), "yyyy-MM"), -1, "yyyy-MM") static main(args) { def task = new LianjiaCrawlByChrome(); task.run() // task.run1() // task.addDealRegion(); - task.standardRegion() +// task.standardRegion() // task.updadteDealPriceField() } @@ -117,14 +118,14 @@ public class LianjiaCrawlByChrome { } def run(){ + System.setProperty("webdriver.chrome.driver", "D:\\Program Files\\chrome-driver\\chromedriver.exe"); System.setProperty("http.nonProxyHosts", "localhost"); WebDriver driver = new ChromeDriver() def cityMap = getAllCityUrls(driver) - getLogin(driver) +// cityMap = cityMap.reverse() + driver = getLogin(driver, "https://sh.lianjia.com/") crawlData(driver, cityMap) - - } def standardRegion(){ @@ -184,13 +185,24 @@ public class LianjiaCrawlByChrome { } } - def crawlData(driver, cityMap){ + def crawlData(driver, cityList){ def lineUrl = "mongodb://developer:G00IDCDEV12385@192.168.0.43:28017"; DBCollection DEAL_PRICE_COLL = MongoUtils.getCollectionByName2("fangjia", "deal_price", lineUrl) - cityMap.each{city, cityUrl-> + def runedCitys = FileUtils.readTxt("d:\\Êý¾Ý\\³É½»×¥È¡\\Á´¼ÒÒÑ×¥³ÇÊÐ.txt") + + for(def ret : cityList){ + def city = ret[0] + if(runedCitys.contains(city)){ + println city +" ÒÑÔËÐÐ" + continue + } + def cityUrl = ret[1] + def newUrl = cityUrl+"chengjiao/" + driver.get(newUrl) //def detailUrls = getPageUrls(driver, cityUrl) - driver.get(cityUrl+"chengjiao/") - def doc = Jsoup.parse(driver.getPageSource()); + Thread.sleep(10000) + def doc = checkDocument(driver, newUrl); + def regions = JQueryUtils.select(".position dl:contains(λÖÃ)+dl a", doc) if(regions){ for(def r : regions){ @@ -203,6 +215,8 @@ public class LianjiaCrawlByChrome { } } // crawlDetail(driver, DEAL_PRICE_COLL, detailUrls) + + FileUtils.batchCreateFile([[city]], "d:\\Êý¾Ý\\³É½»×¥È¡\\Á´¼ÒÒÑ×¥³ÇÊÐ.txt", [], "utf-8", true); } } @@ -236,6 +250,21 @@ public class LianjiaCrawlByChrome { return detailUrls } + def checkDocument(driver, url){ + def s = driver.getPageSource() + def flag = true + while(flag){ + if(s && (s.contains("ÎÞ·¨·ÃÎÊ´ËÍøÕ¾") || s.contains("µÇ¼"))){ + driver = getLogin(driver, url) + driver.get(url) + Thread.sleep(5000) + s = driver.getPageSource() + }else{ + flag = false + } + } + return Jsoup.parse(s); + } def getPageDeail(driver, city, cityUrl, regionText){ def stop = false @@ -244,14 +273,15 @@ public class LianjiaCrawlByChrome { while(!stop){ def url = cityUrl + "pg${page}/" driver.get(url) - def doc = Jsoup.parse(driver.getPageSource()); + //def detailUrls = getPageUrls(driver, cityUrl) + def doc = checkDocument(driver, url); def elements = JQueryUtils.select(".listContent li", doc) if(elements){ for(def e : elements){ def durl = e.select(".title a").attr("href") def dealDate = e.select(".dealDate").text() dealDate = DateUtils.parseFromTightByPattern(dealDate, "yyyy.MM.dd") - def endDate = DateUtils.parseFromTightByPattern(startMonth + "-20", "yyyy-MM-dd") + def endDate = DateUtils.parseFromTightByPattern(startMonth + "-01", "yyyy-MM-dd") if(dealDate.getTime()>=endDate.getTime()){ detailUrls << durl parse(city, e, regionText) @@ -274,7 +304,7 @@ public class LianjiaCrawlByChrome { def parse(city,e, regionText){ try { - def title = e.select(".title a").text() + def title = e.select(".title a").text() if (title) { def detail = new BasicDBObject() def arrs = title.split(" ") @@ -314,9 +344,9 @@ public class LianjiaCrawlByChrome { } } - def price = e.select(".totalPrice .number").text() + def price = e.select(".totalPrice .number").text() if (price && price.isNumber()) { - detail.total_price = price.toInteger() * 10000 + detail.total_price = (int)(price.toDouble() * 10000) } if (detail.total_price && detail.area) { @@ -328,25 +358,29 @@ public class LianjiaCrawlByChrome { } detail.source = "Á´¼ÒÔÚÏß" detail.url = e.select(".title a").attr("href") - def dbo = findTrade(detail) - if (!dbo) { - def houseInfo = e.select(".houseInfo").text() - def houseInfos = houseInfo.split("\\|") - detail.direction = houseInfos[0] - detail.fitment = houseInfos[1] - def floorStr = e.select(".positionInfo").text() - if (floorStr && floorStr.contains("¹²") && floorStr.contains("²ã)")) { - floorStr = floorStr.substring(floorStr.indexOf("¹²") + 1, floorStr.indexOf("²ã)")) - if (floorStr && floorStr.isNumber()) { - detail.height = floorStr.toInteger() - } - } - detail.create_date = new Date() - detail.m_date = new Date() - println detail - DEAL_PRICE_COLL.save(detail) + if(detail.total_price && detail.avg_price){ + def dbo = findTrade(detail) + if (!dbo) { + def houseInfo = e.select(".houseInfo").text() + def houseInfos = houseInfo.split("\\|") + detail.direction = houseInfos[0] + detail.fitment = houseInfos[1] + def floorStr = e.select(".positionInfo").text() + if (floorStr && floorStr.contains("¹²") && floorStr.contains("²ã)")) { + floorStr = floorStr.substring(floorStr.indexOf("¹²") + 1, floorStr.indexOf("²ã)")) + if (floorStr && floorStr.isNumber()) { + detail.height = floorStr.toInteger() + } + } + + detail.create_date = new Date() + detail.m_date = new Date() + println detail + DEAL_PRICE_COLL.save(detail) + } } + } } }catch(Exception ex){ @@ -469,38 +503,43 @@ public class LianjiaCrawlByChrome { Thread.sleep(8000) def cityDoc = Jsoup.parse(driver.getPageSource()); def cityEles = JQueryUtils.select(".city_province a", cityDoc) - def cityMap = [:] + def cityList = [] def citys= ["¸£ÖÝ"] if(cityEles){ for(def e : cityEles) { def href = e.attr("href") - if (!href.contains("fang.lianjia")){ - cityMap.put(e.text(), href) - } +// if (!href.contains("fang.lianjia") && citys.contains(e.text())){ + cityList << [e.text(), href] +// } } } - return cityMap + return cityList } - def getLogin(driver){ - driver.get("https://clogin.lianjia.com/login?service=https%3A%2F%2Fwww.lianjia.com%2Fuser%2Fchecklogin%3Fredirect%3Dhttps%253A%252F%252Fsh.lianjia.com%252Fchengjiao%252F"); + def getLogin(driver, url){ +// WebDriver driver = new ChromeDriver() + def root = url.toString().substring(url.toString().indexOf("//")+2, url.toString().indexOf(".com")+4) + driver.get("https://clogin.lianjia.com/login?service=https%3A%2F%2Fwww.lianjia.com%2Fuser%2Fchecklogin%3Fredirect%3Dhttps%253A%252F%252F"+root+"%252Fchengjiao%252F"); WebDriverWait wait = new WebDriverWait(driver,20) Thread.sleep(10000) - wait.until(ExpectedConditions.visibilityOf(driver.findElement(By.className("username")))); + try{ + wait.until(ExpectedConditions.visibilityOf(driver.findElement(By.className("username")))); + WebElement elemUsername = driver.findElement(By.id("username")); //»ñÈ¡Óû§Ãû¿ò + WebElement elemPassword = driver.findElement(By.id("password")); //»ñÈ¡ÃÜÂë¿ò - WebElement elemUsername = driver.findElement(By.id("username")); //»ñÈ¡Óû§Ãû¿ò + WebElement btn = driver.findElement(By.cssSelector("button[class='ant-btn btn-login ant-btn-primary']")); //»ñÈ¡µã»÷µÇ½°´Å¥¡£ - WebElement elemPassword = driver.findElement(By.id("password")); //»ñÈ¡ÃÜÂë¿ò + elemUsername.sendKeys("15021384995"); - WebElement btn = driver.findElement(By.cssSelector("button[class='ant-btn btn-login ant-btn-primary']")); //»ñÈ¡µã»÷µÇ½°´Å¥¡£ + elemPassword.sendKeys("12qwaszx"); - - elemUsername.sendKeys("15021384995"); - - elemPassword.sendKeys("12qwaszx"); - - btn.submit(); // µã»÷ÐÐΪ£» + btn.submit(); // µã»÷ÐÐΪ£» + Thread.sleep(10000) + }catch(Exception e){ + Thread.sleep(10000) + } + return driver } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/poc/AddPriceTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/poc/AddPriceTest.groovy new file mode 100644 index 000000000..f419acf6d --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/poc/AddPriceTest.groovy @@ -0,0 +1,132 @@ +package com.fangjia.script.gj.poc + +import com.fangjia.script.ccbevaluation.CcbCommonUtils +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.util.ExcelUtils +import com.fangjia.script.util.MongoUtils +import com.mongodb.BasicDBObject +import com.mongodb.DBCollection +import groovy.sql.Sql + +class AddPriceTest { + + def pgsqlInstance = Sql.newInstance("jdbc:postgresql://192.168.0.236:5432/warehouse", + "postgres", "postgres", "org.postgresql.Driver") + + static final DBCollection AVERAGE_STATISTICS = MongoUtils.getCollectionByName("fangjia", "average_statistics", "192.168.0.43") + public static final DBCollection confirm_price_date = MongoUtils.getCollectionByName("fangjia", "confirm_price_data", "mongo.db.fangjia.com") + + static main(args) { + def task = new AddPriceTest(); + task.run(); + } + def run(){ + def filePath = "C:\\Users\\gaojuan\\Desktop\\ÉîÛÚÕþ¸®Ö¸µ¼¼Û.xlsx" + addGXDPrice(filePath) +// addCcbPrice(filePath) +// addThirdPrice(filePath) + + } + + + def addCcbPrice(filepath){ + def cityCodeDataMap = CcbCommonUtils.findCityCodeValue() + ExcelUtils.multiThreadingModify(filepath,{ d-> + if(d['M']){ + def cityId = cityCodeDataMap.get(d['N']) + def map = findAvgPrice(d['M'], cityId) + if(map){ + d['AK'] = map.avg_price + d['AL'] = map.calc_type + d['AM'] = map.credit_value + } + } + }) + } + + + def findAvgPrice(def commid, def cityid){ + def sql = "SELECT gujia_bds_clc_avprc,gujia_bds_clmtd,gujiabds_clc_yrmo_val,gujia_bds_cfdc_dgr from t_app_p9pha_plda.avm_community_base_price_gj_h where urbn_id='${cityid}' and gujia_bds_id='${commid}' order by gujiabds_clc_yrmo_val desc limit 1" + def map = [:] + pgsqlInstance.eachRow(sql, { r -> + map.avg_price = r.gujia_bds_clc_avprc + map.type = r.gujia_bds_clmtd + map.month = r.gujiabds_clc_yrmo_val + map.credit_value = r.gujia_bds_cfdc_dgr + if(r.gujia_bds_clmtd == 1){ + map.calc_type = "È˹¤¹ÀÖµ" + }else if(r.gujia_bds_clmtd == 2){ + map.calc_type = "Ñù±¾¼ÆËã" + }else if(r.gujia_bds_clmtd == 3){ + map.calc_type = "Éñ¾­ÍøÂç" + } + }) + return map + } + + + def addThirdPrice(filepath){ + ExcelUtils.multiThreadingModify(filepath, { d -> + if (d['M']) { + def dist = CommonDatautils.findDistrictById(d['M']) + if(dist){ + def thirdPrice = findThirdPartyPrice(dist.city, dist.region, dist.name) + d['AN'] = thirdPrice + } + } + }) + } + + + def findThirdPartyPrice(def city, def region, def name){ + def q = new BasicDBObject() + q.put("city", city) + q.put("region", region) + q.put("name", name) + q.put("s_date", new BasicDBObject('$gte', 202212).append('$lte',202302)) + + def dbcursor = AVERAGE_STATISTICS.find(q).sort(new BasicDBObject("s_date", -1)) + def price = null + for(def db : dbcursor){ + if(!price && db.lianjia_esf_price && db.lianjia_esf_price>2000){ + price = db.lianjia_esf_price + break; + } + + if(!price && db.beike_esf_price && db.beike_esf_price>2000){ + price = db.beike_esf_price + break + } + } + return price + } + + + def addGXDPrice(filepath){ + ExcelUtils.multiThreadingModify(filepath, { d -> + if (d['B']) { +// def dist = CommonDatautils.findDistrictById(d['B']) +// if(dist){ +// def gxdPrice = findGXDPrice(dist.city, dist.region, dist.name) + def gxdPrice = findGXDPrice(d['D'], d['E'], d['C']) + d['G'] = gxdPrice +// } + } + }) + } + + def findGXDPrice(def city, region, name){ + + def q = new BasicDBObject() + q.put("city", city) + q.put("region", region) + q.put("district_name", name) + q.put("source", "GXD") + def dbcursor = confirm_price_date.find(q).sort(new BasicDBObject("c_date", -1)).limit(1) + def price = null + for(def d : dbcursor){ + price = d.price + } + return price + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/poc/RentPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/poc/RentPrice.groovy new file mode 100644 index 000000000..73a7cf8b9 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/poc/RentPrice.groovy @@ -0,0 +1,84 @@ +package com.fangjia.script.gj.poc + +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.util.ElasticUtils +import com.fangjia.script.util.ExcelUtils +import org.elasticsearch.index.query.BoolQueryBuilder +import org.elasticsearch.index.query.QueryBuilder +import org.elasticsearch.index.query.QueryBuilders + +class RentPrice { + + static main(args) { + def task = new RentPrice(); + task.run("D:\\Êý¾Ý\\ÕÐÉÌ\\Â¥ÅÌPOC²âÊÔÑùÀýµØÖ·.xlsx"); + } + def run(filepath){ + def index = 0 + ExcelUtils.multiThreadingModify(filepath, { d -> + index++ + if(d['M']){ + def dist = CommonDatautils.findDistrictById(d['M']) + if(dist){ + d['AZ'] = findHouses(dist.city, dist.region, "rent", 20221201,20230330, dist.name, dist.alias) + } + println index + " "+ d['AZ'] + } + + }) + } + + + def findHouses(def city, def region, def cat, def startDate, def endDate, def name, def alias){ + + QueryBuilder date_range = QueryBuilders.rangeQuery("p_date").from(startDate).to(endDate).includeLower(true).includeUpper(false); + QueryBuilder area_range = QueryBuilders.rangeQuery("area").from(20).to(500).includeLower(true).includeUpper(false); + + QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(QueryBuilders.termQuery("city", city)).must(QueryBuilders.termQuery("region", region)).must(QueryBuilders.termQuery("cat", cat)) + .must(date_range).must(area_range) + + if(!alias){ + alias = [] + } + if(!alias.contains(name)){ + alias.add(name) + } + if(name.contains("ÅªÐ¡Çø")){ + def newName = name.replace("ÅªÐ¡Çø","Ū") + if(!alias.contains(newName)){ + alias << newName + } + + } + if(alias && alias.size()>0){ + BoolQueryBuilder inBuilder = QueryBuilders.boolQuery(); + for(def s : alias){ + inBuilder.should(QueryBuilders.matchQuery("district_name", s)); + } + queryBuilder.must(inBuilder) + } + +// BoolQueryBuilder inBuilder = QueryBuilders.boolQuery(); +// inBuilder.should(QueryBuilders.matchQuery("root", "lianjia.com")); +// inBuilder.should(QueryBuilders.matchQuery("root", "ke.com")); +// queryBuilder.must(inBuilder) + + def houses = ElasticUtils.executeSimpleQuery("192.168.0.206", "seawater-20*", queryBuilder); + def prices = [] + println city + " "+name+" "+houses.size() + for(def d : houses){ + prices << d.avg_price + } + + if(prices && prices.size()>=3){ + return (int)(prices.sum()/prices.size()) + } + return null + } + + + + + + +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/ChongQingBlankTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/ChongQingBlankTest.groovy index 1bdbfcdc7..07ab82cce 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/ChongQingBlankTest.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/ChongQingBlankTest.groovy @@ -23,11 +23,16 @@ class ChongQingBlankTest { static main(args) { def task = new ChongQingBlankTest() task.run() + } def run(){ - ExcelUtils.modify("D:\\Êý¾Ý\\ÖØÇìÅ©ÉÌÐÐ\\ÖØÇìÅ©ÉÌÐвâÊÔÑù±¾£¨·¿¼ÛÍøv.1.2£©.xlsx",{row-> + allRegionMap.each{k,v-> + println k+" "+v.size() + } + + /* ExcelUtils.modify("D:\\Êý¾Ý\\ÖØÇìÅ©ÉÌÐÐ\\ÖØÇìÅ©ÉÌÐвâÊÔÑù±¾£¨·¿¼ÛÍøv.1.2£©.xlsx",{row-> if(row['B'].toString()=="ÖØÇìÊоÅÁúÆÂÇø½¨¹¤Èý´å7ºÅ"){ def city = CommonUtils.parseCityInAddress(row["B"]) if(!city){ @@ -197,7 +202,7 @@ class ChongQingBlankTest { } } } - }, 0) + }, 0)*/ } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/DongGuangApiTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/DongGuangApiTest.groovy new file mode 100644 index 000000000..3b8227240 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/DongGuangApiTest.groovy @@ -0,0 +1,174 @@ +package com.fangjia.script.gj.test + +import com.fangjia.core.util.DataUtil +import com.fangjia.script.gj.ccb.FileUtils +import com.fangjia.script.util.DateUtils +import com.fangjia.script.util.ElasticUtils +import com.fangjia.script.util.ExcelUtils +import com.fangjia.script.util.OpenApiClient +import net.sf.json.JSONObject +import org.elasticsearch.index.query.QueryBuilder +import org.elasticsearch.index.query.QueryBuilders + +import java.util.concurrent.CopyOnWriteArrayList +import java.util.concurrent.CountDownLatch +import java.util.concurrent.ExecutorService +import java.util.concurrent.Executors +import java.util.concurrent.atomic.AtomicLong + +class DongGuangApiTest { + + public static ExecutorService fixedThreadPool = Executors.newFixedThreadPool(30) + + static main(args) { + def task = new DongGuangApiTest() + task.run() + } + + def run(){ + // def rets = findEsData(); + def rets = readTxt("D:\\Êý¾Ý\\¶«Ý¸ÒøÐÐ\\¶«Ý¸ÒøÐÐ (1).csv") + println "ES ¼ÓÔØÍê³É" + def datas = evaluation(rets) + println "ÖØ¹ÀÍê³É" +// ExcelUtils.write("D:\\Êý¾Ý\\¶«Ý¸ÒøÐÐ\\¶«Ý¸ÖعÀ.xlsx", datas, "Êý¾Ý") + FileUtils.batchCreateFile(datas, "D:\\Êý¾Ý\\¶«Ý¸ÒøÐÐ\\¶«Ý¸ÖعÀ.txt", [], "utf-8", true); + println "txt Éú³É" + exportCsv("D:\\Êý¾Ý\\¶«Ý¸ÒøÐÐ\\¶«Ý¸ÖعÀ.csv", datas) + println "csv Éú³É" + } + + def readTxt(def fileName){ + File file = new File(fileName); + def rows = []; + + file.eachLine{ + def row = it.split("#",-1) + if(row && row.size()>=2){ + def s = row[1] + JSONObject result = JSONObject.fromObject(s); + rows << result + } + + } + return rows; + } + + def evaluation(rets){ + def datas = new CopyOnWriteArrayList() + def totalCount = new AtomicLong() + final CountDownLatch latch = new CountDownLatch(rets.size()) + for(def i=0;i + def paramMap = map.parameter_map + rets << paramMap + if(rets.size()%10000==0){ + println "."+ new Date() + } + }) + return rets; + } + + + def exportCsv(path, list){ + File file = new File(path); + if (file.exists()){ + file.delete(); + } + file.append("Óû§ÊäÈë³ÇÊÐ,") + file.append("Óû§ÊäÈë³ÇÊÐÇøÓò,") + file.append("Óû§ÊäÈë³ÇÊеØÖ·,") + file.append("Óû§ÊäÈë³ÇÊÐÃæ»ý,") + file.append(System.getProperty("line.separator")); + list.each{ + def d = it; + file.append(d[0] + ",","gbk") + file.append(d[1] + ",","gbk") + file.append(d[2] + ",","gbk") + file.append(d[3] + ",","gbk") + if(d[4]){ + file.append(d[4]+",","gbk") + }else{ + file.append(",") + + } + + if(d[5]){ + file.append(d[5] +",","gbk") + }else{ + file.append(",") + + } + + + if(d[6]){ + file.append(d[6] +",","gbk") + }else{ + file.append(",") + + } + if(d[7]){ + file.append(d[7]+",","gbk") + }else{ + file.append(",") + } + file.append(System.getProperty("line.separator")); + } + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/Test.groovy index e1976f1cb..ca7c9e388 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/test/Test.groovy @@ -3,12 +3,15 @@ package com.fangjia.script.gj.test import ch.qos.logback.core.db.dialect.DBUtil import com.fangjia.core.RegionData import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.gj.district.FangjiaClientUtils +import com.fangjia.script.gj.district.SeaweedDataMatchProcess import com.fangjia.script.lixue.util.DBUtils import com.fangjia.script.util.CommonUtils import com.fangjia.script.util.DateUtils import com.fangjia.script.util.DbUtils import com.fangjia.script.util.ExcelUtils import com.fangjia.script.util.MongoUtils +import com.fangjia.script.util.OpenApiClient import com.mongodb.BasicDBObject import com.mongodb.DBCollection import com.mongodb.Mongo @@ -24,6 +27,75 @@ DBCollection coll = MongoUtils.getCollectionByName("seeds_db", "city_seeds", "1 def ZS_MONGODB_URL = "mongodb://admin:G00MONGOADMIN@192.168.0.100:30009"; DBCollection TOWNSHIP_CONN = MongoUtils.getCollectionByName2("fangjia", "township", ZS_MONGODB_URL) + +DBCollection FANGJIA_AREA_CODE = MongoUtils.getCollectionByName("business", "fangjia_area_code", "mongo.db.fangjia.com") +DBCollection GUIDING_PRICE_COLL = MongoUtils.getCollectionByName("fangjia", "guiding_price", "mongo.db.fangjia.com") +//ExcelUtils.modify("D:\\Êý¾Ý\\֤ȯ\\¹ú¾ý¼û֤ʧ°ÜÔ­Òò.xls", { d -> +//}) + + +ExcelUtils.modify("D:\\Êý¾Ý\\֤ȯ\\¹ú¾ý¼û֤ʧ°ÜÔ­Òò(±ê×¼»¯Ê¡ÊÐÇø).xls", { d -> + def info = d['A'] + if(info && !d['E']){ + def arrs = info.split("!~") + if(arrs && arrs[2] && arrs[3]){ +// def rMap = SeaweedDataMatchProcess.doMatch(d['B'], d['C'], arrs[4], arrs[4]); +// if(rMap) { +// d['E'] = rMap.name +// d['F'] = rMap.id +// } + + def address = null + if(d['G']){ + address = d['G'] + }else{ + address = arrs[4] + } + + def jsonObject = OpenApiClient.addressMatch(d['C'], address, "property", false, d['D'], null) + if(jsonObject != null && jsonObject.precise!=-1) { + d['H'] = jsonObject.get("city") + d['I'] = jsonObject.get("district") + d['J'] = jsonObject.get("name") + d['K'] = jsonObject.get("id") + } + +// def jsonObj = FangjiaClientUtils.addressStructure(d['B'], arrs[4]) +// if(jsonObj && jsonObj.result) { +// def street = null +// def street_number = null +// if (jsonObj.result.street) { +// d['E'] = jsonObj.result.street +// } +// if (jsonObj.result.streetNumber) { +// d['F'] = jsonObj.result.streetNumber +// } +// d['G'] = jsonObj.result.name +// } + +// def rets = findProinvceAndCityAndRegion(FANGJIA_AREA_CODE, arrs[1], arrs[3]) +// if(rets && rets.size()==1){ +// def obj = rets[0] +// d['B'] = obj.province +// d['C'] = obj.fjw_city +// d['D'] = obj.fjw_district +// } + } + } +}); +// +//def findProinvceAndCityAndRegion(FANGJIA_AREA_CODE, cityCode, regionCode){ +// def q = new BasicDBObject() +// q.put("city_code", cityCode.toString().toInteger()) +// q.put("district_code", regionCode.toString().toInteger()) +// def dbcursor = FANGJIA_AREA_CODE.find(q) +// def rets = [] +// for(def d : dbcursor){ +// rets << d +// } +// return rets; +//} + //ExcelUtils.modify("D:\\Êý¾Ý\\½¨ÐÐ\\¶þÆÚ\\¹ú¼ÒÐÐÕþÇø»®ÌØÊâ³ÇÊе¼³ö.xlsx",{d-> // def city = RegionData.formatCity(d['E']) // if(city && !d['J']){ @@ -103,33 +175,33 @@ DBCollection TOWNSHIP_CONN = MongoUtils.getCollectionByName2("fangjia", "townshi // } //}) -ExcelUtils.modify("D:\\Êý¾Ý\\Ç×ÁÚ\\·¿¼ÛÍøÊ¡ÊÐÇø.xlsx",{d-> - if(!d['D']){ - def infos = findTownshipInfo(d['B'], d['C'], TOWNSHIP_CONN) - if(infos && infos.size()==1){ - def info = infos[0] - d['D'] = info.province_code - d['E'] = info.area_code - d['F'] = info.street_code - } - } -}) - - -def findTownshipInfo(city, region, coll){ - def q = new BasicDBObject() - q.put("city_name", Pattern.compile(city, Pattern.CASE_INSENSITIVE)) - q.put("street_name", Pattern.compile('^.*'+region+'½ÖµÀ.*$', Pattern.CASE_INSENSITIVE)) - - def dbcursor = coll.find(q) - def rows = [] - for(def d : dbcursor){ -// if(d.street_name.contains(region)){ - rows << d +//ExcelUtils.modify("D:\\Êý¾Ý\\Ç×ÁÚ\\·¿¼ÛÍøÊ¡ÊÐÇø.xlsx",{d-> +// if(!d['D']){ +// def infos = findTownshipInfo(d['B'], d['C'], TOWNSHIP_CONN) +// if(infos && infos.size()==1){ +// def info = infos[0] +// d['D'] = info.province_code +// d['E'] = info.area_code +// d['F'] = info.street_code // } - } - return rows -} +// } +//}) +// +// +//def findTownshipInfo(city, region, coll){ +// def q = new BasicDBObject() +// q.put("city_name", Pattern.compile(city, Pattern.CASE_INSENSITIVE)) +// q.put("street_name", Pattern.compile('^.*'+region+'½ÖµÀ.*$', Pattern.CASE_INSENSITIVE)) +// +// def dbcursor = coll.find(q) +// def rows = [] +// for(def d : dbcursor){ +//// if(d.street_name.contains(region)){ +// rows << d +//// } +// } +// return rows +//} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/CZDataBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/CZDataBatch.groovy index 24eeb3c76..ced116b61 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/CZDataBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/CZDataBatch.groovy @@ -32,9 +32,10 @@ import java.util.regex.Pattern @BatchOwner(Watcher.GaoJuan) class CZDataBatch extends BaseBatch{ - def regionMap = ["½­ËÕ":"320000","³£ÖÝ":"320400","ÌìÄþ":"320402","ÖÓÂ¥":"320404","ÆÝÊûÑß":"320405","б±":"320411","Îä½ø":"320412","äàÑô":"320481","½ð̳":"320482"]; + public static def dbUrl = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; def fields = ["city","region","name", "address", "cat","lat2","lng2","alias","property_life","estate_type2","build_date","build_structure","build_type","finish_building_date","live_date","open_date","virescence_percent","cubage_percent","estate_company","estate_charge","car_site", "build_type"] - DBCollection DIST_COLL = MongoUtils.getCollectionByName("business", "jn_bank_district", "mongo.db.fangjia.com") + public static DBCollection DIST_COLL = MongoUtils.getCollectionByName2("business", "jn_bank_district", dbUrl) + //final def czIdMap = readCZDistrict("d:\\³£ÖÝÊý¾Ý½á¹û\\ԭʼÊý¾Ý\\³£Öݽ­ÄÏÒøÐÐסլ±àºÅ.xls"); //final def czShopMap = readCZShop("d:\\³£ÖÝÊý¾Ý½á¹û\\ԭʼÊý¾Ý\\³£Öݽ­ÄÏÒøÐÐÉÌÆÌ--¸üÐÂing(8).xls"); @@ -58,6 +59,7 @@ class CZDataBatch extends BaseBatch{ def districts = converList(CommonDatautils.findAllDistricts(city, "district", fields)); districtRun(districts, statMap, commids); + FzDataUtils.removeNoUpdate(city, districts) def shops = CommonDatautils.findAllDistricts(city, "shop", fields); shops = mergeShop(shops); @@ -134,7 +136,7 @@ class CZDataBatch extends BaseBatch{ void run() { try{ totalCount.addAndGet(1) - converDistrict(district, statMap, commids); + FzDataUtils.converDistrict(district, statMap, commids); println totalCount.get()+"/"+total +" ["+district.city+"-"+district.region+"-"+district.name+"]"; } catch (Exception e) { e.printStackTrace() @@ -165,92 +167,6 @@ class CZDataBatch extends BaseBatch{ // executorService.awaitTermination(30, TimeUnit.MINUTES) } - def converDistrict(def dist, def statMap, def commids){ - def map = [:] - //Â¥Å̱àºÅ - /* def c_id = czIdMap.get(dist.city+"#"+dist.region+"#"+dist.name) - if(c_id){ - map.num_id = c_id; - }else{ - map.num_id = dist.get("_id").toString(); - } */ - map.num_id = dist.get("_id").toString(); - map.cat = "district"; - // Â¥ÅÌÃû³Æ - map.name = dist.name - map.alias = dist.alias - map.build_date = getBuildDate(dist); - //¸½ÊôÊôÐÔ - map.build_type = dist.build_type - map.property_life = dist.property_life - map.estate_type2 = dist.estate_type2 - map.build_structure = dist.build_structure - // Â¥Å̾ù¼Û - def priceObj = statMap.get(dist.region+"#"+dist.name) - if(priceObj && priceObj.avg_price){ - map.avg_price = priceObj.avg_price - } - //map.avg_price = getDistrictPrice(dist.city, dist.region, dist.name, dist.address, dist.block); - // Ê¡ ÊÐ Çø - if(dist.city == "³£ÖÝ"){ - map.province_code = regionMap.get("½­ËÕ"); - map.city_code = regionMap.get(dist.city); - map.region_code = regionMap.get(dist.region); - map.province = "½­ËÕ"; - } - map.city = dist.city; - map.region = dist.region; - - if(!commids.contains(map.num_id)){ - // ¹«¹²·þÎñÅäÌ× - map.public_service_set_code = getPublicServiceSetCode(dist.city, dist.lat2, dist.lng2); - // »ù´¡ÉèÊ© - map.facilities_code = "01"; - // ¾ÓסÉçÇø³ÉÊì¶È - map.sophistication_code = getSophisticationCode(dist.city, dist.lat2, dist.lng2); - // ½»Í¨Ìõ¼þ - map.traffic_code = getTrafficCode(dist.city, dist.lat2, dist.lng2); - // ²´³µÌõ¼þ / - map.stop_car_code = getStopCarCode(dist); - // /Ñ§Çø·¿ÀàÐÍ - map.school_code = getSchoolCode(dist.city, dist.region, dist.lat2, dist.lng2) ; - } - // µØÖ· - map.address = dist.address - // ËùÊôÇøÓò - map.in_region_code = getRegionCode(dist.region); - - //ÂÌ»¯ÂÊ - map.virescence_percent = getVirescencePercent(dist.virescence_percent, map.build_date); - //ÈÝ»ýÂÊ - map.cubage_percent = getCubagePercent(dist.cubage_percent, map.build_date); - // ²Î¿¼×â½ð(1ÊÒ) ²Î¿¼×â½ð(2ÊÒ) ²Î¿¼×â½ð(3ÊÒ) ²Î¿¼×â½ð(4ÊÒ) ²Î¿¼×â½ð(5ÊÒ) ²Î¿¼×â½ð(5ÊÒÒÔÉÏ) - map.rents = getRentPrice2(dist.city, dist.region, dist.name, dist.estate_type2, dist.lat2, dist.lng2, dist.cat); - //ÎïÒµ¹«Ë¾ - map.estate_company = getEstateCompany(dist.estate_company); - //ÎïÒµ·Ñ - map.estate_charge = getEstateCharge(dist.estate_charge); - - saveDistrict(map); - } - - - def saveDistrict(def m){ - DBObject q = new BasicDBObject(); - q.put("num_id",m.num_id) - def dbo = DIST_COLL.findOne(q); - - DBObject udata = new BasicDBObject(); - m.each {k,v-> - udata.put(k, v); - } - if(dbo){ - udata.removeField("num_id") - DIST_COLL.update(q, new BasicDBObject('$set', udata), false, true); - }else{ - DIST_COLL.save(udata); - } - } def shopRun(shops){ @@ -444,668 +360,6 @@ class CZDataBatch extends BaseBatch{ } - //1-Ö÷³ÇÇø£ºÌìÄþÇø¡¢ÖÓÂ¥Çø 2-½¼Çø£ºÎä½øÇø¡¢Ð±±Çø¡¢ÆÝÊûÑßÇø 3-ÏØ¼¶ÊУº½ð̳ÊС¢äàÑôÊÐ - def getRegionCode(def region){ - if(region.indexOf("ÌìÄþ")!=-1||region.indexOf("ÖÓÂ¥")!=-1){ - return "01"; - }else if(region.indexOf("Îä½ø")!=-1||region.indexOf("б±")!=-1||region.indexOf("ÆÝÊûÑß")!=-1){ - return "02"; - }else if(region.indexOf("½ð̳")!=-1||region.indexOf("äàÑô")!=-1){ - return "03"; - }else{ - return "99"; - } - } - - def getVirescencePercent(def virescence_percent, def buildDate){ - if(virescence_percent){ - virescence_percent = virescence_percent.replace("%",""); - } - - if(virescence_percent){ - if(virescence_percent.toFloat()>50){ - virescence_percent = ""; - } - } - - if(!virescence_percent && buildDate){ - if(buildDate==1986){ - virescence_percent = 25; - }else if(buildDate == 1987){ - virescence_percent = 30; - }else if(buildDate>=1990 && buildDate<=2009){ - virescence_percent = 25; - }else if(buildDate == 2010){ - virescence_percent = 30; - } - } - - if(virescence_percent){ - virescence_percent = virescence_percent.toDouble()/100; - return new DecimalFormat("######0.00").format(virescence_percent) - } - - return virescence_percent; - } - - - def getCubagePercent(def cubage_percent, def build_date){ - if(!cubage_percent && build_date){ - if(build_date >=1990 && build_date<=1999){ - return "1.49"; - }else if(build_date==2000){ - return "1.46"; - } - } - return cubage_percent; - } - - def getBuildDate(def dbo){ - def year = DataHandleUtils.findPattern(dbo.finish_building_date, "(\\d+)"); - if(year){ - year = Integer.parseInt(year); - } - if(year<=1900){ - year = null; - }else{ - return year; - } - if(!year){ - year = DataHandleUtils.findPattern(dbo.live_date, "(\\d+)"); - if(year){ - year = Integer.parseInt(year); - } - if(year<=1900){ - year = null; - }else{ - return year; - } - if(!year){ - def date = DateUtils.formatToYYYYMMDD(dbo.open_date) - year = DataHandleUtils.findPattern(date, "(\\d+)"); - if(year){ - year = Integer.parseInt(year); - } - if(year<=1900){ - year = null; - }else{ - return year; - } - } - } - - if(dbo.build_date){ - year = DataHandleUtils.findPattern(dbo.build_date, "(\\d+)"); - if(year){ - year = Integer.parseInt(year); - } - if(year && year>1900){ - return year; - } - } - return year; - } - - def getEstateCompany(def company){ - if(company){ - company = company.replace("---","").replace("¡¤",""); - return company; - } - return ""; - } - - def getEstateCharge(def charge){ - if(charge){ - if(charge == "0.0"){ - return ""; - }else{ - Pattern pa=Pattern.compile("([\\d\\.]+)") - Matcher ma=pa.matcher(charge) - if(ma.find()){ - charge = ma.group(1) - - if(charge.toFloat()>=40){ - return ""; - }else{ - if(charge.endsWith(".0")){ - return charge.substring(0, charge.indexOf(".0")) - }else{ - return charge; - } - } - - }else{ - return ""; - } - } - } - return ""; - } - - def getRentPrice2(def city, def region, def name, def estate_type2, def lat2, def lng2, def cat){ - def month = CommonDatautils.getDistrictRentLastMonth(city, region, name) - - def priceMap = [:]; - if(month){ - priceMap = CommonDatautils.getDistrictRentPrice(city, region, name, month); - } - - - if(!priceMap){ - priceMap = getRoundAvgRentPrice(city,region, name, estate_type2, lat2, lng2, cat); - } - - - if(priceMap && priceMap.size()>1){ - - def prices = [] - def rooms = []; - for(int i=1;i<=6;i++){ - def price = priceMap.get(i); - if(price){ - if(price>20000||price<300){ - priceMap.remove(i); - }else{ - - if(i>3 && price<1000){ - priceMap.remove(i); - }else{ - prices << price - rooms << i; - } - } - } - } - - //ÅÅÐò - prices.sort(); - rooms.sort(); - if(prices.size()>1){ - priceMap = [:]; - def index = 0; - for(def price : prices){ - index++; - priceMap.put(rooms.get(index-1), price); - - } - } - - filterData(prices, rooms, priceMap); - } - - - if(priceMap && estate_type2.contains("±ðÊû")){ - priceMap.remove(1); - priceMap.remove(2); - - if(priceMap.get(4)<2000){ - priceMap.remove(4); - } - - if(priceMap.get(3)<2000){ - priceMap.remove(3); - } - } - -// if(!priceMap){ -// priceMap = findRegionRentPrice(priceMap, city, region, estate_type2) -// } - - //5ÊÒ¼°ÒÔÉϼ۸ñСÓÚ2000È¥³ý - if(priceMap){ - if(priceMap.get(5)<2000){ - priceMap.remove(5); - } - - if(priceMap.get(6)<3000){ - priceMap.remove(6); - } - } - def newPriceMap = [:] - if(priceMap){ - priceMap.each {k,v-> - newPriceMap.put(k.toString(),v) - } - } - return newPriceMap; - } - - def findRegionRentPrice(def priceMap,def city, def region, def estate_type2){ - if(!priceMap){ - priceMap = [:] - if(estate_type2=="±ðÊû"){ - def room4 = CommonDatautils.getRegionRent(city, region, 4, "±ðÊû"); - if(room4){ - def v = DataHandleUtils.random(-100, 500) + 100; - priceMap.put(4, room4+v); - - } - }else{ - def room1 = CommonDatautils.getRegionRent(city, region, 1, "Ð¡Çø"); - def room2 = CommonDatautils.getRegionRent(city, region, 2, "Ð¡Çø"); - if(room1){ - def v = DataHandleUtils.random(-100, 300) + 100; - priceMap.put(1, room1+v); - } - - if(room2){ - def v = DataHandleUtils.random(-100, 600) + 100; - priceMap.put(2, room2+v); - } - } - } - return priceMap; - } - - - def getRoundAvgRentPrice(city,region, name, estate_type2, lat2, lng2, cat ){ - if(lng2 && lat2){ - def lat = lat2/10000000000; - def lng = lng2/10000000000; - def map = CommonDatautils.findMaxLatLngMinLatLng(lat, lng, 1000) - def ret = CommonDatautils.findDistrictsByLatLng(city, cat, map.maxLat*10000000000, map.minLat*10000000000, map.maxLng*10000000000, map.minLng*10000000000, estate_type2); - if(ret){ - def room1_sum = 0; - def room1_count = 0; - def room2_sum = 0; - def room2_count = 0; - for(def obj : ret){ - def rentMap = CommonDatautils.getDistrictPrice(city, region, name, estate_type2) - if(rentMap){ - if(rentMap.get(1)){ - room1_sum = room1_sum + rentMap.get(1); - room1_count ++; - } - - if(rentMap.get(2)){ - room2_sum = room2_sum + rentMap.get(2); - room2_count ++; - } - } - } - def result = [:]; - if(room1_count){ - def room1_avg_price = (room1_sum/room1_count).toInteger(); - if(room1_avg_price){ - result.put(1, room1_avg_price); - } - } - if(room2_count){ - def room2_avg_price = (room2_sum/room2_count).toInteger(); - if(room2_avg_price){ - result.put(2, room2_avg_price); - } - } - return result; - } - } - return null; - } - - - def static filterData(prices, rooms, priceMap){ - def mod = []; - for(int j=1;j=1){ - def room = rooms.get(j); - def price = prices.get(j) - priceMap.remove(room); - prices.remove(j); - } - mod << val; - } - println "mod:"+ mod; - return priceMap; - } - - - //1-Öܱ߹«½»Ïß·¡Ý10Ìõ£»2-Öܱ߹«½»Ïß·£¼10Ìõµ«¡Ý5Ìõ£»3-Öܱ߹«½»Ïß·£¼5Ìõµ«¡Ý2Ìõ£»4-Öܱ߹«½»Ïß·£¼2Ìõ - def getTrafficCode(def city, def lat, def lng){ - if(lng && lat){ - lat = lat/10000000000; - lng = lng/10000000000; - def map = CommonDatautils.findMaxLatLngMinLatLng(lat, lng, 1000) - def trafficMap = CommonDatautils.findBusLineCount(city, map.maxLat, map.minLat, map.maxLng, map.minLng); - - def count = 0; - if(trafficMap){ - count = trafficMap.bus.size() - } - - if(count>=10){ - return "01"; - }else if(count>=5){ - return "02"; - }else if(count>=2){ - return "03"; - }else if(count < 2){ - return "04"; - } - } - return "99"; - } - - - def getStopCarCode(def dbo){ - if(dbo.car_site){ - if(dbo.car_site=="
    "||dbo.car_site=="´ý¶¨"||dbo.car_site.indexOf("ÔÝÎÞ")!=-1||dbo.car_site=="ÏêѯÊÛÂ¥´¦"){ - dbo.car_site =""; - } - - if(dbo.car_site){ - return "01"; - } - } - - if(!dbo.car_site){ - def year = DataHandleUtils.findPattern(dbo.build_date, "(\\d+)"); - - if(!year){ - year = DataHandleUtils.findPattern(dbo.finish_building_date, "(\\d+)"); - if(!year){ - year = DataHandleUtils.findPattern(dbo.live_date, "(\\d+)"); - if(!year){ - def date = DateUtils.formatToYYYYMMDD(dbo.open_date) - year = DataHandleUtils.findPattern(date, "(\\d+)"); - } - } - } - - if(year){ - year = Integer.parseInt(year); - } - - if(year && year >= 1980){ - return "01"; - }else if(year && year>0 && year<1980){ - return "02"; - }else{ - if(dbo.name.endsWith("ÆÚ")||dbo.name.indexOf("±ðÊû")!=-1){ - return "01"; - }else{ - - if(dbo.build_type && dbo.build_type.indexOf("¸ß²ã")!=-1){ - return "01"; - }else if(dbo.estate_type2 && dbo.estate_type2=="±ðÊû"){ - return "01"; - }else{ - - def date = CommonDatautils.findHouseBuildDate(dbo.city, dbo.region, dbo.name, "sell") - if(date){ - year = DataHandleUtils.findPattern(date, "(\\d+)"); - if(year && year >= 1980){ - return "01"; - }else if(year && year>0 && year<1980){ - return "02"; - } - } - } - } - } - - return "99" - } - - def endWithChar = ["´å","ËÞÉá","ÌÃ","Ū"]; - for(def s : endWithChar){ - if(dbo.name.endsWith(s)){ - return "02"; - break; - } - } - return "01"; - } - - - def getSchoolCode(def city, def region, def lat, def lng){ - if(lng && lat){ - lat = lat/10000000000; - lng = lng/10000000000; - def redius = 3000; - if(city=="³£ÖÝ" && (region=="ÌìÄþ"|| region=="ÖÓÂ¥")){ - redius = 1000; - } - def map = CommonDatautils.findMaxLatLngMinLatLng(lat, lng, redius) - def schools = CommonDatautils.findPomDetail(city, "ѧУ", map.minLat, map.maxLat, map.minLng, map.maxLng) - def school_count = 0; - if(schools){ - def names = []; - for(def schoolName : schools){ - if(schoolName.contains("Сѧ") && !names.contains(schoolName)){ - names << schoolName - } - } - - school_count = names.size(); - } - - if(school_count >= 1){ - return 1; - } - return 0; - } - return 0; - } - - - def getSophisticationCode(def city, def lat, def lng){ - if(lng && lat){ - lat = lat/10000000000; - lng = lng/10000000000; - def map = CommonDatautils.findMaxLatLngMinLatLng(lat, lng, 1000) - def supermarket_count = CommonDatautils.findPomCount(city, "³¬ÊÐ", map.minLat, map.maxLat, map.minLng, map.maxLng) - if(supermarket_count>=5){ - return "01"; - }else{ - map = CommonDatautils.findMaxLatLngMinLatLng(lat, lng, 2000) - supermarket_count = CommonDatautils.findPomCount(city, "³¬ÊÐ", map.minLat, map.maxLat, map.minLng, map.maxLng) - if(supermarket_count >= 5){ - return "02"; - }else{ - return "03"; - } - } - } - return "99"; - } - - - def getPublicServiceSetCode(def city, def lat, def lng){ - - if(lng && lat){ - lat = lat/10000000000; - lng = lng/10000000000; - def map = CommonDatautils.findMaxLatLngMinLatLng(lat, lng, 1000) - def hspt_count = CommonDatautils.findPomCount(city, "Ò½Ôº", map.minLat, map.maxLat, map.minLng, map.maxLng) - def bank_count = CommonDatautils.findPomCount(city, "ÒøÐÐ", map.minLat, map.maxLat, map.minLng, map.maxLng) - def school_count = CommonDatautils.findPomCount(city, "ѧУ", map.minLat, map.maxLat, map.minLng, map.maxLng) - def supermarket_count = CommonDatautils.findPomCount(city, "³¬ÊÐ", map.minLat, map.maxLat, map.minLng, map.maxLng) - - def yl_count1 = CommonDatautils.findPomCount(city, "KTV", map.minLat, map.maxLat, map.minLng, map.maxLng) - def yl_count2 = CommonDatautils.findPomCount(city, "µçÓ°Ôº", map.minLat, map.maxLat, map.minLng, map.maxLng) - def yl_count3 = CommonDatautils.findPomCount(city, "Íø°É", map.minLat, map.maxLat, map.minLng, map.maxLng) - def yl_count4 = CommonDatautils.findPomCount(city, "½¡ÉíÖÐÐÄ", map.minLat, map.maxLat, map.minLng, map.maxLng) - - if(hspt_count>=1 && bank_count>=1 && school_count>=1 && supermarket_count>=1 && (yl_count1>=1 || yl_count2>=1 || yl_count3>=1||yl_count4>=1)){ - return "01"; - }else{ - map = CommonDatautils.findMaxLatLngMinLatLng(lat, lng, 2000) - hspt_count = CommonDatautils.findPomCount(city, "Ò½Ôº", map.minLat, map.maxLat, map.minLng, map.maxLng) - bank_count = CommonDatautils.findPomCount(city, "ÒøÐÐ", map.minLat, map.maxLat, map.minLng, map.maxLng) - school_count = CommonDatautils.findPomCount(city, "ѧУ", map.minLat, map.maxLat, map.minLng, map.maxLng) - - yl_count1 = CommonDatautils.findPomCount(city, "KTV", map.minLat, map.maxLat, map.minLng, map.maxLng) - yl_count2 = CommonDatautils.findPomCount(city, "µçÓ°Ôº", map.minLat, map.maxLat, map.minLng, map.maxLng) - yl_count3 = CommonDatautils.findPomCount(city, "Íø°É", map.minLat, map.maxLat, map.minLng, map.maxLng) - yl_count4 = CommonDatautils.findPomCount(city, "½¡ÉíÖÐÐÄ", map.minLat, map.maxLat, map.minLng, map.maxLng) - - if(hspt_count>=1 && bank_count>=1 && school_count>=1 && supermarket_count>=1 && (yl_count1>=1 || yl_count2>=1 || yl_count3>=1||yl_count4>=1)){ - return "02"; - }else{ - return "03"; - } - } - } - return "99"; - } - - def getDistrictPrice(def city, def region, def name, def address, def block){ - - def price = CommonDatautils.findDistrictPrice(city, region, name); - if(price){ - return price.avg_price; - }else{ -// //ÑùÀý¹À¼Û -// def s = OpenApiClient.evaluateDistrictPriceBySimilarHouse3(city, region, name, 100, false); -// try{ -// JSONObject jsonObject = JSONObject.fromObject(s); -// def map = DataHandleUtils.JsonToMap(jsonObject); -// if(map.code==200){ -// if(map.result){ -// return map.result.avgPrice; -// } -// -// } -// }catch(Exception e){ -// -// } - - - //·ÖÆÚÕÒ×ÜÆÚ - if(name.toString().endsWith("ÆÚ")){ - def tempname = name.toString().substring(0, name.toString().indexOf("ÆÚ")-1) - def districtStat = CommonDatautils.findDistrictPrice(city, region, tempname); - if(districtStat && districtStat.avg_price){ - return districtStat.avg_price+150; - } - } - - if(name.toString().endsWith("Çø")){ - def tempname = name.toString().substring(0, name.toString().indexOf("Çø")-1) - def districtStat = CommonDatautils.findDistrictPrice(city, region, tempname); - if(districtStat && districtStat.avg_price){ - return districtStat.avg_price+100; - } - } - - //Öܱ߾ù¼Û -// price = findAroundAvgPrice(city, address, 100); -// if(price){ -// return price.toString() -// } - - //°å¿é¾ù¼Û - if(block){ - price = CommonDatautils.queryCityRegionPrice(city, region, block); - if(price){ - return price.toInteger() - } - } - - //ÇøÓò¾ù¼Û - if(!block||!price){ - price = CommonDatautils.queryCityRegionPrice(city, region, null); - if(price){ - return price.toInteger() - } - } - - } - return null; - - } - - def getShopPrice(def priceString, def city, def region, def name){ - - if(priceString){ - def avgPrice = priceString.replace("Ôª/©O","").replace("·¿Ô´¼Û", "").replace("·¿Ô´", ""); - if(avgPrice.indexOf("-")!=-1){ - def array = avgPrice.split("-") - if(array.length>1){ - avgPrice = ((array[1].toInteger()+array[0].toInteger())/2).toInteger(); - - def v = DataHandleUtils.random(-100, 300) + 100; - return avgPrice.toInteger()+v; - } - }else{ - def v = DataHandleUtils.random(-100, 300) + 100; - return avgPrice.toDouble().toInteger()+v; - } - }else{ - def avgPrice = CommonDatautils.queryShopPrice(city, region, name); - if(avgPrice){ - return avgPrice; - } - } - - def avgPrice = CommonDatautils.queryRegionBusinessPrice(city, region); - if(avgPrice){ - def v = DataHandleUtils.random(-100, 300) + 100; - return avgPrice.toInteger()+v; - } - - return null; - } - - - def getRentNumber(def rentPrice,def city, def region, def name){ - if(rentPrice){ - if(rentPrice.indexOf("Ôª/©O/Ìì")!=-1){ - rentPrice = rentPrice.replace("Ôª/©O/Ìì",""); - if(rentPrice){ - return rentPrice.toDouble(); - } - }else if(rentPrice.indexOf("Ôª/©O/ÔÂ")!=-1){ - def price = rentPrice.replace("Ôª/©O/ÔÂ","").toString().trim(); - price = price.toFloat(); - price = price/30; - return DataHandleUtils.getDoubleRound(2, price.toDouble()); - }else{ - if(rentPrice.contains("-")){ - rentPrice = rentPrice.substring(0, rentPrice.indexOf("-")); - } - return DataHandleUtils.getDoubleRound(2, rentPrice.toDouble()); - } - }else{ - def day_avg_price = CommonDatautils.queryBusinessDayPrice(city, region, name, "ÉÌÆÌ"); - if(day_avg_price){ - return day_avg_price; - } - } - return null; - } - - def getStreetCode(def val){ - if(val){ - if(val == "ÎÞ½»Í¨¹ÜÖÆ"){ - return 1; - }else if(val == "µ¥ÐеÀ"){ - return 2; - }else if(val == "½ûÐÐ"){ - return 3; - } - return 1; - } - return 1; - } - - def getShopEstateTypeCode(def estateType){ - if(estateType){ - if(estateType.indexOf("É̳¡ÉÌÆÌ")!=-1){ - return 1; - }else if(estateType.indexOf("רҵÊг¡")!=-1){ - return 2; - }else if(estateType.indexOf("ÉÌÒµ½Ö")!=-1){ - return 3; - }else if(estateType.indexOf("ÉçÇøÉÌÆÌ")!=-1){ - return 4; - } - } - return 99; - } def converList(def dbCursor){ def list = [] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/DayUpdateDistRefreshBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/DayUpdateDistRefreshBatch.groovy new file mode 100644 index 000000000..bb19fe69d --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/DayUpdateDistRefreshBatch.groovy @@ -0,0 +1,72 @@ +package com.fangjia.script.jiangnanblank + +import com.fangjia.script.BaseBatch +import com.fangjia.script.BatchOwner +import com.fangjia.script.Watcher +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.util.DateUtils +import com.fangjia.script.util.MongoUtils +import com.mongodb.BasicDBObject +import com.mongodb.DBCollection +import com.mongodb.DBObject +import org.bson.types.ObjectId + +@BatchOwner(Watcher.GaoJuan) +class DayUpdateDistRefreshBatch extends BaseBatch{ + + def fields = ["city","region","name", "address", "cat","lat2","lng2","alias","property_life","estate_type2","build_date","build_structure","build_type","finish_building_date","live_date","open_date","virescence_percent","cubage_percent","estate_company","estate_charge","car_site", "build_type"] + + public static final DBCollection TASK_COLL = MongoUtils.getCollectionByName("fangjia", "district_update_task", "mongo.db.fangjia.com") + + static main(args) { + runBatch(new DayUpdateDistRefreshBatch(), args); + } + + @Override + void process(Object args) { + def dists = findAllNeedRefreshDist() + + if(dists){ + for(def d : dists){ + def distObj = CommonDatautils.findDistrictByParams(d.city, d.region, d.name, "district", fields) + if(distObj && distObj._id){ + FzDataUtils.converDistrict(distObj, null, null); + println new Date().toString()+" ¡¾´¦ÀíÍê³É¡¿ "+d.city +" "+d.region+" "+d.name + updateTaskStatus(d.id, 2); + } + } + }else{ + println new Date().toString()+ " ÎÞÐÂÔöÐ¡Çø" + } + } + + + + def updateTaskStatus(def id, def status){ + DBObject q = new BasicDBObject() + q.put("_id", new ObjectId(id)) + + DBObject udata = new BasicDBObject() + udata.put("status", status); + udata.put("m_date", new Date()); + TASK_COLL.update(q, new BasicDBObject('$set', udata)); + } + + def findAllNeedRefreshDist(){ + def rets = [] + def q = new BasicDBObject() + q.put("status", 5);//δ´¦Àí + TASK_COLL.find(q).each {d-> + rets << ["id":d._id.toString(),"city":d.city, "region":d.region, "name":d.name] + } + return rets; + } + + def converList(def dbCursor){ + def list = [] + for(def dbo : dbCursor){ + list << dbo + } + return list; + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/FzDataUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/FzDataUtils.groovy new file mode 100644 index 000000000..bf6e2c177 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jiangnanblank/FzDataUtils.groovy @@ -0,0 +1,805 @@ +package com.fangjia.script.jiangnanblank + +import com.fangjia.script.commData.CommonDatautils +import com.fangjia.script.common.DataHandleUtils +import com.fangjia.script.util.DateUtils +import com.fangjia.script.util.MongoUtils +import com.mongodb.BasicDBObject +import com.mongodb.DBCollection +import com.mongodb.DBObject + +import java.text.DecimalFormat +import java.util.regex.Matcher +import java.util.regex.Pattern + +class FzDataUtils { + + static def regionMap = ["½­ËÕ":"320000","³£ÖÝ":"320400","ÌìÄþ":"320402","ÖÓÂ¥":"320404","ÆÝÊûÑß":"320405","б±":"320411","Îä½ø":"320412","äàÑô":"320481","½ð̳":"320482"]; + + static DBCollection DIST_COLL = MongoUtils.getCollectionByName("business", "jn_bank_district", "mongo.db.fangjia.com") + + static def converDistrict(def dist, def statMap, def commids){ + def map = [:] + //Â¥Å̱àºÅ + /* def c_id = czIdMap.get(dist.city+"#"+dist.region+"#"+dist.name) + if(c_id){ + map.num_id = c_id; + }else{ + map.num_id = dist.get("_id").toString(); + } */ + map.num_id = dist.get("_id").toString(); + map.cat = "district"; + // Â¥ÅÌÃû³Æ + map.name = dist.name + def alias = dist.alias + if(alias){ + if(alias.size()>5){ + alias = alias[0..4] + } + map.alias = alias + } + map.build_date = getBuildDate(dist); + //¸½ÊôÊôÐÔ + map.build_type = dist.build_type + map.property_life = dist.property_life + map.estate_type2 = dist.estate_type2 + map.build_structure = dist.build_structure + // Â¥Å̾ù¼Û + def priceObj = null + if(statMap){ + priceObj = statMap.get(dist.region+"#"+dist.name) + } + if(priceObj && priceObj.avg_price){ + map.avg_price = priceObj.avg_price + }else{ + priceObj = CommonDatautils.findDistrictPrice(dist.city, dist.region, dist.name); + if(priceObj){ + map.avg_price = priceObj.avg_price + } + } + + // Ê¡ ÊÐ Çø + if(dist.city == "³£ÖÝ"){ + map.province_code = regionMap.get("½­ËÕ"); + map.city_code = regionMap.get(dist.city); + map.region_code = regionMap.get(dist.region); + map.province = "½­ËÕ"; + } + map.city = dist.city; + map.region = dist.region; + + if((commids && !commids.contains(map.num_id)) || !commids){ + // ¹«¹²·þÎñÅäÌ× + map.public_service_set_code = getPublicServiceSetCode(dist.city, dist.lat2, dist.lng2); + // »ù´¡ÉèÊ© + map.facilities_code = "01"; + // ¾ÓסÉçÇø³ÉÊì¶È + map.sophistication_code = getSophisticationCode(dist.city, dist.lat2, dist.lng2); + // ½»Í¨Ìõ¼þ + map.traffic_code = getTrafficCode(dist.city, dist.lat2, dist.lng2); + // ²´³µÌõ¼þ / + map.stop_car_code = getStopCarCode(dist); + // /Ñ§Çø·¿ÀàÐÍ + map.school_code = getSchoolCode(dist.city, dist.region, dist.lat2, dist.lng2) ; + } + // µØÖ· + map.address = dist.address + // ËùÊôÇøÓò + map.in_region_code = getRegionCode(dist.region); + + //ÂÌ»¯ÂÊ + map.virescence_percent = getVirescencePercent(dist.virescence_percent, map.build_date); + //ÈÝ»ýÂÊ + map.cubage_percent = getCubagePercent(dist.cubage_percent, map.build_date); + // ²Î¿¼×â½ð(1ÊÒ) ²Î¿¼×â½ð(2ÊÒ) ²Î¿¼×â½ð(3ÊÒ) ²Î¿¼×â½ð(4ÊÒ) ²Î¿¼×â½ð(5ÊÒ) ²Î¿¼×â½ð(5ÊÒÒÔÉÏ) + map.rents = getRentPrice2(dist.city, dist.region, dist.name, dist.estate_type2, dist.lat2, dist.lng2, dist.cat); + //ÎïÒµ¹«Ë¾ + map.estate_company = getEstateCompany(dist.estate_company); + //ÎïÒµ·Ñ + map.estate_charge = getEstateCharge(dist.estate_charge); + + saveDistrict(map); + } + + static def removeNoUpdate(city, districts){ + def ids = [] + for(def d : districts){ + ids << d._id.toString() + } + DBObject q = new BasicDBObject(); + q.put("city", city) + q.put("cat", "district") + def dbcursor = DIST_COLL.find(q) + for(def cur : dbcursor){ + if(!ids.contains(cur.num_id)){ + def del_data = new BasicDBObject() + del_data.put("num_id", cur.num_id) + DIST_COLL.remove(del_data) + } + } + } + + static def saveDistrict(def m){ + DBObject q = new BasicDBObject(); + q.put("num_id",m.num_id) + def dbo = DIST_COLL.findOne(q); + + DBObject udata = new BasicDBObject(); + m.each {k,v-> + udata.put(k, v); + } + udata.put("m_date", new Date()) + if(dbo){ + udata.removeField("num_id") + DIST_COLL.update(q, new BasicDBObject('$set', udata), false, true); + }else{ + DIST_COLL.save(udata); + } + } + + + //1-Ö÷³ÇÇø£ºÌìÄþÇø¡¢ÖÓÂ¥Çø 2-½¼Çø£ºÎä½øÇø¡¢Ð±±Çø¡¢ÆÝÊûÑßÇø 3-ÏØ¼¶ÊУº½ð̳ÊС¢äàÑôÊÐ + static def getRegionCode(def region){ + if(region.indexOf("ÌìÄþ")!=-1||region.indexOf("ÖÓÂ¥")!=-1){ + return "01"; + }else if(region.indexOf("Îä½ø")!=-1||region.indexOf("б±")!=-1||region.indexOf("ÆÝÊûÑß")!=-1){ + return "02"; + }else if(region.indexOf("½ð̳")!=-1||region.indexOf("äàÑô")!=-1){ + return "03"; + }else{ + return "99"; + } + } + + static def getVirescencePercent(def virescence_percent, def buildDate){ + if(virescence_percent){ + virescence_percent = virescence_percent.replace("%",""); + } + + if(virescence_percent){ + if(virescence_percent.toFloat()>50){ + virescence_percent = ""; + } + } + + if(!virescence_percent && buildDate){ + if(buildDate==1986){ + virescence_percent = 25; + }else if(buildDate == 1987){ + virescence_percent = 30; + }else if(buildDate>=1990 && buildDate<=2009){ + virescence_percent = 25; + }else if(buildDate == 2010){ + virescence_percent = 30; + } + } + + if(virescence_percent){ + virescence_percent = virescence_percent.toDouble()/100; + return new DecimalFormat("######0.00").format(virescence_percent) + } + + return virescence_percent; + } + + + static def getCubagePercent(def cubage_percent, def build_date){ + if(!cubage_percent && build_date){ + if(build_date >=1990 && build_date<=1999){ + return "1.49"; + }else if(build_date==2000){ + return "1.46"; + } + } + return cubage_percent; + } + + static def getBuildDate(def dbo){ + def year = DataHandleUtils.findPattern(dbo.finish_building_date, "(\\d+)"); + if(year){ + year = Integer.parseInt(year); + } + if(year<=1900){ + year = null; + }else{ + return year; + } + if(!year){ + year = DataHandleUtils.findPattern(dbo.live_date, "(\\d+)"); + if(year){ + year = Integer.parseInt(year); + } + if(year<=1900){ + year = null; + }else{ + return year; + } + if(!year){ + def date = DateUtils.formatToYYYYMMDD(dbo.open_date) + year = DataHandleUtils.findPattern(date, "(\\d+)"); + if(year){ + year = Integer.parseInt(year); + } + if(year<=1900){ + year = null; + }else{ + return year; + } + } + } + + if(dbo.build_date){ + year = DataHandleUtils.findPattern(dbo.build_date, "(\\d+)"); + if(year){ + year = Integer.parseInt(year); + } + if(year && year>1900){ + return year; + } + } + return year; + } + + static def getEstateCompany(def company){ + if(company){ + company = company.replace("---","").replace("¡¤",""); + return company; + } + return ""; + } + + static def getEstateCharge(def charge){ + if(charge){ + if(charge == "0.0"){ + return ""; + }else{ + Pattern pa=Pattern.compile("([\\d\\.]+)") + Matcher ma=pa.matcher(charge) + if(ma.find()){ + charge = ma.group(1) + + if(charge.toFloat()>=40){ + return ""; + }else{ + if(charge.endsWith(".0")){ + return charge.substring(0, charge.indexOf(".0")) + }else{ + return charge; + } + } + + }else{ + return ""; + } + } + } + return ""; + } + + static def getRentPrice2(def city, def region, def name, def estate_type2, def lat2, def lng2, def cat){ + def month = CommonDatautils.getDistrictRentLastMonth(city, region, name) + + def priceMap = [:]; + if(month){ + priceMap = CommonDatautils.getDistrictRentPrice(city, region, name, month); + } + + + if(!priceMap){ + priceMap = getRoundAvgRentPrice(city,region, name, estate_type2, lat2, lng2, cat); + } + + + if(priceMap && priceMap.size()>1){ + + def prices = [] + def rooms = []; + for(int i=1;i<=6;i++){ + def price = priceMap.get(i); + if(price){ + if(price>20000||price<300){ + priceMap.remove(i); + }else{ + + if(i>3 && price<1000){ + priceMap.remove(i); + }else{ + prices << price + rooms << i; + } + } + } + } + + //ÅÅÐò + prices.sort(); + rooms.sort(); + if(prices.size()>1){ + priceMap = [:]; + def index = 0; + for(def price : prices){ + index++; + priceMap.put(rooms.get(index-1), price); + + } + } + + filterData(prices, rooms, priceMap); + } + + + if(priceMap && estate_type2.contains("±ðÊû")){ + priceMap.remove(1); + priceMap.remove(2); + + if(priceMap.get(4)<2000){ + priceMap.remove(4); + } + + if(priceMap.get(3)<2000){ + priceMap.remove(3); + } + } + +// if(!priceMap){ +// priceMap = findRegionRentPrice(priceMap, city, region, estate_type2) +// } + + //5ÊÒ¼°ÒÔÉϼ۸ñСÓÚ2000È¥³ý + if(priceMap){ + if(priceMap.get(5)<2000){ + priceMap.remove(5); + } + + if(priceMap.get(6)<3000){ + priceMap.remove(6); + } + } + def newPriceMap = [:] + if(priceMap){ + priceMap.each {k,v-> + newPriceMap.put(k.toString(),v) + } + } + return newPriceMap; + } + + static def findRegionRentPrice(def priceMap,def city, def region, def estate_type2){ + if(!priceMap){ + priceMap = [:] + if(estate_type2=="±ðÊû"){ + def room4 = CommonDatautils.getRegionRent(city, region, 4, "±ðÊû"); + if(room4){ + def v = DataHandleUtils.random(-100, 500) + 100; + priceMap.put(4, room4+v); + + } + }else{ + def room1 = CommonDatautils.getRegionRent(city, region, 1, "Ð¡Çø"); + def room2 = CommonDatautils.getRegionRent(city, region, 2, "Ð¡Çø"); + if(room1){ + def v = DataHandleUtils.random(-100, 300) + 100; + priceMap.put(1, room1+v); + } + + if(room2){ + def v = DataHandleUtils.random(-100, 600) + 100; + priceMap.put(2, room2+v); + } + } + } + return priceMap; + } + + + static def getRoundAvgRentPrice(city,region, name, estate_type2, lat2, lng2, cat ){ + if(lng2 && lat2){ + def lat = lat2/10000000000; + def lng = lng2/10000000000; + def map = CommonDatautils.findMaxLatLngMinLatLng(lat, lng, 1000) + def ret = CommonDatautils.findDistrictsByLatLng(city, cat, map.maxLat*10000000000, map.minLat*10000000000, map.maxLng*10000000000, map.minLng*10000000000, estate_type2); + if(ret){ + def room1_sum = 0; + def room1_count = 0; + def room2_sum = 0; + def room2_count = 0; + for(def obj : ret){ + def rentMap = CommonDatautils.getDistrictPrice(city, region, name, estate_type2) + if(rentMap){ + if(rentMap.get(1)){ + room1_sum = room1_sum + rentMap.get(1); + room1_count ++; + } + + if(rentMap.get(2)){ + room2_sum = room2_sum + rentMap.get(2); + room2_count ++; + } + } + } + def result = [:]; + if(room1_count){ + def room1_avg_price = (room1_sum/room1_count).toInteger(); + if(room1_avg_price){ + result.put(1, room1_avg_price); + } + } + if(room2_count){ + def room2_avg_price = (room2_sum/room2_count).toInteger(); + if(room2_avg_price){ + result.put(2, room2_avg_price); + } + } + return result; + } + } + return null; + } + + + def static filterData(prices, rooms, priceMap){ + def mod = []; + for(int j=1;j=1){ + def room = rooms.get(j); + def price = prices.get(j) + priceMap.remove(room); + prices.remove(j); + } + mod << val; + } + println "mod:"+ mod; + return priceMap; + } + + + //1-Öܱ߹«½»Ïß·¡Ý10Ìõ£»2-Öܱ߹«½»Ïß·£¼10Ìõµ«¡Ý5Ìõ£»3-Öܱ߹«½»Ïß·£¼5Ìõµ«¡Ý2Ìõ£»4-Öܱ߹«½»Ïß·£¼2Ìõ + static def getTrafficCode(def city, def lat, def lng){ + if(lng && lat){ + lat = lat/10000000000; + lng = lng/10000000000; + def map = CommonDatautils.findMaxLatLngMinLatLng(lat, lng, 1000) + def trafficMap = CommonDatautils.findBusLineCount(city, map.maxLat, map.minLat, map.maxLng, map.minLng); + + def count = 0; + if(trafficMap){ + count = trafficMap.bus.size() + } + + if(count>=10){ + return "01"; + }else if(count>=5){ + return "02"; + }else if(count>=2){ + return "03"; + }else if(count < 2){ + return "04"; + } + } + return "99"; + } + + + static def getStopCarCode(def dbo){ + if(dbo.car_site){ + if(dbo.car_site=="
    "||dbo.car_site=="´ý¶¨"||dbo.car_site.indexOf("ÔÝÎÞ")!=-1||dbo.car_site=="ÏêѯÊÛÂ¥´¦"){ + dbo.car_site =""; + } + + if(dbo.car_site){ + return "01"; + } + } + + if(!dbo.car_site){ + def year = DataHandleUtils.findPattern(dbo.build_date, "(\\d+)"); + + if(!year){ + year = DataHandleUtils.findPattern(dbo.finish_building_date, "(\\d+)"); + if(!year){ + year = DataHandleUtils.findPattern(dbo.live_date, "(\\d+)"); + if(!year){ + def date = DateUtils.formatToYYYYMMDD(dbo.open_date) + year = DataHandleUtils.findPattern(date, "(\\d+)"); + } + } + } + + if(year){ + year = Integer.parseInt(year); + } + + if(year && year >= 1980){ + return "01"; + }else if(year && year>0 && year<1980){ + return "02"; + }else{ + if(dbo.name.endsWith("ÆÚ")||dbo.name.indexOf("±ðÊû")!=-1){ + return "01"; + }else{ + + if(dbo.build_type && dbo.build_type.indexOf("¸ß²ã")!=-1){ + return "01"; + }else if(dbo.estate_type2 && dbo.estate_type2=="±ðÊû"){ + return "01"; + }else{ + + def date = CommonDatautils.findHouseBuildDate(dbo.city, dbo.region, dbo.name, "sell") + if(date){ + year = DataHandleUtils.findPattern(date, "(\\d+)"); + if(year && year >= 1980){ + return "01"; + }else if(year && year>0 && year<1980){ + return "02"; + } + } + } + } + } + + return "99" + } + + def endWithChar = ["´å","ËÞÉá","ÌÃ","Ū"]; + for(def s : endWithChar){ + if(dbo.name.endsWith(s)){ + return "02"; + break; + } + } + return "01"; + } + + + static def getSchoolCode(def city, def region, def lat, def lng){ + if(lng && lat){ + lat = lat/10000000000; + lng = lng/10000000000; + def redius = 3000; + if(city=="³£ÖÝ" && (region=="ÌìÄþ"|| region=="ÖÓÂ¥")){ + redius = 1000; + } + def map = CommonDatautils.findMaxLatLngMinLatLng(lat, lng, redius) + def schools = CommonDatautils.findPomDetail(city, "ѧУ", map.minLat, map.maxLat, map.minLng, map.maxLng) + def school_count = 0; + if(schools){ + def names = []; + for(def schoolName : schools){ + if(schoolName.contains("Сѧ") && !names.contains(schoolName)){ + names << schoolName + } + } + + school_count = names.size(); + } + + if(school_count >= 1){ + return 1; + } + return 0; + } + return 0; + } + + + static def getSophisticationCode(def city, def lat, def lng){ + if(lng && lat){ + lat = lat/10000000000; + lng = lng/10000000000; + def map = CommonDatautils.findMaxLatLngMinLatLng(lat, lng, 1000) + def supermarket_count = CommonDatautils.findPomCount(city, "³¬ÊÐ", map.minLat, map.maxLat, map.minLng, map.maxLng) + if(supermarket_count>=5){ + return "01"; + }else{ + map = CommonDatautils.findMaxLatLngMinLatLng(lat, lng, 2000) + supermarket_count = CommonDatautils.findPomCount(city, "³¬ÊÐ", map.minLat, map.maxLat, map.minLng, map.maxLng) + if(supermarket_count >= 5){ + return "02"; + }else{ + return "03"; + } + } + } + return "99"; + } + + + static def getPublicServiceSetCode(def city, def lat, def lng){ + + if(lng && lat){ + lat = lat/10000000000; + lng = lng/10000000000; + def map = CommonDatautils.findMaxLatLngMinLatLng(lat, lng, 1000) + def hspt_count = CommonDatautils.findPomCount(city, "Ò½Ôº", map.minLat, map.maxLat, map.minLng, map.maxLng) + def bank_count = CommonDatautils.findPomCount(city, "ÒøÐÐ", map.minLat, map.maxLat, map.minLng, map.maxLng) + def school_count = CommonDatautils.findPomCount(city, "ѧУ", map.minLat, map.maxLat, map.minLng, map.maxLng) + def supermarket_count = CommonDatautils.findPomCount(city, "³¬ÊÐ", map.minLat, map.maxLat, map.minLng, map.maxLng) + + def yl_count1 = CommonDatautils.findPomCount(city, "KTV", map.minLat, map.maxLat, map.minLng, map.maxLng) + def yl_count2 = CommonDatautils.findPomCount(city, "µçÓ°Ôº", map.minLat, map.maxLat, map.minLng, map.maxLng) + def yl_count3 = CommonDatautils.findPomCount(city, "Íø°É", map.minLat, map.maxLat, map.minLng, map.maxLng) + def yl_count4 = CommonDatautils.findPomCount(city, "½¡ÉíÖÐÐÄ", map.minLat, map.maxLat, map.minLng, map.maxLng) + + if(hspt_count>=1 && bank_count>=1 && school_count>=1 && supermarket_count>=1 && (yl_count1>=1 || yl_count2>=1 || yl_count3>=1||yl_count4>=1)){ + return "01"; + }else{ + map = CommonDatautils.findMaxLatLngMinLatLng(lat, lng, 2000) + hspt_count = CommonDatautils.findPomCount(city, "Ò½Ôº", map.minLat, map.maxLat, map.minLng, map.maxLng) + bank_count = CommonDatautils.findPomCount(city, "ÒøÐÐ", map.minLat, map.maxLat, map.minLng, map.maxLng) + school_count = CommonDatautils.findPomCount(city, "ѧУ", map.minLat, map.maxLat, map.minLng, map.maxLng) + + yl_count1 = CommonDatautils.findPomCount(city, "KTV", map.minLat, map.maxLat, map.minLng, map.maxLng) + yl_count2 = CommonDatautils.findPomCount(city, "µçÓ°Ôº", map.minLat, map.maxLat, map.minLng, map.maxLng) + yl_count3 = CommonDatautils.findPomCount(city, "Íø°É", map.minLat, map.maxLat, map.minLng, map.maxLng) + yl_count4 = CommonDatautils.findPomCount(city, "½¡ÉíÖÐÐÄ", map.minLat, map.maxLat, map.minLng, map.maxLng) + + if(hspt_count>=1 && bank_count>=1 && school_count>=1 && supermarket_count>=1 && (yl_count1>=1 || yl_count2>=1 || yl_count3>=1||yl_count4>=1)){ + return "02"; + }else{ + return "03"; + } + } + } + return "99"; + } + + static def getDistrictPrice(def city, def region, def name, def address, def block){ + + def price = CommonDatautils.findDistrictPrice(city, region, name); + if(price){ + return price.avg_price; + }else{ +// //ÑùÀý¹À¼Û +// def s = OpenApiClient.evaluateDistrictPriceBySimilarHouse3(city, region, name, 100, false); +// try{ +// JSONObject jsonObject = JSONObject.fromObject(s); +// def map = DataHandleUtils.JsonToMap(jsonObject); +// if(map.code==200){ +// if(map.result){ +// return map.result.avgPrice; +// } +// +// } +// }catch(Exception e){ +// +// } + + + //·ÖÆÚÕÒ×ÜÆÚ + if(name.toString().endsWith("ÆÚ")){ + def tempname = name.toString().substring(0, name.toString().indexOf("ÆÚ")-1) + def districtStat = CommonDatautils.findDistrictPrice(city, region, tempname); + if(districtStat && districtStat.avg_price){ + return districtStat.avg_price+150; + } + } + + if(name.toString().endsWith("Çø")){ + def tempname = name.toString().substring(0, name.toString().indexOf("Çø")-1) + def districtStat = CommonDatautils.findDistrictPrice(city, region, tempname); + if(districtStat && districtStat.avg_price){ + return districtStat.avg_price+100; + } + } + + //Öܱ߾ù¼Û +// price = findAroundAvgPrice(city, address, 100); +// if(price){ +// return price.toString() +// } + + //°å¿é¾ù¼Û + if(block){ + price = CommonDatautils.queryCityRegionPrice(city, region, block); + if(price){ + return price.toInteger() + } + } + + //ÇøÓò¾ù¼Û + if(!block||!price){ + price = CommonDatautils.queryCityRegionPrice(city, region, null); + if(price){ + return price.toInteger() + } + } + + } + return null; + + } + + static def getShopPrice(def priceString, def city, def region, def name){ + + if(priceString){ + def avgPrice = priceString.replace("Ôª/©O","").replace("·¿Ô´¼Û", "").replace("·¿Ô´", ""); + if(avgPrice.indexOf("-")!=-1){ + def array = avgPrice.split("-") + if(array.length>1){ + avgPrice = ((array[1].toInteger()+array[0].toInteger())/2).toInteger(); + + def v = DataHandleUtils.random(-100, 300) + 100; + return avgPrice.toInteger()+v; + } + }else{ + def v = DataHandleUtils.random(-100, 300) + 100; + return avgPrice.toDouble().toInteger()+v; + } + }else{ + def avgPrice = CommonDatautils.queryShopPrice(city, region, name); + if(avgPrice){ + return avgPrice; + } + } + + def avgPrice = CommonDatautils.queryRegionBusinessPrice(city, region); + if(avgPrice){ + def v = DataHandleUtils.random(-100, 300) + 100; + return avgPrice.toInteger()+v; + } + + return null; + } + + + static def getRentNumber(def rentPrice,def city, def region, def name){ + if(rentPrice){ + if(rentPrice.indexOf("Ôª/©O/Ìì")!=-1){ + rentPrice = rentPrice.replace("Ôª/©O/Ìì",""); + if(rentPrice){ + return rentPrice.toDouble(); + } + }else if(rentPrice.indexOf("Ôª/©O/ÔÂ")!=-1){ + def price = rentPrice.replace("Ôª/©O/ÔÂ","").toString().trim(); + price = price.toFloat(); + price = price/30; + return DataHandleUtils.getDoubleRound(2, price.toDouble()); + }else{ + if(rentPrice.contains("-")){ + rentPrice = rentPrice.substring(0, rentPrice.indexOf("-")); + } + return DataHandleUtils.getDoubleRound(2, rentPrice.toDouble()); + } + }else{ + def day_avg_price = CommonDatautils.queryBusinessDayPrice(city, region, name, "ÉÌÆÌ"); + if(day_avg_price){ + return day_avg_price; + } + } + return null; + } + + static def getStreetCode(def val){ + if(val){ + if(val == "ÎÞ½»Í¨¹ÜÖÆ"){ + return 1; + }else if(val == "µ¥ÐеÀ"){ + return 2; + }else if(val == "½ûÐÐ"){ + return 3; + } + return 1; + } + return 1; + } + + static def getShopEstateTypeCode(def estateType){ + if(estateType){ + if(estateType.indexOf("É̳¡ÉÌÆÌ")!=-1){ + return 1; + }else if(estateType.indexOf("רҵÊг¡")!=-1){ + return 2; + }else if(estateType.indexOf("ÉÌÒµ½Ö")!=-1){ + return 3; + }else if(estateType.indexOf("ÉçÇøÉÌÆÌ")!=-1){ + return 4; + } + } + return 99; + } + + +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/EmailConsumer.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/EmailConsumer.groovy index f43bda14e..3908e4ca6 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/EmailConsumer.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/jms/EmailConsumer.groovy @@ -98,7 +98,7 @@ public class EmailConsumer extends BaseBatch { } } else { - println "send error ${errorCount}, sleep ${sleepTime / 1000}s ..." + println "${mail.receiver_email} send error ${errorCount}, sleep ${sleepTime / 1000}s ..." sleep(sleepTime); } } @@ -133,7 +133,7 @@ public class EmailConsumer extends BaseBatch { email.setHostName(EMAIL_SERVER); email.setSslSmtpPort("465"); email.setCharset("GBK") - email.setAuthentication("service@fangjia.com", "bRvvVvic8HVgHkCi"); + email.setAuthentication("service@fangjia.com", "iXWzdL69CnzxksaE"); email.addTo(mail.receiverEmail); email.setFrom("service@fangjia.com");//·¢ËÍ·½ email.setSubject(mail.subject); //±êÌâ @@ -168,7 +168,7 @@ public class EmailConsumer extends BaseBatch { email.setHostName(EMAIL_SERVER); email.setSslSmtpPort("465"); email.setCharset("GBK") - email.setAuthentication("service@fangjia.com", "bRvvVvic8HVgHkCi"); + email.setAuthentication("service@fangjia.com", "iXWzdL69CnzxksaE"); email.addTo(mail.receiverEmail); email.setFrom("service@fangjia.com"); email.setSubject(mail.subject); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/FillLngLat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/FillLngLat.groovy index a0c3ec24f..3c5c2a52d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/FillLngLat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/poi/FillLngLat.groovy @@ -1,6 +1,7 @@ package com.fangjia.script.temp.shenjian.poi import com.alibaba.fastjson.JSONObject +import com.fangjia.script.temp.shenjian.util.BaiDuUtils import com.fangjia.script.temp.shenjian.util.EsUtils import com.fangjia.script.temp.shenjian.util.GaoDeUtils import com.fangjia.script.util.ElasticUtils @@ -15,25 +16,26 @@ import java.util.concurrent.Executors */ class FillLngLat { - static ExecutorService executorService = Executors.newFixedThreadPool(4) +// static ExecutorService executorService = Executors.newFixedThreadPool(4) static void main(String[] args) { - ElasticUtils.executeSqlQuery("select * from dws_poi where location is not null", { dataT -> + ElasticUtils.executeSqlQuery("select * from dws_poi where location is null", { dataT -> final def data = dataT - executorService.submit(new Runnable() { - @Override - void run() { +// executorService.submit(new Runnable() { +// @Override +// void run() { println(data) - def lngLat = GaoDeUtils.parserByGaode(data.city, data.region + data.name + data.address) + def lngLat = BaiDuUtils.parserByBaidu(data.city, data.region + data.name + data.address) + Thread.sleep(1000) if (lngLat != null && lngLat.size() == 2 ) { JSONObject jsonObject = new JSONObject() jsonObject.put("lon", Double.valueOf(lngLat['lng'])) jsonObject.put("lat", Double.valueOf(lngLat['lat'])) EsUtils.bulkUpdateFieldByIds("dws_poi", "location", jsonObject, Arrays.asList(data.source_id)) } - } - }) +// } +// }) }) - executorService.shutdown() + //executorService.shutdown() } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/BaiDuUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/BaiDuUtils.groovy new file mode 100644 index 000000000..e307bf28a --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/BaiDuUtils.groovy @@ -0,0 +1,48 @@ +package com.fangjia.script.temp.shenjian.util + +import com.alibaba.fastjson.JSONObject +import com.fangjia.core.util.GeoUtils +import com.fangjia.core.util.HttpRequest +import com.fangjia.script.util.DataUtil +import org.apache.commons.lang.StringUtils + +/** + * °Ù¶È¹¤¾ßÀà + * + * @author shenjian + * @since 2022/10/28 + */ +class BaiDuUtils { + + def static final String KEY = "6w9SEHS3hnAFjmY2oEhqIDdgvLPKWXu5" + + /** + * °Ù¶ÈµØÖ·Äæ½âÎö£¬·µ»Ø¸ßµÂ×ø±ê!!!!!!!!!!!!!!! + * @param city + * @param address + */ + def static parserByBaidu(def city, def address) { + Map params = new HashMap() + params.put("city", city) + if (StringUtils.isBlank(address)) { + return [] + } + params.put("address", address.replaceAll("null", "")) + params.put("output", "json") + params.put("ak", KEY) + params.put("callback", "showLocation") + + String content + content = new HttpRequest().get("https://api.map.baidu.com/geocoding/v3/", params, "utf-8") + //content = "showLocation&&showLocation({\"status\":0,\"result\":{\"location\":{\"lng\":131.04009309945693,\"lat\":45.78426770180344},\"precise\":1,\"confidence\":70,\"comprehension\":100,\"level\":\"µØ²úÐ¡Çø\"}})" + content = content.replaceAll("showLocation&&showLocation\\(", "").replaceAll("\\)", "") + JSONObject json = JSONObject.parseObject(content) + if (json.status == 0 && json.result && json.result.location) { + def bd_lng = json.result.location.lng + def bd_lat = json.result.location.lat + Map locationMap = GeoUtils.bd09ToGcj02(bd_lat, bd_lng) + return ["lng": com.fangjia.core.util.DataUtil.getDoubleRound(6, locationMap['lng']), "lat": com.fangjia.core.util.DataUtil.getDoubleRound(6, locationMap['lat'])] + } + return [] + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy index 17b02bb6b..2a34dd4b3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/util/GaoDeUtils.groovy @@ -247,6 +247,35 @@ class GaoDeUtils { return Collections.emptyList() } + + static List getAmapById2(id){ + def params = [:] + params.id = id + params.output = 'json' + params.key = "66e6771767ab293ace441553c36621c1" + JSONObject json = HttpRequestUtil.getJsonContent("https://restapi.amap.com/v5/place/detail", params); + if (json == null) { + json = HttpRequestUtil.getJsonContent("https://restapi.amap.com/v5/place/detail", params); + } + if (json && json.info && json.info == "OK") { + try { + List ret = JSONObject.parseArray(json.pois.toString(), AmapPoi.class) + return ret + } catch(Exception ex) { + ex.printStackTrace() + } + } else if (json && json.infocode && json.infocode == "10044") { + System.exit(1) + } else if (json && json.infocode && json.infocode == "10004") { + // ¿ª·¢Õߵĵ¥Î»Ê±¼äÄÚ£¨1·ÖÖÓ£©·ÃÎÊÁ¿³¬ÏÞ£¬±»ÏµÍ³×Ô¶¯·âÍ££¬ÏÂÒ»·ÖÖÓ×Ô¶¯½â·â¡£ + Thread.sleep(60000) + } else if (json && json.infocode && json.infocode == "10017") { + // ËùÇëÇóµÄ×ÊÔ´²»¿ÉÓà + System.exit(1) + } + return Collections.emptyList() + } + /** * »ñÈ¡ÏêÇé */ diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/DataStandardBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/DataStandardBatch.groovy index 7c1ad2c31..b5f86bf1b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/DataStandardBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/DataStandardBatch.groovy @@ -120,9 +120,9 @@ class DataStandardBatch extends BaseBatch{ def final AtomicInteger count_ = new AtomicInteger(0) def final AtomicInteger successIndex = new AtomicInteger(0) datas.each { dbo -> -// fixedThreadPool.execute( -// new Runnable() { -// void run() { + fixedThreadPool.execute( + new Runnable() { + void run() { try{ println "(${rowIndex}-${count}-${count_.incrementAndGet()})¡¾${dbo.city}-${dbo.region}-${dbo.name}-${dbo.address}-${dbo.source}¡¿" if(dbo.name){ @@ -162,12 +162,12 @@ class DataStandardBatch extends BaseBatch{ }finally { latch.countDown() } -// } -// } -// ); + } + } + ); } -// latch.await() + latch.await() long end = System.currentTimeMillis() println "µÚ¡¾${rowIndex}¡¿´ÎÖÐÆ¥Åä³É¹¦µÄ£º"+successCount+" ¸ö£¬ºÄʱ£º"+ (end - start)+" "+ DateUtils.format(new Date(),"yyyy-MM-dd HH:mm:ss") @@ -920,7 +920,7 @@ class DataStandardBatch extends BaseBatch{ def findAllNoMatchData(){ DBObject qdata = new BasicDBObject(); qdata.put("s_date", SHORT_DATE) -// qdata.put("city","±±¾©") +// qdata.put("city","¸£ÖÝ") // qdata.put("source","°²¾Ó¿Í") // qdata.put("name",Pattern.compile("¹¨¼ÒÕ¬.*")) qdata.put("status", new BasicDBObject(QueryOperators.EXISTS, false)); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/DataStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/DataStat.groovy index e76898c7f..595fdeafb 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/DataStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/DataStat.groovy @@ -40,11 +40,11 @@ class DataStat { def run(){ - def source = "°²¾Ó¿Í"// - def citys = findCrawlCity(source, 202208); + def source = "ËÑ·¿"// + def citys = findCrawlCity(source, 202301); for(def city : citys){ - def count1 = findCount(source, city, 202208); - def count2 = findCount(source, city, 202209); + def count1 = findCount(source, city, 202301); + def count2 = findCount(source, city, 202302); println city +" "+count1+" "+count2 // println count1 // println "--- ----" diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/SynchDistrictPrice.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/SynchDistrictPrice.groovy index f954743e4..175b2ebd1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/SynchDistrictPrice.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/SynchDistrictPrice.groovy @@ -24,9 +24,10 @@ class SynchDistrictPrice extends BaseBatch{ // "anjuke.com":"°²¾Ó¿Í","cityhouse.cn":"³ÇÊз¿²ú","zhuge.com":"Öî¸ðÕÒ·¿","5i5j.com":"ÎÒ°®ÎÒ¼Ò","jiwu.com":"¼ªÎÝ"] def sourceMap = ["ke.com":"±´¿ÇÕÒ·¿","cityhouse.cn":"³ÇÊз¿²ú"] - // "¼ªÎÝ":"¼ªÎÝ","365ÌÔ·¿":"365ÌÔ·¿","ÎÒ°®ÎÒ¼Ò":"ÎÒ°®ÎÒ¼Ò","Öî¸ðÕÒ·¿APP":"Öî¸ðÕÒ·¿","±´¿Ç":"±´¿ÇÕÒ·¿","Á´¼Ò":"Á´¼Ò","Q·¿":"Q·¿","ÂóÌï":"ÂóÌï","ÖÐÔ­µØ²ú":"ÖÐÔ­µØ²ú","°²¾Ó¿ÍС³ÌÐò":"°²¾Ó¿Í","ËÑ·¿":"ËÑ·¿","ÀÖÓмÒ":"ÀÖÓмÒ","C21":"C21","³ÇÊз¿²ú":"³ÇÊз¿²ú" - def esSources = ["ÖÐÔ­µØ²ú":"ÖÐÔ­µØ²ú"] - + // "¼ªÎÝ":"¼ªÎÝ","365ÌÔ·¿":"365ÌÔ·¿","ÎÒ°®ÎÒ¼Ò":"ÎÒ°®ÎÒ¼Ò","Öî¸ðÕÒ·¿APP":"Öî¸ðÕÒ·¿","±´¿Ç":"±´¿ÇÕÒ·¿","Á´¼Ò":"Á´¼Ò","Q·¿":"Q·¿","ÂóÌï":"ÂóÌï", + // "ÖÐÔ­µØ²ú":"ÖÐÔ­µØ²ú","°²¾Ó¿ÍС³ÌÐò":"°²¾Ó¿Í","ËÑ·¿":"ËÑ·¿","ÀÖÓмÒ":"ÀÖÓмÒ","C21":"C21","³ÇÊз¿²ú":"³ÇÊз¿²ú","Íò©Ê¿PC¶Ë":"Íò©Ê¿" +// def esSources = ["ÎÒ°®ÎÒ¼Ò":"ÎÒ°®ÎÒ¼Ò","Íò©Ê¿PC¶Ë":"Íò©Ê¿","¼ªÎÝ":"¼ªÎÝ","±´¿ÇÕÒ·¿":"±´¿ÇÕÒ·¿","ÀÖÓмÒ":"ÀÖÓмÒ","365ÌÔ·¿":"365ÌÔ·¿","Öî¸ðÕÒ·¿APP":"Öî¸ðÕÒ·¿","Á´¼Ò":"Á´¼Ò","Q·¿":"Q·¿","ÂóÌï":"ÂóÌï","ÖÐÔ­µØ²ú":"ÖÐÔ­µØ²ú","°²¾Ó¿ÍС³ÌÐò":"°²¾Ó¿Í","ËÑ·¿":"ËÑ·¿","C21":"C21","³ÇÊз¿²ú":"³ÇÊз¿²ú"] + def esSources = ["ÎÒ°®ÎÒ¼Ò":"ÎÒ°®ÎÒ¼Ò","Íò©Ê¿PC¶Ë":"Íò©Ê¿","¼ªÎÝ":"¼ªÎÝ","±´¿ÇÕÒ·¿":"±´¿ÇÕÒ·¿","ÀÖÓмÒ":"ÀÖÓмÒ","365ÌÔ·¿":"365ÌÔ·¿","Öî¸ðÕÒ·¿APP":"Öî¸ðÕÒ·¿","Á´¼Ò":"Á´¼Ò","Q·¿":"Q·¿","ÂóÌï":"ÂóÌï","ÖÐÔ­µØ²ú":"ÖÐÔ­µØ²ú","°²¾Ó¿ÍС³ÌÐò":"°²¾Ó¿Í","ËÑ·¿":"ËÑ·¿","C21":"C21","³ÇÊз¿²úС³ÌÐò":"³ÇÊз¿²ú"] static main(args) { runBatch(new SynchDistrictPrice(), args); @@ -42,7 +43,6 @@ class SynchDistrictPrice extends BaseBatch{ println "starting......" def mdate = DateUtils.formatDateByPattern(DateUtils.getFirstDayOfMonth(new Date(), -1), "yyyy-MM-dd") def citys = CommonUtils.findAllCity() - esSources.each{esSource, mgSource-> for(def city : citys){ def rets = findAllEsData(city, esSource, mgSource, mdate) @@ -145,7 +145,7 @@ class SynchDistrictPrice extends BaseBatch{ println "["+source +"-"+city + "] add:"+ rets.size()+" ԭץȡ£º"+count }else{ for(def r : rets){ - def obj= findIsExists(r.city, r.region, r.name, r.estate_type, SHORT_DATE, source) + def obj= findIsExists(r.city, r.region, r.name, SHORT_DATE, source) if(obj){ updateIndex++ // thirdPartyColl.remove(new BasicDBObject('_id',obj._id)) @@ -183,16 +183,14 @@ class SynchDistrictPrice extends BaseBatch{ } - def findIsExists(def city, def region, def name, estate_type, def sDate, def source){ + def findIsExists(def city, def region, def name, def sDate, def source){ def q = new BasicDBObject() q.put("source", source) q.put("s_date", sDate) q.put("city", city) q.put("region", region) q.put("name", name) - if(estate_type){ - q.put("estate_type",estate_type) - } + def obj = thirdPartyColl.findOne(q) return obj } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/TestCrawlTotalCount.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/TestCrawlTotalCount.groovy index 99355ab2a..bdd887539 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/TestCrawlTotalCount.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/thirdPriceCrawl/TestCrawlTotalCount.groovy @@ -14,8 +14,8 @@ class TestCrawlTotalCount { def run(){ def sources = ["·¿¹À¹À","Öî¸ðÕÒ·¿","°²¾Ó¿Í","ËÑ·¿","ÖÐÔ­µØ²ú","¸Ï¼¯","Á´¼Ò","Íò©Ê¿","³ÇÊз¿²ú","±´¿ÇÕÒ·¿","Q·¿","Q·¿(ÐÂ)","ÖÐÔ­µØ²ú(ÐÂ)","ÀÖÓмÒ","ÀÖÓмÒ(ÐÂ)","·¿Ì½","·¿¶à¶à","С×ʼÒ","ÎÒ°®ÎÒ¼Ò","ÂóÌï","·¿Í¾","C21","ÀÖ¾Ó","·¿²ú³¬ÊÐ","58ͬ³Ç","365ÌÔ·¿","¼ªÎÝ"] for(def source :sources){ - def count1 = findTotalCount(source, 202208); - def count2 = findTotalCount(source, 202209); + def count1 = findTotalCount(source, 202302); + def count2 = findTotalCount(source, 202303); println source +" "+count1 +" "+count2 } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/trade/OpenUriUserIdCountDay.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/trade/OpenUriUserIdCountDay.groovy index 4e27d62a5..954fface3 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/trade/OpenUriUserIdCountDay.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/trade/OpenUriUserIdCountDay.groovy @@ -27,19 +27,11 @@ class OpenUriUserIdCountDay extends BaseBatch { runBatch(new OpenUriUserIdCountDay(), args) } final static def EMAILS = [ - "joe@fangjia.com", "wangwenyan@fangjia.com", "xiaohai@fangjia.com", "caoyuyan@fangjia.com", "jiangxiaochun@fangjia.com", - "gaojuan@fangjia.com", - 'shijing@fangjia.com', - 'zhongjingyi@fangjia.com', - "duweiliang@fangjia.com", - "sunjian@fangjia.com", - "yaojingmeng@fangjia.com", - "xuqi@fangjia.com", - "wangpeili@fangjia.com" + "gaojuan@fangjia.com" ] @Override diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/BaiduMapUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/BaiduMapUtils.groovy index 3bfe575e9..2eb3fcfed 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/BaiduMapUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/BaiduMapUtils.groovy @@ -1,5 +1,6 @@ package com.fangjia.script.util +import com.fangjia.core.util.HttpRequest import com.fangjia.core.util.RandomUtil import com.fangjia.script.addrepo.InvokeHttpRequest; import groovy.json.JsonSlurper @@ -103,24 +104,20 @@ class BaiduMapUtils { int recount = 0; while(!stop && recount<3) { try{ - def ret = ABuYunUtil.doGet(url, null, null, "utf-8"); - if (ret) { - JSONObject jsonObj = JSONObject.fromObject(ret); - - if(jsonObj.getInt("status") == 121){ - println "key over" - changeAK() - recount++; + HttpRequest request = new HttpRequest(); + try{ + String result = request.get(url,null,"UTF-8"); + JSONObject json = JSONObject.fromObject(result); + if(json.getInt("status") >= 300){ + changeAK(); + json = searchByAddress(address); }else{ - def result = jsonObj.result; - if(result){ - stop = true - return result; - }else{ - stop = true - } + return json.result } + }catch (Exception e){ + e.printStackTrace(); } + return null; }catch (Exception e){ recount++; println e.getMessage() diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/DataUtil.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/DataUtil.groovy index b18f43f40..9d9f4c2d0 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/DataUtil.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/DataUtil.groovy @@ -109,7 +109,8 @@ public class DataUtil { //System.out.println(isCellPhoneNumber("15221169682")); //System.out.println(isCellPhoneNumber("12345611123")); //println getRound(2,125.269); - println formateAddress("ËÕÖÝ","½­ËÕ·56ºÅ"); +// println formateAddress("ËÕÖÝ","½­ËÕ·56ºÅ"); + } public static String getHanzi(String s) { @@ -243,7 +244,7 @@ public class DataUtil { return ""; } String regEx = "<[^>]*(>)?"; - return str.replaceAll(regEx, ""); + return str.replaceAll(regEx, " "); } public static Pattern nameTags = Pattern.compile(']*)(\\s|$|>)'); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/DbUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/DbUtils.groovy index 7e6e73263..96709e230 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/DbUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/DbUtils.groovy @@ -335,8 +335,15 @@ public class DbUtils{ keys.append("lng2", 1) keys.append("estate_type2", 1) DbUtils.SEAWEED_SLAVE.find(query, keys).each {BasicDBObject dbo-> + if(!district._id || dbo._id != district._id){ - districts << dbo + if(district.estateType){ + if(dbo.estate_type2 == district.estateType){ + districts << dbo + } + }else{ + districts << dbo + } } } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/ElasticUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/ElasticUtils.groovy index c30a1353a..242e1b8a1 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/ElasticUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/ElasticUtils.groovy @@ -221,6 +221,9 @@ class ElasticUtils { searchHit.getSourceAsMap().put("id", searchHit.getId()); results << searchHit.getSourceAsMap() } + if(results.size()%100000==0){ + println "."+ new Date() + } SearchScrollRequest scrollRequest = new SearchScrollRequest(scrollId); scrollRequest.scroll(scroll); searchResponse = client.scroll(scrollRequest, RequestOptions.DEFAULT); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/MongoUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/MongoUtils.groovy index 34186b830..ec6fa0a0b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/MongoUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/MongoUtils.groovy @@ -65,6 +65,8 @@ class MongoUtils { if (domainUrl == MongoDB_Domain_mongo) { port == 28017; } + + if ((domainUrl == "192.168.0.136") && (port == 27017 || port == 28017)) { return com.fangjia.core.util.MongoUtils.getDbCollection(Constants.TEST_FANGJIA_MONGO_URI, db, name) } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/OpenApiClient.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/OpenApiClient.groovy index 7c37cae97..0d0647082 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/OpenApiClient.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/util/OpenApiClient.groovy @@ -1105,6 +1105,30 @@ public class OpenApiClient { return null } + public static JSONObject addressEvaluation(city, region, address, size){ + try { + HttpRequest request = new HttpRequest(); + Map params = new HashMap(); + params.put("city", city); + params.put("district", region); + params.put("address", address); + params.put("size", String.valueOf(size)); + params.put("token", TOKEN); + String response = request.get("http://open.fangjia.com/property/addressEvaluate", params, "UTF-8"); + JSONObject result = JSONObject.fromObject(response); + if (result.getInt("code") == 200) { + if (result.containsKey("result")) { + return result.getJSONObject("result") + } + } else if (result.getInt("code") == 500) { + println("µØÖ·¹À¼Ûʧ°Ü:${city} ${address} ${size} ${result}") + } + } catch (Exception e) { + e.printStackTrace(); + } + return null + } + public static JSONObject evaluateDistrictPriceByAddress(String city, String address, double size) { try { HttpRequest request = new HttpRequest(); diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/Test4.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/Test4.groovy index 09877e434..c6dcfa9bd 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/Test4.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/Test4.groovy @@ -1 +1,18 @@ package com.fangjia.script.wenyan + +import com.fangjia.core.ProvinceData +import com.fangjia.script.util.Jms +import com.fangjia.core.util.DateUtil +import com.fangjia.core.util.Mongo3Utils +import com.fangjia.datastore.driver.DSCollection +import com.fangjia.datastore.driver.DataStore +import com.fangjia.script.util.CommonUtils +import com.fangjia.script.util.DbUtils +import com.fangjia.script.util.ElasticUtils +import com.mongodb.client.MongoCollection +import org.bson.Document + +def jms = Jms.create("tcp://jms.db.fangjia.com:61616") + +jms.sendMail("1142375881@qq.com", "²âÊÔ", "²âÊÔÄÚÈÝ") +println('1111') \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/DongGuanBank.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/DongGuanBank.groovy new file mode 100644 index 000000000..b1a045e3f --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/DongGuanBank.groovy @@ -0,0 +1,43 @@ +package com.fangjia.script.wenyan.temp + +import com.fangjia.core.Constants +import com.fangjia.core.util.DateUtil +import com.fangjia.core.util.Mongo3Utils +import com.fangjia.script.util.ExcelUtils +import com.mongodb.client.MongoCollection +import net.sf.json.JSONObject +import org.bson.Document + +import static com.mongodb.client.model.Filters.* + +MongoCollection OPEN_URI_LOG = Mongo3Utils.getDbCollection(Constants.SEAWATER_MONGO_URI, "business", "open_uri_log") +def startDate = DateUtil.parseDate("20230301", "yyyyMMdd") +def endDate = DateUtil.parseDate("20230401", "yyyyMMdd") +Calendar calendar = Calendar.getInstance() +calendar.setTime(startDate) +def count = 0 +def hashSet = [] +def data = [["±àºÅ", "¹«Ë¾Ãû³Æ", "IP", "·ÃÎÊÁ´½Ó", "·ÃÎÊʱ¼ä", "dataStatus", "code", "msg", "²ÎÊý", "·µ»Ø²ÎÊý"]] +while (startDate.before(endDate)) { + calendar.add(Calendar.DATE, 1) + def nextDate = calendar.getTime() + count++ + OPEN_URI_LOG.find(and(eq("user_id", "1007713"), eq("request_uri", "/property/evaluate"), eq("data_status", 1), lt("c_date", nextDate), gte("c_date", startDate))).each { Document doc -> + def result = JSONObject.fromObject(doc.res_map.result) +// if (!hashSet.contains(result)) { + def item = [doc._id.toString(), "¶«Ý¸ÒøÐÐ×ÜÐÐ", doc.ip, doc.request_uri, doc.c_date.format("yyyy-MM-dd HH:mm:ss"), doc.data_status, doc.code, doc.msg, JSONObject.fromObject(doc.parameter_map).toString(), result.toString()] + data << item +// hashSet << result +// } else { +// println("ÒÑ´æÔÚ") +// } + } + if (count % 7 == 0) { + hashSet.clear() + } + + startDate = nextDate +} +ExcelUtils.write("D:\\Êý¾Ý\\¶«Ý¸\\¶«Ý¸ÒøÐÐ×ÜÐÐ(²»È¥ÖØ).xlsx", data, "202303") + + diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/QinLin.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/QinLin.groovy index 8bca701d7..bbc24f035 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/QinLin.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/QinLin.groovy @@ -11,8 +11,8 @@ import org.bson.Document import static com.mongodb.client.model.Filters.* MongoCollection OPEN_URI_LOG = Mongo3Utils.getDbCollection(Constants.SEAWATER_MONGO_URI, "business", "open_uri_log") -def startDate = DateUtil.parseDate("20220601", "yyyyMMdd") -def endDate = DateUtil.parseDate("20220701", "yyyyMMdd") +def startDate = DateUtil.parseDate("20220901", "yyyyMMdd") +def endDate = DateUtil.parseDate("20221001", "yyyyMMdd") Calendar calendar = Calendar.getInstance() calendar.setTime(startDate) def count = 0 @@ -25,7 +25,7 @@ while (startDate.before(endDate)) { OPEN_URI_LOG.find(and(eq("user_id", "1007705"), eq("request_uri", "/property/detail"), eq("data_status", 1), lt("c_date", nextDate), gte("c_date", startDate))).each { Document doc -> def result = JSONObject.fromObject(doc.res_map.result) if (!hashSet.contains(result)) { - def item = ["60a3202c0b42a00001aad385", "qlkjgx", doc.ip, doc.request_uri, doc.c_date.format("yyyy-MM-dd HH:mm:ss"), doc.data_status, doc.code, doc.msg, JSONObject.fromObject(doc.parameter_map).toString(), result.toString()] + def item = ["60a3202c0b42a00001aad385", "qlkj", doc.ip, doc.request_uri, doc.c_date.format("yyyy-MM-dd HH:mm:ss"), doc.data_status, doc.code, doc.msg, JSONObject.fromObject(doc.parameter_map).toString(), result.toString()] data << item hashSet << result } else { @@ -38,4 +38,15 @@ while (startDate.before(endDate)) { startDate = nextDate } -ExcelUtils.write("D:\\Ç×ÁÚÊý¾Ý${startDate.format('yyyyMM')}.xlsx", data, "²éѯÈÕÖ¾") \ No newline at end of file +ExcelUtils.write("D:\\Ç×ÁÚÊý¾Ý${startDate.format('yyyyMM')}.xlsx", data, "²éѯÈÕÖ¾") + + +//def list = [] +//OPEN_URI_LOG.find(and(eq("user_id", "1007777"), eq("request_uri", "/property/avgPrice"))).each { Document doc -> +// def result = doc.res_map.result +// def item = [ "Ȫ¹û", doc.request_uri, doc.c_date.format("yyyy-MM-dd HH:mm:ss"), doc.data_status, doc.code, doc.msg, JSONObject.fromObject(doc.parameter_map).toString(), result.toString()] +// list << item +//} +//ExcelUtils.write("D:\\Ȫ¹û½Ó¿Ú²é¼Û.xlsx", list, "²éѯÈÕÖ¾") + + diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/amap/GaoDeApiUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/amap/GaoDeApiUtils.groovy index fdcf818c3..4d301536b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/amap/GaoDeApiUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/amap/GaoDeApiUtils.groovy @@ -12,7 +12,7 @@ import org.jsoup.Jsoup import java.util.zip.GZIPInputStream class GaoDeApiUtils { - def static GAO_DE_AK = "90010d53a16ce9df544acab297645106" + def static GAO_DE_AK = "c6fcd4bfbc40d73ee762b8115dca3390" /** * ¾­Î³¶ÈתµØÖ·
    diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictUpdateTaskService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictUpdateTaskService.java index 00f070360..4e67035de 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictUpdateTaskService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictUpdateTaskService.java @@ -23,4 +23,6 @@ public interface DistrictUpdateTaskService { void createTask(District district, int optType,String newName,String newRegion); void createTask(District district); + + void createTask(District district, int status); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictUpdateTaskServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictUpdateTaskServiceImpl.java index ead37841c..09cb92118 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictUpdateTaskServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/datastore/DistrictUpdateTaskServiceImpl.java @@ -30,6 +30,11 @@ public class DistrictUpdateTaskServiceImpl implements DistrictUpdateTaskService districtUpdateTaskDao.createTask(district); } - + + @Override + public void createTask(District district, int status) { + districtUpdateTaskDao.createTask(district, status); + } + } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AverageStatisticsService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AverageStatisticsService.java index 25eb7040d..4fff15570 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AverageStatisticsService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AverageStatisticsService.java @@ -17,4 +17,6 @@ public interface AverageStatisticsService { AverageStatistics findSecendAverageStatictics(String city,String region,String name,String category); Map findFirstAverageStatictics(String city,String region,String name,String category, Date sDate); + + AverageStatistics save(AverageStatistics averageStatistics); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AverageStatisticsServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AverageStatisticsServiceImpl.java index 772d5594c..fef0b66b5 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AverageStatisticsServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AverageStatisticsServiceImpl.java @@ -198,8 +198,14 @@ public class AverageStatisticsServiceImpl implements AverageStatisticsService { } return dataMap; } - - + + @Override + public AverageStatistics save(AverageStatistics averageStatistics) { + averageStatisticsDao.save(averageStatistics); + return averageStatistics; + } + + private boolean isValid(Integer value) { if (value != null && value > 1000) { return true; diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/sql/UserServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/sql/UserServiceImpl.java index e0e763666..d849f26c6 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/sql/UserServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/sql/UserServiceImpl.java @@ -7,12 +7,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.fangjia.core.util.CacheUtils; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import com.fangjia.dal.QueryParam; import com.fangjia.dal.sql.dao.UserDao; import com.fangjia.dal.sql.model.User; +import org.sothis.core.util.Closure; public class UserServiceImpl implements UserService { private UserDao userDao; @@ -28,10 +30,15 @@ public class UserServiceImpl implements UserService { return Collections.emptyList(); } - public User findByUserName(String userName) { - List params = new ArrayList(1); - params.add(new QueryParam("userName", userName)); - return userDao.findFirstByParams(params); + public User findByUserName(final String userName) { + return CacheUtils.getValue(UserServiceImpl.class, "findByUserName", userName, CacheUtils.CachePolicyEnum.TODAY, new Closure(){ + @Override + public User execute(String input) { + List params = new ArrayList(1); + params.add(new QueryParam("userName", userName)); + return userDao.findFirstByParams(params); + } + }); } public void updateUser(User user) { diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/01_01.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/01_01.png new file mode 100644 index 000000000..a2ffc42e0 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/01_01.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/01_02.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/01_02.png new file mode 100644 index 000000000..b0936b199 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/01_02.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/02_01.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/02_01.png new file mode 100644 index 000000000..ae4cc112a Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/02_01.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/02_02.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/02_02.png new file mode 100644 index 000000000..d7ebad2af Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/02_02.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/03_01.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/03_01.png new file mode 100644 index 000000000..058dc6e4c Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/03_01.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/03_02.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/03_02.png new file mode 100644 index 000000000..074d3d6ee Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/03_02.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/04_01.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/04_01.png new file mode 100644 index 000000000..4592aa398 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/04_01.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/04_02.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/04_02.png new file mode 100644 index 000000000..86ad044a2 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/04_02.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/05_01.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/05_01.png new file mode 100644 index 000000000..1f9467061 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/05_01.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/05_02.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/05_02.png new file mode 100644 index 000000000..b2fbd89cb Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/05_02.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/addrpro-1.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/addrpro-1.png new file mode 100644 index 000000000..ea68cb4bd Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/addrpro-1.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/addrpro-2.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/addrpro-2.png new file mode 100644 index 000000000..ebcfec3af Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/addrpro-2.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/appraisal_banner1.jpg b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/appraisal_banner1.jpg new file mode 100644 index 000000000..acdbd62b5 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/appraisal_banner1.jpg differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/appraisal_img05.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/appraisal_img05.png new file mode 100644 index 000000000..baac226a4 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/appraisal_img05.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/appraisal_img06.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/appraisal_img06.png new file mode 100644 index 000000000..9a57bdda9 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/appraisal_img06.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/appraisal_img07.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/appraisal_img07.png new file mode 100644 index 000000000..3aab212f3 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/appraisal_img07.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/appraisal_img08.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/appraisal_img08.png new file mode 100644 index 000000000..83fcc36dd Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/appraisal_img08.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/bond-1.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/bond-1.png new file mode 100644 index 000000000..d1fb8b722 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/bond-1.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/bond-2.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/bond-2.png new file mode 100644 index 000000000..530c93f60 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/bond-2.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/card.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/card.png new file mode 100644 index 000000000..ccbf4de21 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/card.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/card1.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/card1.png new file mode 100644 index 000000000..5681f4973 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/card1.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/card2.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/card2.png new file mode 100644 index 000000000..7880ff5e5 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/card2.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/company.jpg b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/company.jpg new file mode 100644 index 000000000..897b903ee Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/company.jpg differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/company.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/company.png index 7adae690c..897b903ee 100644 Binary files a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/company.png and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/company.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cost-0.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cost-0.png new file mode 100644 index 000000000..6ae42f0b2 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cost-0.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cost-1.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cost-1.png new file mode 100644 index 000000000..e3bc187f6 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cost-1.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cost-2.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cost-2.png new file mode 100644 index 000000000..cfe7059ab Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cost-2.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cost-3.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cost-3.png new file mode 100644 index 000000000..45626fba7 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cost-3.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cstm-cm-1.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cstm-cm-1.png new file mode 100644 index 000000000..21ef93cb7 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cstm-cm-1.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cstm-cm-2.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cstm-cm-2.png new file mode 100644 index 000000000..e2d6c4e6d Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cstm-cm-2.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cstm-ls-1.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cstm-ls-1.png new file mode 100644 index 000000000..bf8d8d79c Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cstm-ls-1.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cstm-ls-2.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cstm-ls-2.png new file mode 100644 index 000000000..653974bc3 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cstm-ls-2.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cstm-ls-3.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cstm-ls-3.png new file mode 100644 index 000000000..6facd5e67 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cstm-ls-3.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cstm-zf-1.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cstm-zf-1.png new file mode 100644 index 000000000..b68f22caf Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cstm-zf-1.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cstm-zf-2.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cstm-zf-2.png new file mode 100644 index 000000000..1cc596535 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/cstm-zf-2.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/ds0.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/ds0.png new file mode 100644 index 000000000..22a5bdb5b Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/ds0.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/ds1.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/ds1.png new file mode 100644 index 000000000..f8ff1edd3 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/ds1.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/ds2.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/ds2.png new file mode 100644 index 000000000..7f09ebd8d Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/ds2.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/ds3.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/ds3.png new file mode 100644 index 000000000..1c0bd0e21 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/ds3.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/ds4.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/ds4.png new file mode 100644 index 000000000..0fa57e0b3 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/ds4.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/ds5.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/ds5.png new file mode 100644 index 000000000..ffcabacdd Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/ds5.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-1.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-1.png new file mode 100644 index 000000000..66d55a322 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-1.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-2.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-2.png new file mode 100644 index 000000000..382154474 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-2.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-3.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-3.png new file mode 100644 index 000000000..8a14fb5d4 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-3.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-4.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-4.png new file mode 100644 index 000000000..bc327abbe Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-4.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-5.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-5.png new file mode 100644 index 000000000..2b75938af Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level-5.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level_banner.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level_banner.png new file mode 100644 index 000000000..799dbdf79 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/f-level_banner.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/financial-1.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/financial-1.png new file mode 100644 index 000000000..22a5bdb5b Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/financial-1.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/financial-2.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/financial-2.png new file mode 100644 index 000000000..0e61916b1 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/financial-2.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/financial-3.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/financial-3.png new file mode 100644 index 000000000..1a54bba66 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/financial-3.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/financial-4.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/financial-4.png new file mode 100644 index 000000000..a6db5540f Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/financial-4.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/financial-5.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/financial-5.png new file mode 100644 index 000000000..d79af7636 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/financial-5.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/house_level.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/house_level.png new file mode 100644 index 000000000..4122eca29 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/house_level.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index-bg.jpg b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index-bg.jpg new file mode 100644 index 000000000..4f701b694 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index-bg.jpg differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index-bg.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index-bg.png new file mode 100644 index 000000000..4f701b694 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index-bg.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index_banner04-1.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index_banner04-1.png new file mode 100644 index 000000000..7df0feaf8 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index_banner04-1.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index_banner04-2.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index_banner04-2.png new file mode 100644 index 000000000..d4fa20433 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index_banner04-2.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index_banner06-1.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index_banner06-1.png new file mode 100644 index 000000000..29b189949 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index_banner06-1.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index_banner06-2.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index_banner06-2.png new file mode 100644 index 000000000..ecf0fbc4f Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index_banner06-2.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index_banner07-1.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index_banner07-1.png new file mode 100644 index 000000000..ed41a377e Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index_banner07-1.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index_banner07-2.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index_banner07-2.png new file mode 100644 index 000000000..b4a3bd4dd Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index_banner07-2.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index_banner08-2.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index_banner08-2.png new file mode 100644 index 000000000..fe47334be Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/index_banner08-2.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/list_icon.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/list_icon.png new file mode 100644 index 000000000..28c9d8bf0 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/list_icon.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/new-index1.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/new-index1.png new file mode 100644 index 000000000..de3e75372 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/new-index1.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/new-index2.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/new-index2.png new file mode 100644 index 000000000..e4c6d7536 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/new-index2.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-1.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-1.png new file mode 100644 index 000000000..568ff2f2e Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-1.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-2.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-2.png new file mode 100644 index 000000000..56be760be Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-2.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-3.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-3.png new file mode 100644 index 000000000..659fa940b Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-3.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-icon-1.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-icon-1.png new file mode 100644 index 000000000..60f89b33e Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-icon-1.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-icon-2.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-icon-2.png new file mode 100644 index 000000000..53aad3446 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-icon-2.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-icon-3.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-icon-3.png new file mode 100644 index 000000000..a64cbc976 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-icon-3.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-icon-4.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-icon-4.png new file mode 100644 index 000000000..7bc2d9cdb Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-icon-4.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-icon-5.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-icon-5.png new file mode 100644 index 000000000..10c6cd8c6 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-icon-5.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-icon-6.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-icon-6.png new file mode 100644 index 000000000..aadbb3ed4 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse-icon-6.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse.png new file mode 100644 index 000000000..b0f1b0c28 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/onehouse.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/outlets.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/outlets.png new file mode 100644 index 000000000..3b645a7d0 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/outlets.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/outlets1.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/outlets1.png new file mode 100644 index 000000000..308b5936f Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/outlets1.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/outlets2.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/outlets2.png new file mode 100644 index 000000000..6f37746b7 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/outlets2.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-bk-1.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-bk-1.png new file mode 100644 index 000000000..d3cb283cf Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-bk-1.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-bk.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-bk.png new file mode 100644 index 000000000..dd2cff776 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-bk.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-icon-1.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-icon-1.png new file mode 100644 index 000000000..9680ff002 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-icon-1.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-icon-2.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-icon-2.png new file mode 100644 index 000000000..81663e80c Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-icon-2.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-icon-3.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-icon-3.png new file mode 100644 index 000000000..510e714b7 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-icon-3.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-icon-4.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-icon-4.png new file mode 100644 index 000000000..d2ddffbae Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-icon-4.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-icon-5.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-icon-5.png new file mode 100644 index 000000000..ce060ca57 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-icon-5.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-icon-6.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-icon-6.png new file mode 100644 index 000000000..a6ae6393d Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-icon-6.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-icon-7.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-icon-7.png new file mode 100644 index 000000000..7d21becce Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power-icon-7.png differ diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power1.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power1.png new file mode 100644 index 000000000..d63268f30 Binary files /dev/null and b/projects/fangjia-static/src/main/webapp/images/fangjia/v5/power1.png differ diff --git a/projects/fangjia-static/src/main/webapp/js/fangjia/v5/main.js b/projects/fangjia-static/src/main/webapp/js/fangjia/v5/main.js index 0376113ed..2a4527cc7 100644 --- a/projects/fangjia-static/src/main/webapp/js/fangjia/v5/main.js +++ b/projects/fangjia-static/src/main/webapp/js/fangjia/v5/main.js @@ -481,32 +481,34 @@ $("a:contains(申请试用)").click(function(){ function checkApply(mid, downUrl, newId){ - var workCode = getCookie("w_n"); - if(!workCode || mid=="1018"){ - var url = Constants.wwwUrl+"/enquire?mid="+mid+"&backUrl="+encodeURIComponent(location.href); - if(downUrl){ - url = url + "&downUrl="+encodeURIComponent(downUrl)+"&resourceId="+newId; - } - window.location.href = url; - }else if(mid=="1016" && workCode.indexOf("1018")>-1){ - addDownRows(newId, mid, downUrl); - }else{ - if(workCode.indexOf(mid)>-1){ - if(downUrl){ - addDownRows(newId, mid, downUrl); - }else{ - $(".mask").show(); - $(".dialogBox06").show(); - $(".dialogBox06 p").text("您的申请已æ��交,ç¨�å�Žä¼šæœ‰å·¥ä½œäººå‘˜ä¸Žæ‚¨è�”系,请è€�心等待ï¼�"); - } - }else{ - var url = Constants.wwwUrl+"/saleLeads/doAdd?mid="+mid+"&backUrl="+encodeURIComponent(location.href); - if(downUrl){ - url = url + "&downUrl="+encodeURIComponent(downUrl)+"&resourceId="+newId; - } - window.location.href = url; - } - } + var url = Constants.wwwUrl+"/enquire?mid="+mid+"&backUrl="+encodeURIComponent(location.href); + window.location.href = url; + // var workCode = getCookie("w_n"); + // if(!workCode || mid=="1018"){ + // var url = Constants.wwwUrl+"/enquire?mid="+mid+"&backUrl="+encodeURIComponent(location.href); + // if(downUrl){ + // url = url + "&downUrl="+encodeURIComponent(downUrl)+"&resourceId="+newId; + // } + // window.location.href = url; + // }else if(mid=="1016" && workCode.indexOf("1018")>-1){ + // addDownRows(newId, mid, downUrl); + // }else{ + // if(workCode.indexOf(mid)>-1){ + // if(downUrl){ + // addDownRows(newId, mid, downUrl); + // }else{ + // $(".mask").show(); + // $(".dialogBox06").show(); + // $(".dialogBox06 p").text("您的申请已æ��交,ç¨�å�Žä¼šæœ‰å·¥ä½œäººå‘˜ä¸Žæ‚¨è�”系,请è€�心等待ï¼�"); + // } + // }else{ + // var url = Constants.wwwUrl+"/saleLeads/doAdd?mid="+mid+"&backUrl="+encodeURIComponent(location.href); + // if(downUrl){ + // url = url + "&downUrl="+encodeURIComponent(downUrl)+"&resourceId="+newId; + // } + // window.location.href = url; + // } + // } } function addDownRows(resourceId, mid, downUrl){ diff --git a/projects/fangjia-static/src/main/webapp/style/fangjia/v5/common.css b/projects/fangjia-static/src/main/webapp/style/fangjia/v5/common.css index f7c8841eb..f45bd0f19 100644 --- a/projects/fangjia-static/src/main/webapp/style/fangjia/v5/common.css +++ b/projects/fangjia-static/src/main/webapp/style/fangjia/v5/common.css @@ -29,10 +29,10 @@ em{font-style:normal;} .nav > li.current > a{color:#f08300;} .nav > li > div{min-width:100px;background:#fff;box-shadow:0 3px 3px rgba(204,204,204,0.5);border-top:none;padding-bottom:8px;position:absolute;top:75px;left:0;z-index:100;} .nav > li > div > ul{float:left;} -.nav > li > div > ul:first-child{border-right:solid 1px #f2f2f2;} +/*.nav > li > div > ul:first-child{border-right:solid 1px #f2f2f2;}*/ .nav > li > div > ul:last-child{border-right:none;} .nav > li > div > ul > li{min-width:100px;} -.nav > li > div > ul > li > a{font-size:14px;color:#666;line-height:36px;padding-left:15px;padding-right:15px;display:block;} +.nav > li > div > ul > li > a{font-size:14px;color:#333;line-height:36px;padding-left:15px;padding-right:15px;display:block;} .nav > li > div > ul > li:hover > a{color:#f08300;} .vip{float:right;overflow:hidden;} .vip li{float:left;} @@ -48,6 +48,19 @@ em{font-style:normal;} .crumb a:hover{color:#f08300;} .crumb a.current:hover{color:#333;} +.menu-heading{ + line-height: 24px; + height: 35px; + font-size: 14px; + color: #747e91; + padding-bottom: 10px; + border-bottom: 1px solid rgba(116,126,145,.5); + line-height: 36px; + padding-left: 15px; + padding-right: 15px; + display: block; +} + /* 按钮 */ .link_btn{width:88px;height:38px;border:solid 1px #999;line-height:38px;text-align:center;display:block;margin-top:20px;padding:0 10px;cursor:pointer;} .link_btn:hover{color:#f08300;border:solid 1px #f08300;} @@ -156,7 +169,7 @@ select{appearance:none;-webkit-appearance:none;-moz-appearance:none;-ms-appearan .footer_center ul li a{display:block;color:#666;line-height:24px;} .footer_center ul li a:hover{color:#f08300;} -.footer_right{padding-left:60px;} +.footer_right{padding-left:40px;} .footer_right p{margin-bottom:20px;} .footer_right p b{font-size:22px;font-weight:normal;margin-left:10px;} .footer_right div{margin-bottom:47px;} @@ -201,9 +214,34 @@ select{appearance:none;-webkit-appearance:none;-moz-appearance:none;-ms-appearan .fixedNav ul li div.fixedNav03 img{width:120px;height:120px;margin:0 auto;margin-top:5px;margin-bottom:10px;} .fixedNav ul li div.fixedNav03 span{color:#fff;text-align:center;display:block;} + +.newblank{width: 100%;height: 55px;float:left;display: none;} +.newfooter{display: none;} + +@media screen and (max-width:750px){ + .newblank{display: block;} + .newfooter{left:0px;z-index:999;width: 100%;height:55px;position: fixed;bottom: 0;display: block;} + .newfooter-li{width:50%;height:100%;float:left;padding-top: 5px; padding-left: 3px;} + .newfooter-li a{width: 48%;height: 80%;display: inline-block;} + .newfooter-li img{width: 100%;} +} + +.fu-btn { + background: #f08300; + border-radius: 100px; + font-size: 16px; + line-height: 46px; + position: absolute; + color: #fff; + text-align: center; +} + /* 自适应 */ @media(max-width:1200px){ .header,.header01,.footer{width:1200px;} .vip{margin-right:20px;} + .footer_left {padding-right: 25px;padding-left: 25px;} } + + diff --git a/projects/fangjia-static/src/main/webapp/style/fangjia/v5/index.css b/projects/fangjia-static/src/main/webapp/style/fangjia/v5/index.css index 608a3139a..615377727 100644 --- a/projects/fangjia-static/src/main/webapp/style/fangjia/v5/index.css +++ b/projects/fangjia-static/src/main/webapp/style/fangjia/v5/index.css @@ -5,24 +5,26 @@ body{position:relative;} -.bannerIndex{width:100%;height:300px;background:#fff;overflow:hidden;position:relative;top:75px;z-index:4;} -.imgBoxIndex{width:100%;height:300px;position:relative;} -.imgBoxIndex > div{width:1920px;height:300px;position:absolute;top:0;left:50%;margin-left:-960px;} -.imgBoxIndex > div > div{width:880px;margin:0 auto;margin-top:50px;} +.bannerIndex{width:100%;height:600px;background:#fff;overflow:hidden;position:relative;top:75px;z-index:4;} +.imgBoxIndex{width:100%;height:600px;position:relative;} +.imgBoxIndex > div{width:1920px;height:600px;position:absolute;top:0;left:50%;margin-left:-960px;} +.imgBoxIndex > div > div{width:880px;margin:0 auto;margin-top:60px;} .imgBoxIndex > div > div p{margin:20px 0;} -.imgBoxIndex > div > div p label{font-size:30px;} +.imgBoxIndex > div > div p label{font-size:40px;} .imgBoxIndex > div > div p small{font-size:20px;color:#666;line-height:30px;} .bannerIndex01{background:url(../../../images/fangjia/v5/index_banner01.png) no-repeat right center;} .bannerIndex02{background:url(../../../images/fangjia/v5/index_banner02.png) no-repeat right center;} .bannerIndex03{background:url(../../../images/fangjia/v5/index_banner03.png) no-repeat right center;} -.bannerIndex04{background:url(../../../images/fangjia/v5/index_banner04.png) no-repeat right center;} +.bannerIndex04{background:url(../../../images/fangjia/v5/index_banner08-2.png) no-repeat right center;} .bannerIndex05{background:url(../../../images/fangjia/v5/index_banner05.png) no-repeat right center;} -.bannerIndex06{background:url(../../../images/fangjia/v5/index_banner06.png) no-repeat right center;} -.bannerIndex07{background:url(../../../images/fangjia/v5/index_banner07.png) no-repeat right center;} -.bannerIndex08{background:url(../../../images/fangjia/v5/index_banner08.png) no-repeat right center;} +.bannerIndex06{background:url(../../../images/fangjia/v5/index_banner07-2.png) no-repeat right center;} +.bannerIndex07{background:url(../../../images/fangjia/v5/index_banner06-2.png) no-repeat right center;} +.bannerIndex08{background:url(../../../images/fangjia/v5/index_banner04-2.png) no-repeat right center;} + + .bannerIndex .play_btn{width:93px;height:93px;background:url(../../../images/fangjia/v5/play_btn.png);display:block;position:absolute;right:32%;top:200px;cursor:pointer;} -.pageBox{overflow:hidden;position:inherit;bottom:70px;width:880px;margin:0 auto;} -.pageBox a{width:12px;height:12px;background:#000;opacity:0.2;filter:Alpha(opacity=20);border-radius:100%;float:left;margin-right:14px;cursor:pointer;} +.pageBox{overflow:hidden;position:inherit;bottom:230px;width:880px;margin:0 auto;} +.pageBox a{width:12px;height:12px;background: #fdc601;opacity:0.2;filter:Alpha(opacity=20);border-radius:100%;float:left;margin-right:14px;cursor:pointer;} .pageBox .pageOn{background:#f08300;opacity:1;filter:Alpha(opacity=100);} .columnBox{padding:0;} diff --git a/projects/fangjia-static/src/main/webapp/style/fangjia/v5/main.css b/projects/fangjia-static/src/main/webapp/style/fangjia/v5/main.css index d03baaaed..7d5710fd9 100644 --- a/projects/fangjia-static/src/main/webapp/style/fangjia/v5/main.css +++ b/projects/fangjia-static/src/main/webapp/style/fangjia/v5/main.css @@ -16,7 +16,7 @@ /* banner */ .banner{width:100%;height:375px;background:url(../../../images/fangjia/v5/evaluation_banner01.png) no-repeat center center;padding-top:75px;} .banner{width:100%;height:375px;background:url(../../../images/fangjia/v5/evaluation_banner01.png) no-repeat center center;padding-top:75px;} -.banner > div{width:1200px;margin:0 auto;padding-top:50px;} +.banner > div{width:1200px;margin: 0 auto;padding-top:50px;padding-left:50px;} .banner > div p{text-align:justify;margin-bottom:20px;} .banner > div p.p01{margin-top:-20px;margin-bottom:30px;} .banner > div p.p02{margin-bottom:10px;} @@ -38,7 +38,7 @@ .search_btn{float:left;width:100px;height:40px;background:#373d42;color:#fff;text-align:center;line-height:40px;cursor:pointer;} .search_btn:hover{background:#000;} -.searchBoxIndex{width:880px;height:60px;top:345px;margin-left:-440px;} +.searchBoxIndex{width:880px;height:60px;top:580px;margin-left:-440px;} .searchBoxIndex .search{width:880px;height:60px;border-radius:100px;background:#fff;box-shadow:0 0 20px rgba(0,0,0,0.3);} .searchBoxIndex .search > div{height:46px;margin:0 7px;padding-top:7px;padding-bottom:7px;} .searchBoxIndex .search .cityChoice{background:url(../../../images/fangjia/v5/arrow_select01.png) no-repeat 94% center #fff;border-right:none;border-radius:100px 0 0 100px;} @@ -265,7 +265,7 @@ .column_bg{width:100%;position:absolute;z-index:-1;} /* 特å¾� */ -.featureBox{width:1200px;margin:0 auto;padding:100px 0;overflow:hidden;} +.featureBox{width:1200px;margin:0 auto;padding:50px 0;overflow:hidden;} .featureBox > p{font-size:40px;text-align:center;margin-bottom:80px;} .featureBox > p span{font-size:18px;line-height:36px;} @@ -330,6 +330,14 @@ .feature i.corporation_icon02{background:url(../../../images/fangjia/v5/corporation_icon.png);background-position:-65px 0;} .feature i.corporation_icon03{background:url(../../../images/fangjia/v5/corporation_icon.png);background-position:-130px 0;} + +.feature i.onehouse_iconA01{background:url(../../../images/fangjia/v5/onehouse-icon-1.png);background-size: 66px 65px;} +.feature i.onehouse_iconA02{background:url(../../../images/fangjia/v5/onehouse-icon-2.png);background-size: 66px 65px;} +.feature i.onehouse_iconA03{background:url(../../../images/fangjia/v5/onehouse-icon-3.png);background-size: 66px 65px;} +.feature i.onehouse_iconA04{background:url(../../../images/fangjia/v5/onehouse-icon-4.png);background-size: 66px 65px;} +.feature i.onehouse_iconA05{background:url(../../../images/fangjia/v5/onehouse-icon-5.png);background-size: 66px 65px;} +.feature i.onehouse_iconA06{background:url(../../../images/fangjia/v5/onehouse-icon-6.png);background-size: 66px 65px;} + .columnBox .feature p{width:210px;margin-top:10px;} .columnBox .feature p span{font-size:16px;} .mapClass {float: none;margin-right:0px;} @@ -377,6 +385,7 @@ .banner,.columnBox,.adBox,.mask{width:1200px;} .searchBox{margin-left:-250px;} .prompt{margin-left:-295px;} + .columnBox{padding-left: 50px;padding-right: 50px;} } diff --git a/projects/fangjia-static/src/main/webapp/style/fangjia/v5/pow.css b/projects/fangjia-static/src/main/webapp/style/fangjia/v5/pow.css new file mode 100644 index 000000000..01a667ebb --- /dev/null +++ b/projects/fangjia-static/src/main/webapp/style/fangjia/v5/pow.css @@ -0,0 +1,12868 @@ +/*read from redis*/ +.ModuleGridContainer[gridswidthmode="2"]{max-width:1200px;width:auto;} +.BodyMain2Zone{display:none;} +.BodyMain3Zone{display:none;} +.BodyMain4Zone{display:none;} +@media only screen and (max-width: 767px){ + .ModuleOnLineServiceGiant.layout-103{display: none;} +} +@media only screen and (min-width: 768px){ + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant, + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-hidden{ + display: none; + } + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant{position: absolute; top: 0px;border: 1px solid #e5e5e5; border-top: 2px solid #fd6e27;background-color: #fff;} + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container.pos-right .online-service-giant{right: 0; margin-right: 64px;} + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container.pos-left .online-service-giant{left: 0; margin-left: 64px;} + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-IM{width: 240px;} + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-contact{width: 180px;} + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-qrcode{width: 162px;} + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .service-title{color: #010101; height: 44px; line-height: 44px; font-size: 16px; text-align: center; border-bottom: 1px solid #e5e5e5;} + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn{height:50px;width: 50px;text-align: center; line-height: 50px;border: 1px solid #ccc; border-radius: 25px;background-color: #fff;} + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant .IM_list_title{padding: 10px 0px 12px 12px; color: #666; font-size: 12px;} + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant .IM-list{padding: 0px 12px 18px 12px;} + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant .IM-list .IM-item{width: 49%; display: inline-block;} + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant .IM-list .IM-item .IM-item-link img{width: 24px; margin-right: 4px;} + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant .IM-list .IM-item .IM-ali img{margin-right: 0px;} + + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant .contact-item{padding: 12px 12px 10px 12px;line-height: 1;} + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant .contact-item-name{color: #666; font-size: 14px;} + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant .contact-item-content{color: #333; font-size: 12px;} + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant .contact-item-name{margin-bottom: 10px;} + + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-qrcode .qrcode-content{text-align: center;padding-top:16px;} + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-qrcode .qrcode-content .qrcode-img{width: 84px;height: 84px;margin-bottom: 16px;} + + + + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn:nth-child(even){margin-top: 4px; } + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn:nth-child(even){margin-bottom: 4px; } + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn i.iconfont{font-size: 30px;} + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-Contacts-btn i.iconfont, + .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-QrCode-btn i.iconfont{font-size: 25px;} + .ModuleOnLineServiceGiant.layout-103 .IM-item-link{ + font-size: 14px; + width: 85px; + overflow: hidden; + display: block; + } + .ModuleOnLineServiceGiant.layout-103 .qrcodetips{overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 2; + word-break: break-all; + -webkit-box-orient: vertical; + padding: 0 10px;text-align: center;color:#666;font-size: 14px;} +} +.module_468796427 .ModuleHead .HeadCenter{float:none;} +#module_468796427 { + padding:0px; +} +#module_468796427 { + position:absolute; + z-index:4001; + top:210px; + left:0px; + width:100%; + height:158px; +} +#module_468796427 .ModuleHead468796427 { + display:none; +} +#module_468796427 .BodyCenter.BodyCenter468796427 { + background:none;background-color:rgba(0,0,0,0); +} +#module_468796427 >.module_468796427 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_468796427 >.module_468796427{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_468796427 .BodyCenter.BodyCenter468796427 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_468796427 .BodyCenter.BodyCenter468796427 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_468796427 >.module_468796427 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_468796427 >.module_468796427 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_468796427 >.module_468796427 {box-shadow: 0px 0px 0px 0px #ccc} +#module_468796427:hover { + border:none; +} +#module_468796427:hover >.module_468796427 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn{border-top-color:#d1d1d1;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn{border-top-style:solid;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn{border-top-width:1px;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn{border-right-color:#d1d1d1;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn{border-right-style:solid;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn{border-right-width:1px;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn{border-bottom-color:#d1d1d1;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn{border-bottom-style:solid;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn{border-bottom-width:1px;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn{border-left-color:#d1d1d1;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn{border-left-style:solid;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn{border-left-width:1px;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn{color:#999;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn{background-color:#fff;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-ToTop-btn i{color:rgb(30, 136, 229);} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-ToTop-btn{background-color:#fff;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn.online-service-giant-ToTop-btn{border-top-color:#e1e1e1;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn.online-service-giant-ToTop-btn{border-top-style:solid;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn.online-service-giant-ToTop-btn{border-top-width:1px;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn.online-service-giant-ToTop-btn{border-right-color:#e1e1e1;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn.online-service-giant-ToTop-btn{border-right-style:solid;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn.online-service-giant-ToTop-btn{border-right-width:1px;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn.online-service-giant-ToTop-btn{border-bottom-color:#e1e1e1;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn.online-service-giant-ToTop-btn{border-bottom-style:solid;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn.online-service-giant-ToTop-btn{border-bottom-width:1px;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn.online-service-giant-ToTop-btn{border-left-color:#e1e1e1;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn.online-service-giant-ToTop-btn{border-left-style:solid;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn.online-service-giant-ToTop-btn{border-left-width:1px;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant{border-top-color:#fd6e27;} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-btn:hover{color:rgb(30, 136, 229);} +#module_468796427 .ModuleOnLineServiceGiant.layout-103 .online-service-giant-container .online-service-giant-ToTop-btn.service-active i{color:rgb(30, 136, 229);} +#FreeMainZone{height:368px} +.ModulePupopGiant.layout-101 {height: 100%; background-color: rgba(0, 0, 0, .6);} +.ModulePupopGiant.layout-101 .row {margin-right: 0px; margin-left: 0px;} +.ModulePupopGiant.layout-101 .ModuleSubContainer {width: 100%; position: relative;} +.ModulePupopGiant.layout-101 .ModuleSubContainer .addnewhelper {white-space: unset;} +.ModulePupopGiant.layout-101 .ModulePupopContainer { + width:100%; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + background-color: #fff; + margin: auto; + padding-right: 0; + padding-left: 0; +} +.ModulePupopGiant.layout-101 .IsAdvertisement {position: fixed;} +.ModulePupopGiant.layout-101 .IsAdvertisement .ModulePupopContainer { + position: static; + top: 0 !important; + left: 0 !important; + transform: unset !important; +} +.ModulePupopGiant.layout-101 .pupopClose { + position: absolute; + z-index: 99999; + width: 30px; + height: 30px; + line-height: 30px; + font-size: 0; + text-align: center; + cursor: pointer; + overflow: hidden; +} +.ModulePupopGiant.layout-101 .pupopClose .iconfont {font-size: 30px; color: #fff; position: absolute; left: 50%; top: 50%; transform: translate(-50%, -50%);} +.ModulePupopGiant.layout-101 .ModulePupopContainer .ModuleSubPupopBox {height: auto; overflow-y: auto;} + +@media only screen and (max-width: 767px) { + .ModulePupopGiant.layout-101 .ModuleSubContainer {display: block;} + .ModulePupopGiant.layout-101 .IsAdvertisement .ModulePupopContainer {max-width: 100vw;} +}.module_384381549 .ModuleHead .HeadCenter{float:none;} +#module_384381549 { + padding:0px; +} +#module_384381549 { + position:fixed; + z-index:100000; + top:0px; + left:0px; + width:100%; + height: auto; +} +#module_384381549 .ModuleHead384381549 { + display:none; +} +#module_384381549 .BodyCenter.BodyCenter384381549 { + background:none;background-color:rgba(0,0,0,0); +} +#module_384381549 >.module_384381549 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_384381549 >.module_384381549{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_384381549 .BodyCenter.BodyCenter384381549 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_384381549 .BodyCenter.BodyCenter384381549 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_384381549 >.module_384381549 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_384381549 >.module_384381549 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_384381549 >.module_384381549 {box-shadow: 0px 0px 0px 0px #ccc} +#module_384381549:hover { + border:none; +} +#module_384381549:hover >.module_384381549 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_384381549 .ModulePupopContainer{top:calc(50% + 0px);left:calc(50% + 0px);transform:translate(-50%, -50%);} #module_384381549 .IsAdvertisement{top:calc(50% + 0px);left:calc(50% + 0px);transform:translate(-50%, -50%);} +#module_384381549 .ModulePupopContainer{background-color:rgba(255, 255, 255, 1);} +#module_384381549 .ModulePupopContainer{background-image:none;} +#module_384381549 .ModulePupopContainer{background-repeat:no-repeat;} +#module_384381549 .ModulePupopContainer{background-position:0% 0%;} +#module_384381549 .ModulePupopContainer{background-attachment:scroll;} +#module_384381549 .ModulePupopContainer{} +#module_384381549 .ModulePupopContainer{padding-top:0px;} +#module_384381549 .ModulePupopContainer{padding-bottom:0px;} +#module_384381549 .ModulePupopContainer{padding-left:0px;} +#module_384381549 .ModulePupopContainer{padding-right:0px;} +#module_384381549 .ModulePupopContainer{border-top-color:#e1e1e1;} +#module_384381549 .ModulePupopContainer{border-top-style:solid;} +#module_384381549 .ModulePupopContainer{border-top-width:0px;} +#module_384381549 .ModulePupopContainer{border-bottom-color:#e1e1e1;} +#module_384381549 .ModulePupopContainer{border-bottom-style:solid;} +#module_384381549 .ModulePupopContainer{border-bottom-width:0px;} +#module_384381549 .ModulePupopContainer{border-left-color:#e1e1e1;} +#module_384381549 .ModulePupopContainer{border-left-style:solid;} +#module_384381549 .ModulePupopContainer{border-left-width:0px;} +#module_384381549 .ModulePupopContainer{border-right-color:#e1e1e1;} +#module_384381549 .ModulePupopContainer{border-right-style:solid;} +#module_384381549 .ModulePupopContainer{border-right-width:0px;} +#module_384381549 .ModulePupopContainer{border-top-left-radius:0px;} +#module_384381549 .ModulePupopContainer{border-top-right-radius:0px;} +#module_384381549 .ModulePupopContainer{border-bottom-left-radius:0px;} +#module_384381549 .ModulePupopContainer{border-bottom-right-radius:0px;} +#module_384381549 .ModulePupopContainer{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0); transition: box-shadow 0.5s ease;} +#module_384381549 .pupopClose{top:20px;right:20px;left:auto;transform:none;} +#module_384381549 .pupopClose{width:calc(26px + 3px); height:calc(26px + 3px);} +#module_384381549 .pupopClose .iconfont{font-size:24px;} +#module_384381549 .pupopClose .iconfont{color:#ccc;} +#module_384381549 .pupopClose{background-color:rgba(255, 255, 255, 0);} +#module_384381549 .pupopClose{background-image:none;} +#module_384381549 .pupopClose{background-repeat:no-repeat;} +#module_384381549 .pupopClose{background-position:0% 0%;} +#module_384381549 .pupopClose{background-attachment:scroll;} +#module_384381549 .pupopClose{} +#module_384381549 .pupopClose{border-top-color:#e1e1e1;} +#module_384381549 .pupopClose{border-top-style:solid;} +#module_384381549 .pupopClose{border-top-width:0px;} +#module_384381549 .pupopClose{border-bottom-color:#e1e1e1;} +#module_384381549 .pupopClose{border-bottom-style:solid;} +#module_384381549 .pupopClose{border-bottom-width:0px;} +#module_384381549 .pupopClose{border-left-color:#e1e1e1;} +#module_384381549 .pupopClose{border-left-style:solid;} +#module_384381549 .pupopClose{border-left-width:0px;} +#module_384381549 .pupopClose{border-right-color:#e1e1e1;} +#module_384381549 .pupopClose{border-right-style:solid;} +#module_384381549 .pupopClose{border-right-width:0px;} +#module_384381549 .pupopClose{border-top-left-radius:0px;} +#module_384381549 .pupopClose{border-top-right-radius:0px;} +#module_384381549 .pupopClose{border-bottom-left-radius:0px;} +#module_384381549 .pupopClose{border-bottom-right-radius:0px;} +#module_384381549 .ModulePupopGiant{background-color:rgba(0, 0, 0, .6);} +#module_384381549{position: fixed !important; top: 0 !important; left: 0 !important; z-index: 100000 !important; display: none;width: 100% !important; height: 100% !important;}.ModulePupopContainer.ModulePupopContainer384381549 {max-width:900px;} +.IsAdvertisement .ModulePupopContainer.ModulePupopContainer384381549 {width:900px;} +#Sub384381549_1.ModuleSubPupopBox {height: auto !important; max-height: calc(100vh - 100px);} +.ModuleCustomFormGiant.layout-101 .submitbtnbox{display: flex;} +/*ÐÂÑéÖ¤Â뿪ʼ*/ +.ModuleCustomFormGiant.layout-101 .vciline{ + height: 2px; + position: absolute; + left: 0; + bottom: 0; +} +.ModuleCustomFormGiant.layout-101 .VCClose:hover .VCLine1 { + display: none; +} +.ModuleCustomFormGiant.layout-101 .VCClose:hover .VCLine2 { + transform: rotate(180deg); + transition:all 0.5s; +} +.ModuleCustomFormGiant.layout-101 .VCClose{ + position: relative; + margin-right: 20px; + width: 30px; + float: right; + margin-top: 17px; + height: 30px; + cursor: pointer; +} +.ModuleCustomFormGiant.layout-101 .VCLine1{ + border-top:#ccc solid 2px; + width: 18px; + transform: rotate(45deg); + right: 0; + position: absolute; + top: 9px; + +} +.ModuleCustomFormGiant.layout-101 .VCLine2{ + border-top:#ccc solid 2px; + width: 18px; + transform: rotate(-45deg); + right: 0; + position: absolute; + top: 9px; + +} +.ModuleCustomFormGiant.layout-101 .VCTitle{ + color:#333; + font-size:20px; + font-weight: bold; + margin-top: 41px; + margin-bottom: 25px; + +} +.ModuleCustomFormGiant.layout-101 .VerificationCodediv .vcbtn{ + margin-top: 22px; + text-align: right; +} +.ModuleCustomFormGiant.layout-101 .VerificationCodediv .vcbtn1{ + + width: 80px; + height: 36px; + background: #1e88e5; + border-radius: 18px; + line-height: 36px; + text-align: center; + color: #fff; + display: inline-block; + margin-left: 10px; + cursor: pointer; + font-size: 16px; +} +.ModuleCustomFormGiant.layout-101 .VerificationCodediv .vcbtn2{ + width: 80px; + height: 36px; + background: #fff; + border-radius: 18px; + line-height: 36px; + text-align: center; + color: #666666 ; + border: 1px #ccc solid; + display: inline-block; + cursor: pointer; + font-size: 16px; +} +.ModuleCustomFormGiant.layout-101 .VerificationCodediv .vcinput::placeholder{ + color:#999999 +} +.ModuleCustomFormGiant.layout-101 .VerificationCodediv .vcinput{ + border:none; + padding: 20px 0 ; + background: #fff !important; + border-bottom: solid #ccc 1px; + color: #666; +} +.ModuleCustomFormGiant.layout-101 .VerificationCodediv .changebtn{ + text-align: right; + display: block; + +} +.ModuleCustomFormGiant.layout-101 .VerificationCodediv .VerificationCode{ + width: 100%; + height: 100px; +} +.ModuleCustomFormGiant.layout-101 .VerificationCodecontext{ + padding:0 33px; +} +.ModuleCustomFormGiant.layout-101 .VerificationCodediv{ + + position: absolute; + bottom: 0; + z-index: 12; + background: #fff; + transform: translate(-50%,-50%); + top:auto; + left: 50%; + max-width: 350px; + height: 380px; + border-radius: 6px; + box-shadow: 9.9px 9.9px 49px 0px rgba(0,0,0,0.11); + display: none; + width: 100%; +} +/*ÐÂÑéÖ¤Âë½áÊø*/ +.ModuleCustomFormGiant.layout-101 .title { + text-align: center; + line-height: 50px; + height: 50px; + color: #333; + font-size: 18px; + margin-bottom: 14px; + font-weight: normal; + min-height: 30px; +} + +.ModuleCustomFormGiant.layout-101 .from-Describe { + font-size: 14px; + line-height: 1.5; + padding-bottom: 15px; + display: flex; + align-content: center; + align-items: center; +} + +.ModuleCustomFormGiant.layout-101 input[type=text] { + line-height: 38px; + font-size: 14px; + border: 1px solid #e5e5e5; + background: #fbfbfb; + width: 100%; + padding: 0 10px 0 16px; + box-sizing: border-box; + min-height: 30px; + border-radius: 0; +} +.ModuleCustomFormGiant.layout-101 textarea { + -webkit-appearance: none; +} +.ModuleCustomFormGiant.layout-101 .pcCitybox { + display: -webkit-flex; + /* Safari */ + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + height: 34px; + -webkit-box-align: center; + -webkit-align-items: center; + -ms-flex-align: center; + align-items: center; +} + +.ModuleCustomFormGiant.layout-101 .customFormicon { + width: 20px; + height: 20px; + margin-right: 5px; + margin-top: -5px; + display: inline-block !important +} + +/* .ModuleCustomFormGiant.layout-101 .Select_Simulate li:hover { + color: #fff; +} */ +.ModuleCustomFormGiant.layout-101 label{ + line-height: 2; +} +.ModuleCustomFormGiant.layout-101 .Select_Simulate.layout1 .frist_item { + + height: 38px; + line-height: 38px; +} +.ModuleCustomFormGiant.layout-101 .smsvaldatebox{ + height: 40px; + line-height: 40px; +} +.ModuleCustomFormGiant.layout-101 .Browse-file { + height: 38px; + line-height: 38px; +} +.ModuleCustomFormGiant.layout-101 .Browse-img { + height: 80px; + +} +.ModuleCustomFormGiant.layout-101 .multi-row-text +{ + border-radius: 0; +} +.ModuleCustomFormGiant.layout-101 .Form-list { + width: 100%; + padding-top: 20px; +} +.ModuleCustomFormGiant.layout-101 .areabox .area{ + height: 38px; + line-height: 38px; +} +.ModuleCustomFormGiant.layout-101 .Select_Simulate .frist_item{ + padding: 0 16px; +} +.ModuleCustomFormGiant.layout-101 .Select_Simulate .xilaImg { + float: right; + margin-top: 16px; + /* margin-right:16px */ +} + +.ModuleCustomFormGiant.layout-101 .pcCitybox select { + -webkit-flex-grow: 1; + -ms-flex-grow: 1; + -moz-flex-grow: 1; + margin-right: 10px; + height: 34px; + line-height: 34px; + appearance: none; + -moz-appearance: none; + -webkit-appearance: none; + padding: 0 10px; + cursor: pointer; + background: url(/skinp/modules/ModuleCustomFormGiant/images/arrow1.png) no-repeat center right #fbfbfb; + font-size: 14px; + border: 1px solid #e5e5e5; +} + +.ModuleCustomFormGiant.layout-101 .cityval { + box-sizing: border-box; + background: #fbfbfb; + width: 100%; + text-align: left; +} + +.ModuleCustomFormGiant.layout-101 .choose-time-mobile { + font-size: 14px; +} + +.ModuleCustomFormGiant.layout-101 .pcCitybox .Couty-select { + margin-right: 0; +} + +.ModuleCustomFormGiant.layout-101 .submitbtn { + line-height: 40px; + height: 40px; + text-align: center; + margin-top: 8px +} + +.ModuleCustomFormGiant.layout-101 input.VerificationCodeinput { + width: 188px; + line-height: 34px; + margin-right: 10px; + float: left; + min-height: 36px; +} + +.ModuleCustomFormGiant.layout-101 .VerificationCode { + width: 86px; + height: 34px; + float: left; +} + +.ModuleCustomFormGiant.layout-101 .Browse-file-input { + flex-grow: 1; + -webkit-flex-grow: 1; + -ms-flex-grow: 1; + -moz-flex-grow: 1; + margin-right: 10px; +} + +.ModuleCustomFormGiant.layout-101 .file-box { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + -webkit-box-align: center; + -webkit-align-items: center; + -ms-flex-align: center; + align-items: center; +} + +.ModuleCustomFormGiant.layout-101 .Browse-file { + /* width: 90px; height: 32px; line-height: 32px;*/ + color: #333; + background: #f8f8f8; + border: 1px solid #eee; + font-size: 12px; + text-align: center; + flex-grow: 0; + -webkit-flex-grow: 0; + -ms-flex-grow: 0; + -moz-flex-grow: 0; + box-sizing: border-box; + cursor: pointer; +} + +.ModuleCustomFormGiant.layout-101 .Browse-file:hover { + color: #666; + background: #eee; + border: 1px solid #ccc; +} + +.ModuleCustomFormGiant.layout-101 .input-text-color { + color: #333; +} + +.ModuleCustomFormGiant.layout-101 .Describ-text-color { + color: #666; +} + +.ModuleCustomFormGiant.layout-101 .submibtn-color { + color: #fff; + background: #000; + cursor: pointer; +} + +.ModuleCustomFormGiant.layout-101 .submibtn-color:hover { + color: #fff; + background: #666; +} + +.ModuleCustomFormGiant.layout-101 .multi-row-text, .ModuleCustomFormGiant.layout-101 .Select_Simulate .frist_item, .ModuleCustomFormGiant.layout-101 .choose-time { + background: #fbfbfb; +} + +.ModuleCustomFormGiant.layout-101 input[type=radio]:checked, .ModuleCustomFormGiant.layout-101 input[type=checkbox]:checked { + background: #f10215; + border: 1px solid #f10215; +} + +.ModuleCustomFormGiant.layout-101 label { + font-weight: normal; + color: #666 +} +.ModuleCustomFormGiant.layout-101 .verticalalign{ + margin-bottom: 12px; +} +.ModuleCustomFormGiant.layout-101 .customform-upload-img-preview{ + border-radius:0 +} +.ModuleCustomFormGiant.layout-101 .in-formList-checkbox{ + display: flex; + flex-wrap: wrap; +} + +.ModuleCustomFormGiant.layout-101 .in-formList-checkbox span { + width: calc(100% - 34px); + display: initial; + /* vertical-align: middle; */ + min-width: 36px; + flex:1; + word-break: break-all; +} + +@media screen and (max-width: 767px) { + + .ModuleCustomFormGiant.layout-101 .verticalalign span { + width: calc(100% - 34px); + display: initial; + vertical-align: middle; + min-width: 36px; + } + .ModuleCustomFormGiant.layout-101 input[type=text], .ModuleCustomFormGiant.layout-101 .cityval,.ModuleCustomFormGiant.layout-101 .choose-time { + line-height: 38px; + height: 38px; + min-height: 38px; + } + .ModuleCustomFormGiant.layout-101 input.VerificationCodeinput { + width: 120px; + } + .ModuleCustomFormGiant.layout-101 .VerificationCode { + height: 40px + } + .ModuleCustomFormGiant.layout-101 .ModuleCustomFormGiant .changebtn { + line-height: 40px; + min-height: 40px; + } + .ModuleCustomFormGiant.layout-101 .describe{ margin-top:10px} + .ModuleCustomFormGiant.layout-101 .customFormTextarea{width:100%} +} + +/* ÐÂÔö*/ + +.ModuleCustomFormGiant.layout-101 .cityPickerBoxwb,.ModuleCustomFormGiant.layout-101 .cityPickerBox .cityPickerInput { + height: 38px +} + +.ModuleCustomFormGiant.layout-101 .select_box { + display: none; +} + +.ModuleCustomFormGiant.layout-101 .UploadFileSpan { + line-height: 30px; + font-size: 12px; + /* border: 1px solid #e5e5e5; + background: #fbfbfb; */ + padding: 0 10px; + box-sizing: border-box; + min-height: 30px; + width: 316px; + display: none; + padding-left: 0px; +} + +.ModuleCustomFormGiant.layout-101 .iconfont-fujian { + font-size: 19px !important; +} +.ModuleCustomFormGiant.layout-101 .imgclose { + right: -9px; + position: absolute; + top: -10px; +} +.module_384381550 .ModuleHead .HeadCenter{float:none;} +#module_384381550 { + padding:0px; +} +#module_384381550 { + position:static; + z-index:0; + top:370px; + left:0px; + width:100%; + height: auto; +} +#module_384381550 .ModuleHead384381550 { + display:none; +} +#module_384381550 .BodyCenter.BodyCenter384381550 { + background:none;background-color:rgba(0,0,0,0); +} +#module_384381550 >.module_384381550 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_384381550 >.module_384381550{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_384381550 .BodyCenter.BodyCenter384381550 { + padding-top:3.3333%; + padding-left:5.5556%; + padding-right:5.5556%; + padding-bottom:5.5556%; + } +} +@media screen and (max-width: 767px){ + #module_384381550 .BodyCenter.BodyCenter384381550 { + padding-top:4.4248%; + padding-left:4.4248%; + padding-right:4.4248%; + padding-bottom:4.4248%; + } +} +@media screen and (min-width: 768px){ + #module_384381550 >.module_384381550 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.1111%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_384381550 >.module_384381550 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_384381550 >.module_384381550 {box-shadow: 0px 0px 0px 0px #ccc} +#module_384381550:hover { + border:none; +} +#module_384381550:hover >.module_384381550 { + border-color:#ccc; +} +#module_384381550:hover >.module_384381550 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_384381550 .title{font-size:22px;} +#module_384381550 .title{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_384381550 .title{color:rgb(36, 44, 52);} +#module_384381550 .title{font-weight:bold;} +#module_384381550 .title{text-decoration:none;} +#module_384381550 .title{font-style:normal;} +#module_384381550 .title{background-color:transparent;} +#module_384381550 .title{background-image:none;} +#module_384381550 .title{background-repeat:no-repeat;} +#module_384381550 .title{background-position:50% 50%;} +#module_384381550 .title{background-attachment:scroll;} +#module_384381550 .title{} +#module_384381550 .title{height:50px;line-height:50px;} +#module_384381550 .title{text-align:center;} +#module_384381550 .smsvcode,#module_384381550 .frist_item,#module_384381550 .VerificationCodeinput,#module_384381550 .customFormCheckbox,#module_384381550 input[type=radio],#module_384381550.customFormDatetime,#module_384381550 input.input-text-color,#module_384381550 .Browse-file,#module_384381550 .customFormDatetime,#module_384381550 .pcCitybox select,#module_384381550 .multi-row-text{background-color:#fbfbfb;} +#module_384381550 .smsbtn,#module_384381550 .smsvcode,#module_384381550 .frist_item,#module_384381550 .VerificationCodeinput,#module_384381550 .customFormCheckbox,#module_384381550 input[type=radio],#module_384381550 input.input-text-color,#module_384381550.customFormDatetime,#module_384381550 .Browse-file,#module_384381550 .customFormDatetime,#module_384381550 .pcCitybox select,#module_384381550 .multi-row-text{border-top-color:rgb(232, 232, 232);} +#module_384381550 .smsvcode,#module_384381550 .frist_item,#module_384381550 .VerificationCodeinput,#module_384381550 .customFormCheckbox,#module_384381550 input[type=radio],#module_384381550 input.input-text-color,#module_384381550.customFormDatetime,#module_384381550 .Browse-file,#module_384381550 .customFormDatetime,#module_384381550 .pcCitybox select,#module_384381550 .multi-row-text{border-top-style:solid;} +#module_384381550 .smsvcode,#module_384381550 .frist_item,#module_384381550 .VerificationCodeinput,#module_384381550 .customFormCheckbox,#module_384381550 input[type=radio],#module_384381550 input.input-text-color,#module_384381550.customFormDatetime,#module_384381550 .Browse-file,#module_384381550 .customFormDatetime,#module_384381550 .pcCitybox select,#module_384381550 .multi-row-text{border-top-width:1px;} +#module_384381550 .smsvcode,#module_384381550 .frist_item,#module_384381550 .VerificationCodeinput,#module_384381550 .customFormCheckbox,#module_384381550 input[type=radio],#module_384381550 input.input-text-color,#module_384381550.customFormDatetime,#module_384381550 .Browse-file,#module_384381550 .customFormDatetime,#module_384381550 .pcCitybox select,#module_384381550 .multi-row-text{border-right-color:rgb(232, 232, 232);} +#module_384381550 .smsvcode,#module_384381550 .frist_item,#module_384381550 .VerificationCodeinput,#module_384381550 .customFormCheckbox,#module_384381550 input[type=radio],#module_384381550 input.input-text-color,#module_384381550.customFormDatetime,#module_384381550 .Browse-file,#module_384381550 .customFormDatetime,#module_384381550 .pcCitybox select,#module_384381550 .multi-row-text{border-right-style:solid;} +#module_384381550 .smsvcode,#module_384381550 .frist_item,#module_384381550 .VerificationCodeinput,#module_384381550 .customFormCheckbox,#module_384381550 input[type=radio],#module_384381550 input.input-text-color,#module_384381550.customFormDatetime,#module_384381550 .Browse-file,#module_384381550 .customFormDatetime,#module_384381550 .pcCitybox select,#module_384381550 .multi-row-text{border-right-width:1px;} +#module_384381550 .smsvcode,#module_384381550 .smsvcode,#module_384381550 .frist_item,#module_384381550 .VerificationCodeinput,#module_384381550 .customFormCheckbox,#module_384381550 input[type=radio],#module_384381550 input.input-text-color,#module_384381550.customFormDatetime,#module_384381550 .Browse-file,#module_384381550 .customFormDatetime,#module_384381550 .pcCitybox select,#module_384381550 .multi-row-text{border-bottom-color:rgb(232, 232, 232);} +#module_384381550 .smsvcode,#module_384381550 .frist_item,#module_384381550 .VerificationCodeinput,#module_384381550 .customFormCheckbox,#module_384381550 input[type=radio],#module_384381550 input.input-text-color,#module_384381550.customFormDatetime,#module_384381550 .Browse-file,#module_384381550 .customFormDatetime,#module_384381550 .pcCitybox select,#module_384381550 .multi-row-text{border-bottom-style:solid;} +#module_384381550 .smsvcode,#module_384381550 .frist_item,#module_384381550 .VerificationCodeinput,#module_384381550 .customFormCheckbox,#module_384381550 input[type=radio],#module_384381550 input.input-text-color,#module_384381550.customFormDatetime,#module_384381550 .Browse-file,#module_384381550 .customFormDatetime,#module_384381550 .pcCitybox select,#module_384381550 .multi-row-text{border-bottom-width:1px;} +#module_384381550 .smsvcode,#module_384381550 .frist_item,#module_384381550 .VerificationCodeinput,#module_384381550 .customFormCheckbox,#module_384381550 input[type=radio],#module_384381550 input.input-text-color,#module_384381550.customFormDatetime,#module_384381550 .Browse-file,#module_384381550 .customFormDatetime,#module_384381550 .pcCitybox select,#module_384381550 .multi-row-text{border-left-color:rgb(232, 232, 232);} +#module_384381550 .smsvcode,#module_384381550 .frist_item,#module_384381550 .VerificationCodeinput,#module_384381550 .customFormCheckbox,#module_384381550 input[type=radio],#module_384381550 input.input-text-color,#module_384381550.customFormDatetime,#module_384381550 .Browse-file,#module_384381550 .customFormDatetime,#module_384381550 .pcCitybox select,#module_384381550 .multi-row-text{border-left-style:solid;} +#module_384381550 .smsvcode,#module_384381550 .frist_item,#module_384381550 .VerificationCodeinput,#module_384381550 .customFormCheckbox,#module_384381550 input[type=radio],#module_384381550 input.input-text-color,#module_384381550.customFormDatetime,#module_384381550 .Browse-file,#module_384381550 .customFormDatetime,#module_384381550 .pcCitybox select,#module_384381550 .multi-row-text{border-left-width:1px;} +#module_384381550 .smsbtn,#module_384381550 .smsvcode,#module_384381550 .frist_item,#module_384381550 .VerificationCodeinput,#module_384381550 input.input-text-color,#module_384381550.customFormDatetime,#module_384381550 .Browse-file,#module_384381550 .customFormDatetime,#module_384381550 .pcCitybox select,#module_384381550 .multi-row-text{border-top-left-radius:px;} +#module_384381550 .smsbtn,#module_384381550 .smsvcode,#module_384381550 .frist_item,#module_384381550 .VerificationCodeinput,#module_384381550 input.input-text-color,#module_384381550.customFormDatetime,#module_384381550 .Browse-file,#module_384381550 .customFormDatetime,#module_384381550 .pcCitybox select,#module_384381550 .multi-row-text{border-top-right-radius:px;} +#module_384381550 .smsbtn,#module_384381550 .smsvcode,#module_384381550 .frist_item,#module_384381550 .VerificationCodeinput,#module_384381550 input.input-text-color,#module_384381550.customFormDatetime,#module_384381550 .Browse-file,#module_384381550 .customFormDatetime,#module_384381550 .pcCitybox select,#module_384381550 .multi-row-text{border-bottom-left-radius:px;} +#module_384381550 .smsbtn,#module_384381550 .smsvcode,#module_384381550 .frist_item,#module_384381550 .VerificationCodeinput,#module_384381550 input.input-text-color,#module_384381550.customFormDatetime,#module_384381550 .Browse-file,#module_384381550 .customFormDatetime,#module_384381550 .pcCitybox select,#module_384381550 .multi-row-text{border-bottom-right-radius:px;} +#module_384381550 .Describ-text-color{font-size:14px;} +#module_384381550 .Describ-text-color{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_384381550 .Describ-text-color{color:#595959;} +#module_384381550 .Describ-text-color{font-weight:normal;} +#module_384381550 .Describ-text-color{text-decoration:none;} +#module_384381550 .Describ-text-color{font-style:normal;} +#module_384381550 .smsbtn,#module_384381550 .smsvcode,#module_384381550 .input-text-color{font-size:14px;} +#module_384381550 .smsbtn,#module_384381550 .smsvcode,#module_384381550 .input-text-color{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_384381550 .smsvcode,#module_384381550 .input-text-color{color:#333;} #module_384381550 .input-text-color::-ms-input-placeholder{color:#333;} #module_384381550 .input-text-color::-moz-placeholder{color:#333;} #module_384381550 .input-text-color::-webkit-input-placeholder{color:#333;} +#module_384381550 .smsbtn,#module_384381550 .smsvcode,#module_384381550 .input-text-color{font-weight:normal;} +#module_384381550 .smsbtn,#module_384381550 .smsvcode,#module_384381550 .input-text-color{text-decoration:none;} #module_384381550 .input-text-color::-ms-input-placeholder{text-decoration:none;} #module_384381550 .input-text-color::-moz-placeholder{text-decoration:none;} #module_384381550 .input-text-color::-webkit-input-placeholder{text-decoration:none;} +#module_384381550 .smsbtn,#module_384381550 .smsvcode,#module_384381550 .input-text-color{font-style:normal;} +#module_384381550 .submitbtn{font-size:14px;} +#module_384381550 .submitbtn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_384381550 .submitbtn{color:#fff;} +#module_384381550 .submitbtn{font-weight:normal;} +#module_384381550 .submitbtn{text-decoration:none;} +#module_384381550 .submitbtn{font-style:normal;} +#module_384381550 .submitbtn{background-color:rgb(101, 164, 201);} #module_384381550 input[type=radio]:checked, #module_384381550 input[type=checkbox]:checked{background:rgb(101, 164, 201);border:1px solid rgb(101, 164, 201)} +#module_384381550 .submitbtn{background-image:none;} +#module_384381550 .submitbtn{background-repeat:no-repeat;} +#module_384381550 .submitbtn{background-position:50% 50%;} +#module_384381550 .submitbtn{background-attachment:scroll;} +#module_384381550 .submitbtn{} +#module_384381550 .submitbtnbox{justify-content:;} +#module_384381550 .submitbtn{width:%;} +#module_384381550 .submitbtn{height:px;line-height:px;} +#module_384381550 .submitbtn{border-top-left-radius:px;} +#module_384381550 .submitbtn{border-top-right-radius:px;} +#module_384381550 .submitbtn{border-bottom-left-radius:px;} +#module_384381550 .submitbtn{border-bottom-right-radius:px;} +#module_384381550 .vcbtn1{background-color:#333333;} +#module_384381550 .vcbtn1{color:#fff;} +#module_384381550 .frist_item:hover,#module_384381550 .VerificationCodeinput:hover,#module_384381550 .customFormCheckbox:hover,#module_384381550 input[type=radio]:hover,#module_384381550 input.input-text-color:hover,#module_384381550.customFormDatetime:hover,#module_384381550 .Browse-file:hover,#module_384381550 .customFormDatetime:hover,#module_384381550 .pcCitybox select:hover,#module_384381550 .multi-row-text:hover{border-top-color:rgb(101, 164, 201);} +#module_384381550 .frist_item:hover,#module_384381550 .VerificationCodeinput:hover,#module_384381550 .customFormCheckbox:hover,#module_384381550 input[type=radio]:hover,#module_384381550 input.input-text-color:hover,#module_384381550.customFormDatetime:hover,#module_384381550 .Browse-file:hover,#module_384381550 .customFormDatetime:hover,#module_384381550 .pcCitybox select:hover,#module_384381550 .multi-row-text:hover{border-top-style:solid;} +#module_384381550 .frist_item:hover,#module_384381550 .VerificationCodeinput:hover,#module_384381550 .customFormCheckbox:hover,#module_384381550 input[type=radio]:hover,#module_384381550 input.input-text-color:hover,#module_384381550.customFormDatetime:hover,#module_384381550 .Browse-file:hover,#module_384381550 .customFormDatetime:hover,#module_384381550 .pcCitybox select:hover,#module_384381550 .multi-row-text:hover{border-right-color:rgb(101, 164, 201);} +#module_384381550 .frist_item:hover,#module_384381550 .VerificationCodeinput:hover,#module_384381550 .customFormCheckbox:hover,#module_384381550 input[type=radio]:hover,#module_384381550 input.input-text-color:hover,#module_384381550.customFormDatetime:hover,#module_384381550 .Browse-file:hover,#module_384381550 .customFormDatetime:hover,#module_384381550 .pcCitybox select:hover,#module_384381550 .multi-row-text:hover{border-right-style:solid;} +#module_384381550 .frist_item:hover,#module_384381550 .VerificationCodeinput:hover,#module_384381550 .customFormCheckbox:hover,#module_384381550 input[type=radio]:hover,#module_384381550 input.input-text-color:hover,#module_384381550.customFormDatetime:hover,#module_384381550 .Browse-file:hover,#module_384381550 .customFormDatetime:hover,#module_384381550 .pcCitybox select:hover,#module_384381550 .multi-row-text:hover{border-bottom-color:rgb(101, 164, 201);} +#module_384381550 .frist_item:hover,#module_384381550 .VerificationCodeinput:hover,#module_384381550 .customFormCheckbox:hover,#module_384381550 input[type=radio]:hover,#module_384381550 input.input-text-color:hover,#module_384381550.customFormDatetime:hover,#module_384381550 .Browse-file:hover,#module_384381550 .customFormDatetime:hover,#module_384381550 .pcCitybox select:hover,#module_384381550 .multi-row-text:hover{border-bottom-style:solid;} +#module_384381550 .frist_item:hover,#module_384381550 .VerificationCodeinput:hover,#module_384381550 .customFormCheckbox:hover,#module_384381550 input[type=radio]:hover,#module_384381550 input.input-text-color:hover,#module_384381550.customFormDatetime:hover,#module_384381550 .Browse-file:hover,#module_384381550 .customFormDatetime:hover,#module_384381550 .pcCitybox select:hover,#module_384381550 .multi-row-text:hover{border-left-color:rgb(101, 164, 201);} +#module_384381550 .frist_item:hover,#module_384381550 .VerificationCodeinput:hover,#module_384381550 .customFormCheckbox:hover,#module_384381550 input[type=radio]:hover,#module_384381550 input.input-text-color:hover,#module_384381550.customFormDatetime:hover,#module_384381550 .Browse-file:hover,#module_384381550 .customFormDatetime:hover,#module_384381550 .pcCitybox select:hover,#module_384381550 .multi-row-text:hover{border-left-style:solid;} +#module_384381550 .submitbtn:hover{font-size:14px;} +#module_384381550 .submitbtn:hover{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_384381550 .submitbtn:hover{color:#fff;} +#module_384381550 .submitbtn:hover{font-weight:normal;} +#module_384381550 .submitbtn:hover{text-decoration:none;} +#module_384381550 .submitbtn:hover{font-style:normal;} +#module_384381550 .submitbtn:hover{background-color:rgb(86, 147, 182);} +#module_384381550 .submitbtn:hover{background-image:none;} +#module_384381550 .submitbtn:hover{background-repeat:no-repeat;} +#module_384381550 .submitbtn:hover{background-position:50% 50%;} +#module_384381550 .submitbtn:hover{background-attachment:scroll;} +#module_384381550 .submitbtn:hover{} + +.ModuleGridGiant.layout-101 .ModuleGridItem { + padding: 0; + min-height: 0.1px; +} + +.ModuleGridGiant.layout-101 .row { + margin-right: 0px; + margin-left: 0px; +} + +.ModuleGridGiant.layout-101 .ModuleGridCol { + padding: 0px; +} + +.ModuleGridGiant.layout-101 .ModuleGridContainer { + /* margin-right: auto; */ + /* margin-left: auto; */ + /* padding-right: 0; */ + /* padding-left: 0; */ +} +.ModuleGridGiant.layout-101{height: 100%;} +.ModuleGridGiant.layout-101 .ModuleSubContainer{position: relative;} +.ModuleGridGiant.layout-101 .gridBgVideo{display: flex; position: absolute;top: 0;left: 0;width:100%;z-index: 0;} +.ModuleGridGiant.layout-101 .gridBgVideo .bgVideoMask{position: absolute;top: 0;left: 0;right: 0;bottom: 0;background-color: rgb(0,0,0);} +.ModuleGridGiant.layout-101 .gridBgVideo .bgVideo{width: 100%; height: 100%; object-fit: cover; object-position: center center;} +.ModuleGridGiant.layout-101 .gridBgVideo.noBgVideo{display: none;} + +@media only screen and (max-width: 767px) { + .ModuleGridGiant.layout-101 .ModuleGridItem { + height: 100% !important; + } +}.module_386714423 .ModuleHead .HeadCenter{float:none;} +#module_386714423 { + padding:0px; +} +#module_386714423 { + position:static; + z-index:4000; + top:0px; + left:0px; + width:100%; + height: auto; +} +#module_386714423 .ModuleHead386714423 { + display:none; +} +#module_386714423 .BodyCenter.BodyCenter386714423 { + background:none;background-color:rgb(255, 255, 255); +} +#module_386714423 >.module_386714423 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_386714423 >.module_386714423{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_386714423 .BodyCenter.BodyCenter386714423 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_386714423 .BodyCenter.BodyCenter386714423 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_386714423 >.module_386714423 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_386714423 >.module_386714423 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_386714423 >.module_386714423 {box-shadow: 0px 0px 0px 0px #ccc} +#module_386714423:hover { + border:none; +} +#module_386714423:hover >.module_386714423 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_386714423 .ModuleSubContainer{background-color:transparent;} +#module_386714423 .ModuleSubContainer{background-image:none;} +#module_386714423 .ModuleSubContainer{background-repeat:no-repeat;} +#module_386714423 .ModuleSubContainer{background-position:0% 0%;} +#module_386714423 .ModuleSubContainer{background-attachment:scroll;} +#module_386714423 .ModuleSubContainer{} +#module_386714423 {!bgVideo!}{bgVideoUrl:} +#module_386714423 .gridBgVideo .bgVideoMask{opacity:0.2} +#module_386714423 .ModuleSubContainer{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0); transition: box-shadow 0.5s ease;} +#module_386714423 .ModuleSubContainer:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +.ModuleGridContainer.ModuleGridContainer386714423 {} +.ModuleImageGiant.layout-101 .BodyCenter{ + text-align:center; +} +.ModuleImageGiant.layout-101 img{ + margin: auto; + max-width: 100%; + border: none; +} + +.module_386714424 .ModuleHead .HeadCenter{float:none;} +#module_386714424 { + padding:0px; +} +#module_386714424 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_386714424 .ModuleHead386714424 { + display:none; +} +#module_386714424 .BodyCenter.BodyCenter386714424 { + background:none;background-color:rgba(0,0,0,0); +} +#module_386714424 >.module_386714424 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_386714424 >.module_386714424{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_386714424 .BodyCenter.BodyCenter386714424 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_386714424 .BodyCenter.BodyCenter386714424 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_386714424 >.module_386714424 { + margin-top:3.3333%; + margin-left:0.0000%; + margin-right:33.3333%; + margin-bottom:3.3333%; + } +} +@media screen and (max-width: 767px){ + #module_386714424 >.module_386714424 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_386714424 >.module_386714424 {box-shadow: 0px 0px 0px 0px #ccc} +#module_386714424:hover { + border:none; +} +#module_386714424:hover >.module_386714424 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_386714424 img{border-top-color:transparent;} +#module_386714424 img{border-top-style:none;} +#module_386714424 img{border-top-width:0px;} +#module_386714424 img{border-right-color:transparent;} +#module_386714424 img{border-right-style:none;} +#module_386714424 img{border-right-width:0px;} +#module_386714424 img{border-bottom-color:transparent;} +#module_386714424 img{border-bottom-style:none;} +#module_386714424 img{border-bottom-width:0px;} +#module_386714424 img{border-left-color:transparent;} +#module_386714424 img{border-left-style:none;} +#module_386714424 img{border-left-width:0px;} +#module_386714424 img{border-top-left-radius:0px;} +#module_386714424 img{border-top-right-radius:0px;} +#module_386714424 img{border-bottom-left-radius:0px;} +#module_386714424 img{border-bottom-right-radius:0px;} +#module_386714424 .BodyCenter{text-align: center;} + +.ModuleNavGiant.layout-116 .main-nav-content { + position: relative; + width: 100%; + height: auto; + margin: 0 auto; + line-height: 0; + overflow:hidden; +} +.ModuleNavGiant.layout-116 .aroundMune{ + position: absolute; + display: flex; + align-items: center; + right: 0px; + padding:0 10px; + height: 100%; + z-index: 5; + transform: rotateY(90deg); +} +.ModuleNavGiant.layout-116 .aroundMune.active{ + transform: rotateY(0deg); +} +.ModuleNavGiant.layout-116 .moveMenuRight, .ModuleNavGiant.layout-116 .moveMenuLeft{ + display: inline-block; + width: 36px; + height: 36px; + line-height: 36px; + font-size: 16px; + color:#666; + text-align: center; + border:1px solid rgba(0,0,0,.1); + border-radius: 5px; + cursor: pointer; +} +.ModuleNavGiant.layout-116 .main-nav-content .moveMenuRight{ + background-color: rgba(238,238,238,.6); +} +.ModuleNavGiant.layout-116 .main-nav-content .moveMenuLeft{ + display:none; + background-color: rgba(238,238,238,.6); + margin-right: 10px + +} +.ModuleNavGiant.layout-116 .moveMenuRight:hover, .ModuleNavGiant.layout-116 .moveMenuLeft:hover{ + color:#fff; + background-color:rgba(204,204,204,.6); +} +.ModuleNavGiant.layout-116 .main-nav-content >.blank-solve{ + width: auto; + display: inline-block; + transition: all .4s; + position: relative; + left: 0; +} +.ModuleNavGiant.layout-116 .main-nav-item-group { + box-sizing: border-box; + -moz-box-sizing:border-box; + -webkit-box-sizing:border-box; + height: 80px; + line-height: 80px; + float: left; +} +.ModuleNavGiant.layout-116 .main-nav-item { + box-sizing: content-box; + padding: 0 25px; + color: #000000; + position: relative; + display:inline-block; +} + +.ModuleNavGiant.layout-116 .main-nav-item::before { + content: ''; + position: absolute; + width: 0%; + transition: all 0.2s ease-out 0s; + -moz-transition: all 0.2s ease-out 0s; + -webkit-transition: all 0.2s ease-out 0s; + -o-transition: all 0.2s ease-out 0s; + border-bottom-width:3px; + border-bottom-style:solid; + z-index: 1; + left: 50%; + bottom: 0; + margin-bottom: 10px; +} + +.ModuleNavGiant.layout-116 .mainName, +.ModuleNavGiant.layout-116 .main-nav-item-name::after{ + -webkit-transition: -webkit-transform 0.3s, opacity 0.3s; + transition: transform 0.3s, opacity 0.3s; + -webkit-transition-timing-function: cubic-bezier(0.2, 1, 0.3, 1); + transition-timing-function: cubic-bezier(0.2, 1, 0.3, 1); +} + +.ModuleNavGiant.layout-116 .mainName{ + display: block; + text-align: center; +} + +.ModuleNavGiant.layout-116 .main-nav-item-hover::before { + width: 20%; + left: 40%; + opacity: 1; +} + +.ModuleNavGiant.layout-116 .main-nav-item-hover .main-nav-item-name .mainName{ + opacity: 0; + -webkit-transform: translate3d(0, -25%, 0); + transform: translate3d(0, -25%, 0); +} + +.ModuleNavGiant.layout-116 .main-nav-item .main-nav-item-name::after { + content: attr(data-text); + position: absolute; + width: 100%; + top: 0; + left: 0; + opacity: 0; + overflow: hidden; + text-overflow: ellipsis; + text-align: center; + -webkit-transform: translate3d(0, 25%, 0); + transform: translate3d(0, 25%, 0); +} + +.ModuleNavGiant.layout-116 .main-nav-item:hover .main-nav-item-name::after{ + opacity: 1; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); +} + +.ModuleNavGiant.layout-116 .main-nav-item-hover .main-nav-item-name::after{ + opacity: 1; + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); +} + +.ModuleNavGiant.layout-116 .sub-nav-item-group { + z-index: 3; + height: 200px; + bottom: -220px; + left: -49px; + width: 192px; + text-align: center; + display: none; + margin: 0px !important; +} + +.ModuleNavGiant.layout-116 .sub-nav-item-menu { + transition: .15s ease-in-out; + background-color: #fff; + border-top-left-radius: 0; + border-top-right-radius: 2px; + border-bottom-left-radius: 2px; + border-bottom-right-radius: 2px; + -webkit-box-sizing: border-box; + box-sizing: border-box; +} +.ModuleNavGiant.layout-116 .sub-nav-item-box { + width : 100%; + position: relative; + box-shadow: 0 0 rgba(0,0,0,0); + height: auto !important; +} + +.ModuleNavGiant.layout-116 .sub-nav-item-box:last-child{ + border-bottom-width: 0px !important; +} + +.ModuleNavGiant.layout-116 .sub-nav-item-box:hover .item_sub.item_outer, +.ModuleNavGiant.layout-116 .sub-nav-item-box:hover .spanSubName{ + padding: 0 20px 0 23px; +} +.ModuleNavGiant.layout-116 .third-nav-item:hover .item_third .item_outer, +.ModuleNavGiant.layout-116 .third-nav-item:hover .thirdName{ + padding: 0 0 0 23px; +} + +.ModuleNavGiant.layout-116 .sub-nav-item-box .item_outer { + position: relative; + display: block; + overflow: hidden; + -webkit-box-sizing: border-box; + box-sizing: border-box; + -webkit-transition: padding .2s ease-in-out; + -o-transition: padding .2s ease-in-out; + transition: padding .2s ease-in-out; + text-align: left; + padding-right: 12px; +} + +.ModuleNavGiant.layout-116 .third-nav-item .item_outer { + padding: 0; + text-overflow: ellipsis; + white-space: nowrap; + word-break: break-word; +} + +.ModuleNavGiant.layout-116 .sub-nav-item-box .item_sub.item_outer:before { + content: ''; + position: absolute; + display: block; + top: calc(50% - 2px); + left: -23px; + width: 12px; + height: 3px; + color: inherit; + line-height: inherit; + font-weight: 400; + font-style: normal; + text-rendering: auto; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + -webkit-transition: left .2s ease-in-out; + -o-transition: left .2s ease-in-out; + transition: left .2s ease-in-out; +} + +.ModuleNavGiant.layout-116 a:last-child .item_third{ + border-bottom-width: 0px !important; +} + +.ModuleNavGiant.layout-116 .sub-nav-item-box .item_third .item_outer:before { + content: ''; + position: absolute; + display: block; + top: calc(50% - 2px); + left: -23px; + width: 12px; + height: 3px; + color: inherit; + line-height: inherit; + font-weight: 400; + font-style: normal; + text-rendering: auto; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + -webkit-transition: left .2s ease-in-out; + -o-transition: left .2s ease-in-out; + transition: left .2s ease-in-out; +} + +.ModuleNavGiant.layout-116 .sub-nav-item-box:hover .item_sub.item_outer:before, +.ModuleNavGiant.layout-116 .third-nav-item:hover .item_third .item_outer:before{ + left: 0px; +} + +.ModuleNavGiant.layout-116 .sub-nav-item-box .outAfter:after { + position: absolute; + display: inline-block; + vertical-align: middle; + top: -2px; + right: -6px; + content: '\35'; + font-family: ElegantIcons; + font-size: 20px; + font-weight: 400; + font-style: normal; + text-rendering: auto; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + color: #ed1d24; +} + +.ModuleNavGiant.layout-116 .sub-nav-item-box .flip:after { + transform: rotateY(180deg); +} + +.ModuleNavGiant.layout-116 .sub-nav-item-group{ + position: relative; +} +.ModuleNavGiant.layout-116 .arrow{ + top:13px; + width:15px; + height:15px; + position: absolute; + left: 50%; + margin-left: -7.5px; + z-index:-1; + transform:rotate(45deg); + -ms-transform:rotate(45deg); + -moz-transform:rotate(45deg); + -webkit-transform:rotate(45deg); + -o-transform:rotate(45deg); + transition: all 0.5s; + -moz-transition: all 0.5s; + -webkit-transition: all 0.5s; + -o-transition: all 0.5s; + box-shadow: 0 0 1px rgba(0,0,0,.1); +} + +.ModuleNavGiant.layout-116 .sub-nav-item:first-child { + border-top: none!important; +} +.ModuleNavGiant.layout-116 .sub-nav-item:last-child { + border-bottom: none!important; +} +.ModuleNavGiant.layout-116 .maxLine{ + display: inline-block; + max-width: calc(100% - 80px); + width: 100%; +} + +.ModuleNavGiant.layout-116 .sub-nav-item-div { + text-overflow: ellipsis; + white-space: nowrap; + word-break: break-word; + overflow: hidden; +} + +.ModuleNavGiant.layout-116 .sub-nav-item-href { + display: block; + transition: all 0.5s; + -moz-transition: all 0.5s; + -webkit-transition: all 0.5s; + -o-transition: all 0.5s; + font-size: 12px; + cursor: pointer; + float: none; + margin: 0; +} + +.ModuleNavGiant.layout-116 .sub-nav-item-SubName { + -webkit-transition: padding .2s ease-in-out; + -o-transition: padding .2s ease-in-out; + transition: padding .2s ease-in-out; + text-align: left; +} + +.ModuleNavGiant.layout-116 .spanSubName,.ModuleNavGiant.layout-116 .thirdName { + word-break: break-all; + overflow: hidden; + text-overflow: ellipsis; + -webkit-line-clamp: 2; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-transition: padding .2s ease-in-out; + padding-right: 12px; + line-height: 1.5; + margin-bottom: 12px; +} + +.ModuleNavGiant.layout-116 .sub-nav-item:hover { + background-color: #f7f7f7; +} +.ModuleNavGiant.layout-116 .sub-nav-item-hover { + background-color: #f7f7f7; +} +.ModuleNavGiant.layout-116 .sub-nav-item-group.current { + display: block; +} +.ModuleNavGiant.layout-116 .main-nav-item-group.current .main-nav-item::after { + content: ''; + position: absolute; + width: 100%; + height: 3px; + background-color: #1976d2; + z-index: 11111; + left: 0; + bottom: 0; +} +.ModuleNavGiant.layout-116 .clearfix:after{content:'.';clear: both;display:block;width:0;height:0;overflow: hidden;visibility: hidden;} + +/* Èý¼¶²Ëµ¥ Begin*/ +.ModuleNavGiant.layout-116 .third-nav-item-group { + width: 100%; + z-index: 20; + display: none; + list-style: none outside none; + margin: 0; + text-align: left; + vertical-align: middle; + background-color: #fff; + position: absolute; + top: 0px; + height: auto; + overflow: hidden; + border-radius: 2px; + border-top-left-radius: 0; + -webkit-box-sizing: border-box; + box-sizing: border-box; + -webkit-transition: opacity .15s ease-out; + -o-transition: opacity .15s ease-out; + transition: opacity .15s ease-out; +} +/* Èý¼¶²Ëµ¥ Begin*/ +.ModuleNavGiant.layout-116 .third-nav-item-box { + position: relative; + padding: 0; + margin: 0; + display: block; + height: auto; +} +.ModuleNavGiant.layout-116 .third-nav-item:first-child { + /*border-top: none!important;*/ +} +.ModuleNavGiant.layout-116 .third-nav-item:last-child { + /*border-bottom: none!important;*/ +} +.ModuleNavGiant.layout-116 .third-nav-item { + transition: all 0.5s; + -moz-transition: all 0.5s; + -webkit-transition: all 0.5s; + -o-transition: all 0.5s; + font-family: Rajdhani,sans-serif; + font-size: 12px; + line-height: 38px; + font-weight: 600; + letter-spacing: .1em; + /* text-transform: uppercase; */ + color: grey; + margin: 0; +} +.ModuleNavGiant.layout-116 .third-nav-item:hover { + background-color: #f7f7f7; +} +.ModuleNavGiant.layout-116 .third-nav-item-inner { + display: block; + height: calc(100%); +} +.ModuleNavGiant.layout-116 .sub-nav-item-p{ + float: left; + margin: 0px 0px 0px 70px; +} +.ModuleNavGiant.layout-116 .sub-nav-item-span{ + float: right; + margin: 0px 24px 0px 0px; + font-size: 16px; + display: none; +} +/*.ModuleNavGiant.layout-116 .sub-nav-item-box:hover .sub-nav-item:after,.ModuleNavGiant.layout-116 .sub-nav-item-box:hover .sub-nav-item-hover::after{*/ +/* content: "\e65f";*/ +/* position: absolute;*/ +/* -webkit-animation: layout-116-nav-active2 0.5s;*/ +/* -moz-animation: layout-116-nav-active2 0.5s;*/ +/* -o-animation: layout-116-nav-active2 0.5s;*/ +/* animation: layout-116-nav-active2 0.5s;*/ +/* right: 25px;*/ +/*}*/ +.ModuleNavGiant.layout-116 .nohover::after{ + content: ""!important; +} +.ModuleNavGiant.layout-116 .sub-nav-item{ + line-height: calc( 100% + 24px ); +} +.ModuleNavGiant.layout-116 .sub-nav-item-box .icon-xiangyoujiantou:before{ + content:""; +} +.ModuleNavGiant.layout-116 .sub-nav-item-box .icon-xiangzuojiantou:before{ + position: absolute; + -webkit-animation: layout-116-nav-active2 0.5s; + -moz-animation: layout-116-nav-active2 0.5s; + -o-animation: layout-116-nav-active2 0.5s; + animation: layout-116-nav-active2 0.5s; + left: 25px; +} +.ModuleNavGiant.layout-116 .verticalMenu {height: auto !important;} +.ModuleNavGiant.layout-116 .verticalMenu.main-nav-content >.blank-solve {width: 100% !important;} +.ModuleNavGiant.layout-116 .verticalMenu .main-nav-item-group {float: unset; width: 100%;} +.ModuleNavGiant.layout-116 .verticalMenu .main-nav-item-group:last-child {margin-bottom: 0 !important;} +.ModuleNavGiant.layout-116 .verticalMenu .main-nav-item {padding: 0 !important; text-align: center;} +.ModuleNavGiant.layout-116 .sub-nav-item-group.sub-menu{ + display: none !important; +} + +@font-face { + font-family:eleganticons;src:url(/fonts/ElegantIcons.eot);src:url(/fonts/ElegantIcons.eot?#iefix) format('embedded-opentype'),url(/fonts/ElegantIcons.woff) format('woff'),url(/fonts/ElegantIcons.ttf) format('truetype'),url(/fonts/ElegantIcons.svg#ElegantIcons) format('svg');font-weight:400;font-style:normal +}[data-icon]:before { + font-family: eleganticons; + content: attr(data-icon); + speak: none; + font-weight: 400; + font-variant: normal; + text-transform: none; + line-height: 1; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale + }.module_386714474 .ModuleHead .HeadCenter{float:none;} +#module_386714474 { + padding:0px; +} +#module_386714474 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_386714474 .ModuleHead386714474 { + display:none; +} +#module_386714474 .BodyCenter.BodyCenter386714474 { + background:none;background-color:rgba(0,0,0,0); +} +#module_386714474 >.module_386714474 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_386714474 >.module_386714474{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_386714474 .BodyCenter.BodyCenter386714474 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_386714474 .BodyCenter.BodyCenter386714474 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_386714474 >.module_386714474 { + margin-top:1.1111%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_386714474 >.module_386714474 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_386714474 >.module_386714474 {box-shadow: 0px 0px 0px 0px #ccc} +#module_386714474:hover { + border:none; +} +#module_386714474:hover >.module_386714474 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_386714474 .main-nav-item-group{height:60px;} #module_386714474 .main-nav-item{line-height:60px;} #module_386714474 .main-nav-content{height:60px} +#module_386714474 .main-nav-content{background-color:#fff;} +#module_386714474 .main-nav-content{background-image:none;} +#module_386714474 .main-nav-content{background-repeat:no-repeat;} +#module_386714474 .main-nav-content{} +#module_386714474 .main-nav-content{} +#module_386714474 .main-nav-content{} +#module_386714474 .main-nav-content, #module_386714474 .verticalMenu .main-nav-item-group{text-align:right;} +#module_386714474 .main-nav-item{font-size:14px;} +#module_386714474 .main-nav-item{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_386714474 .main-nav-item{color:#434242;} +#module_386714474 .main-nav-item{font-weight:bold;} +#module_386714474 .main-nav-item{text-decoration:none;} +#module_386714474 .main-nav-item{font-style:normal;} +#module_386714474 .main-nav-item{width:auto;} +#module_386714474 .main-nav-item,#module_386714474 .defaultMenu .main-nav-item-name::after{padding-left:45px;padding-right:45px;} #module_386714474 .verticalMenu .main-nav-item-group{margin-bottom:45px;} +#module_386714474 .main-nav-item{background-color:transparent;} +#module_386714474 .main-nav-item{background-image:none;} +#module_386714474 .main-nav-item{background-repeat:no-repeat;} +#module_386714474 .main-nav-item{} +#module_386714474 .main-nav-item{} +#module_386714474 .main-nav-item{} +#module_386714474 .sub-nav-item-group{width:244px;} +#module_386714474 .sub-nav-item-div{font-size:14px;} +#module_386714474 .sub-nav-item-div{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_386714474 .sub-nav-item-div{color:#666;},#module_386714474 .sub-nav-item:hover::after{color:#666;} +#module_386714474 .sub-nav-item-div{font-weight:normal;} +#module_386714474 .sub-nav-item-div{text-decoration:none;} +#module_386714474 .sub-nav-item-div{font-style:normal;} +#module_386714474 .sub-nav-item-SubName{font-size:12px;} +#module_386714474 .sub-nav-item-SubName{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_386714474 .sub-nav-item-SubName{color:#999;} +#module_386714474 .sub-nav-item-SubName{font-weight:normal;} +#module_386714474 .sub-nav-item-SubName{text-decoration:none;} +#module_386714474 .sub-nav-item-SubName{font-style:normal;} +#module_386714474 .sub-nav-item-box .item_sub.item_outer:before{background-color:rgb(52, 144, 222);} #module_386714474 .sub-nav-item-box .outAfter:after{color:rgb(52, 144, 222);} +#module_386714474 .sub-nav-item-menu,#module_386714474 .arrow,#module_386714474 .sub-normal-color{background-color:#fff;} +#module_386714474 .sub-nav-item-menu{background-image:none;} +#module_386714474 .sub-nav-item-menu{background-repeat:no-repeat;} +#module_386714474 .sub-nav-item-menu{} +#module_386714474 .sub-nav-item-menu{} +#module_386714474 .sub-nav-item-menu{} +#module_386714474 .sub-nav-item-box{border-bottom-color:#E3E9EE;} +#module_386714474 .sub-nav-item-box{border-bottom-style:dashed;} +#module_386714474 .sub-nav-item-box{border-bottom-width:1px;} +#module_386714474 .sub-nav-item-menu{padding-top:8px;} +#module_386714474 .sub-nav-item-menu{padding-bottom:8px;} +#module_386714474 .sub-nav-item-menu{padding-left:24px;} +#module_386714474 .sub-nav-item-menu{padding-right:24px;} +#module_386714474 .sub-nav-item-menu{box-shadow:0px 0px 24px 0px rgba(75, 76, 79, 0.1);} +#module_386714474 .third-nav-item-group{width:244px;} +#module_386714474 .third-nav-item{height:42px;line-height:42px;} #module_386714474 .third-nav-item {line-height:calc(100% + (42px - 10px));} +#module_386714474 .third-nav-item .item_outer{font-size:14px;} +#module_386714474 .third-nav-item .item_outer{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_386714474 .third-nav-item .item_outer{color:#666;} +#module_386714474 .third-nav-item .item_outer{font-weight:normal;} +#module_386714474 .third-nav-item .item_outer{text-decoration:none;} +#module_386714474 .third-nav-item .item_outer{font-style:normal;} +#module_386714474 .third-nav-item .thirdName{font-size:12px;} +#module_386714474 .third-nav-item .thirdName{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_386714474 .third-nav-item .thirdName{color:#999;} +#module_386714474 .third-nav-item .thirdName{font-weight:normal;} +#module_386714474 .third-nav-item .thirdName{text-decoration:none;} +#module_386714474 .third-nav-item .thirdName{font-style:normal;} +#module_386714474 .sub-nav-item-box .item_third .item_outer:before{background-color:#f10215;} +#module_386714474 .third-nav-item-group,#module_386714474 .third-normal-color{background-color:#fff;} +#module_386714474 .third-nav-item-group{background-image:none;} +#module_386714474 .third-nav-item-group{background-repeat:no-repeat;} +#module_386714474 .third-nav-item-group{} +#module_386714474 .third-nav-item-group{} +#module_386714474 .third-nav-item-group{} +#module_386714474 .item_third{border-bottom-color:#E3E9EE;} +#module_386714474 .item_third{border-bottom-style:dashed;} +#module_386714474 .item_third{border-bottom-width:1px;} +#module_386714474 .third-nav-item-group{padding-top:8px;} +#module_386714474 .third-nav-item-group{padding-bottom:8px;} +#module_386714474 .third-nav-item-group{padding-left:24px;} +#module_386714474 .third-nav-item-group{padding-right:24px;} +#module_386714474 .third-nav-item-group{box-shadow:0px 0px 24px 0px rgba(75, 76, 79, 0.1);} +#module_386714474 .main-nav-item-name::after{font-size:14px;} +#module_386714474 .main-nav-item-name::after{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_386714474 .main-nav-item-name::after{color:rgb(0, 0, 0);} #module_386714474 .add{color:rgb(0, 0, 0);}#module_386714474 .main-nav-item-hover::afters{background-color:rgb(0, 0, 0);} +#module_386714474 .main-nav-item-name::after{font-weight:bold;} +#module_386714474 .main-nav-item-name::after{text-decoration:none;} +#module_386714474 .main-nav-item-name::after{font-style:normal;} +#module_386714474 .main-nav-item-hover{background-color:transparent;} +#module_386714474 .main-nav-item-hover{background-image:none;} +#module_386714474 .main-nav-item-hover{background-repeat:no-repeat;} +#module_386714474 .main-nav-item-hover{} +#module_386714474 .main-nav-item-hover{} +#module_386714474 .main-nav-item-hover{} +#module_386714474 .main-nav-item::before{border-bottom-color:rgb(52, 144, 222);} +#module_386714474 .sub-nav-item-box:hover .sub-nav-item-div{font-size:14px;} +#module_386714474 .sub-nav-item-box:hover .sub-nav-item-div{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_386714474 .sub-nav-item-box:hover .sub-nav-item-div{color:#666;} +#module_386714474 .sub-nav-item-box:hover .sub-nav-item-div{font-weight:normal;} +#module_386714474 .sub-nav-item-box:hover .sub-nav-item-div{text-decoration:none;} +#module_386714474 .sub-nav-item-box:hover .sub-nav-item-div{font-style:normal;} +#module_386714474 .sub-nav-item:hover,#module_386714474 .sub-hover-color{background-color:#fff;}, #module_386714474 .sub-nav-item-hover{background-color:#fff;} +#module_386714474 .sub-nav-item:hover{background-image:none;} +#module_386714474 .sub-nav-item:hover{background-repeat:no-repeat;} +#module_386714474 .sub-nav-item:hover{} +#module_386714474 .sub-nav-item:hover{} +#module_386714474 .sub-nav-item:hover{} +#module_386714474 .third-nav-item:hover .item_outer{font-size:14px;} +#module_386714474 .third-nav-item:hover .item_outer{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_386714474 .third-nav-item:hover .item_outer{color:#666;} +#module_386714474 .third-nav-item:hover .item_outer{font-weight:normal;} +#module_386714474 .third-nav-item:hover .item_outer{text-decoration:none;} +#module_386714474 .third-nav-item:hover .item_outer{font-style:normal;} +#module_386714474 .third-nav-item:hover .third-nav-item-inner,#module_386714474 .third-hover-color{background-color:#fff;} +#module_386714474 .third-nav-item:hover .third-nav-item-inner{} +#module_386714474 .third-nav-item:hover .third-nav-item-inner{background-repeat:no-repeat;} +#module_386714474 .third-nav-item:hover .third-nav-item-inner{} +#module_386714474 .third-nav-item:hover .third-nav-item-inner{} +#module_386714474 .third-nav-item:hover .third-nav-item-inner{} + + +/*ÂÖ²¥Í¼Ñùʽ*/ +.ModuleSlideV2Giant.layout-109 .slider-layout-109 {width: 100%; height: auto; margin: auto; position: relative;} +.ModuleSlideV2Giant.layout-109 .slider-layout-109 .slider-layout-content:not(:first-child) {position: absolute; left: 0; top: 0; opacity: 0;} +.ModuleSlideV2Giant.layout-109 .slick-track {font-size: 0;} +.ModuleSlideV2Giant.layout-109 .slick-dotted.slick-slider {margin-bottom: 0; padding: 0; font-size: 0;} +.ModuleSlideV2Giant.layout-109 .slick-slide {position: relative; transition: unset !important; opacity: 1 !important;} +.ModuleSlideV2Giant.layout-109 .slick-slide .slick-slide-box{transform: matrix(1, 0, 0, 1, 0, 0);} +.ModuleSlideV2Giant.layout-109 .slick-slide .slick-box{transform: matrix(1.1, 0, 0, 1.1, 0, 0); transform-origin: 100% 50%;} +.ModuleSlideV2Giant.layout-109 .slick-slide.slick-current .slick-box{transform: matrix(1, 0, 0, 1, 0, 0); transform-origin: 0% 50%;} +.ModuleSlideV2Giant.layout-109 .slick-slide.prevScalePage {-moz-animation: prevScalePage 1s ease-in-out; -webkit-animation: prevScalePage 1s ease-in-out; animation: prevScalePage 1s ease-in-out;} +.ModuleSlideV2Giant.layout-109 .slick-slide.nextScalePage {-moz-animation: nextScalePageUBox 1s ease-in-out; -webkit-animation: nextScalePageUBox 1s ease-in-out; animation: nextScalePageUBox 1s ease-in-out;} +.ModuleSlideV2Giant.layout-109 .slick-slide.nextScalePage .slick-slide-box {-moz-animation: nextScalePageBox 1s ease-in-out; -webkit-animation: nextScalePageBox 1s ease-in-out; animation: nextScalePageBox 1s ease-in-out;} +.ModuleSlideV2Giant.layout-109 .slick-slide.nextScalePage .slick-box{-moz-animation: nextScalePage 1s ease-in-out; -webkit-animation: nextScalePage 1s ease-in-out; animation: nextScalePage 1s ease-in-out;} +.ModuleSlideV2Giant.layout-109 .slick-slide.nextScalePageInversion .slick-slide-box {-moz-animation: nextScalePageBoxInversion 1s ease-in-out; -webkit-animation: nextScalePageBoxInversion 1s ease-in-out; animation: nextScalePageBoxInversion 1s ease-in-out;} +.ModuleSlideV2Giant.layout-109 .slick-slide.nextScalePageInversion .slick-box{-moz-animation: nextScalePageInversion 1s ease-in-out; -webkit-animation: nextScalePageInversion 1s ease-in-out; animation: nextScalePageInversion 1s ease-in-out;} +.ModuleSlideV2Giant.layout-109 .slide-box img {position: relative; left: 50%; transform: translate(-50%); width: 100%;} +.ModuleSlideV2Giant.layout-101 .slide-box .swiperImg {width:100%;} +.ModuleSlideV2Giant.layout-109 .slick-dots {bottom: 50px; font-size: 0;} +.ModuleSlideV2Giant.layout-109 .slick-dots li {position: relative; font-size: 0; width: 60px; height: 2px; margin-left: unset; margin-right: unset; background-color: rgba(19, 157, 143, .4); cursor: unset;} +.ModuleSlideV2Giant.layout-109 .slick-dots li button {width: 100%; height: 100%; border: unset; padding: 0; cursor: unset;} +.ModuleSlideV2Giant.layout-109 .slick-dots li button:before {content: unset;} +.ModuleSlideV2Giant.layout-109 .slick-dots li.slick-active {background-color: rgba(19, 157, 143, 1);} +.ModuleSlideV2Giant.layout-109 .slick-prev, .ModuleSlideV2Giant.layout-109 .slick-next {display: inline-block !important; position: relative; bottom: -12px; font-size: 16px; color: #fff; z-index: 1; width: auto; height: auto; line-height: 1;} +.ModuleSlideV2Giant.layout-109 .slick-prev {left: -20px;} +.ModuleSlideV2Giant.layout-109 .slick-next {right: -20px;} +.ModuleSlideV2Giant.layout-109 .slick-prev:before, +.ModuleSlideV2Giant.layout-109 .slick-next:before {content: unset;} +.ModuleSlideV2Giant.layout-109 .tab-pages {width: auto; height: auto; position: absolute; top: 50%; right: 40px; transform: translateY(-50%); font-size: 16px;} +.ModuleSlideV2Giant.layout-109 .tab-pages p {line-height: 1;} +.ModuleSlideV2Giant.layout-109 .tab-pages p.current-page::after {content: ''; width: 100%; height: 2px; background: #000; display: block; margin-top: 15px; margin-bottom: 15px;} +.ModuleSlideV2Giant.layout-109 .slide-box video{ + width: 100%; + height: 100%; + min-height: 32px; +} +@media (min-width: 1000px) and (max-width: 1920px) { + .ModuleSlideV2Giant.layout-109 .slick-dots {bottom: 6%;} + .ModuleSlideV2Giant.layout-109 .tab-pages {right: 2.5%;} +} + +@media (min-width: 600px) and (max-width: 999px) { + .ModuleSlideV2Giant.layout-109 .slick-dots {bottom: 9%; font-size: 14px;} + .ModuleSlideV2Giant.layout-109 .tab-pages {right:3%;font-size:14px;} +} + +@media (min-width: 599px) and (max-width: 766px) { + .ModuleSlideV2Giant.layout-109 .slick-dots {bottom: 10% !important; font-size: 12px;} + .ModuleSlideV2Giant.layout-109 .tab-pages {right:5%;height:1px;} + .ModuleSlideV2Giant.layout-109 .tab-pages::after {height:1px;} + .ModuleSlideV2Giant.layout-109 .slick-active{width:45px;/*height:1px;*/} + +} + +@-moz-keyframes prevScalePage { + 0% {transform: scale(1, 1)} + 10% {transform: scale(1.02, 1.02)} + 20% {transform: scale(1.04, 1.04)} + 30% {transform: scale(1.06, 1.06)} + 40% {transform: scale(1.08, 1.08)} + 50%, 60%, 70%, 80%, 90%, 100% {transform: scale(1.1, 1.1)} +} +@-webkit-keyframes prevScalePage { + 0% {transform: scale(1, 1)} + 10% {transform: scale(1.02, 1.02)} + 20% {transform: scale(1.04, 1.04)} + 30% {transform: scale(1.06, 1.06)} + 40% {transform: scale(1.08, 1.08)} + 50%, 60%, 70%, 80%, 90%, 100% {transform: scale(1.1, 1.1)} +} +@keyframes prevScalePage { + 0% {transform: scale(1, 1)} + 10% {transform: scale(1.02, 1.02)} + 20% {transform: scale(1.04, 1.04)} + 30% {transform: scale(1.06, 1.06)} + 40% {transform: scale(1.08, 1.08)} + 50%, 60%, 70%, 80%, 90%, 100% {transform: scale(1.1, 1.1)} +} + +@-moz-keyframes nextScalePageUBox { + 0% {transform: scale(1, 1)} + 10%, 20% {transform: scale(1.02, 1.02)} + 30%, 40% {transform: scale(1.06, 1.06)} + 50% {transform: scale(1.1, 1.1)} + 60% {transform: scale(1.08, 1.08)} + 70% {transform: scale(1.06, 1.06)} + 80% {transform: scale(1.04, 1.04)} + 90% {transform: scale(1.02, 1.02)} + 100% {transform: scale(1, 1)} +} +@-webkit-keyframes nextScalePageUBox { + 0% {transform: scale(1, 1)} + 10%, 20% {transform: scale(1.02, 1.02)} + 30%, 40% {transform: scale(1.06, 1.06)} + 50% {transform: scale(1.1, 1.1)} + 60% {transform: scale(1.08, 1.08)} + 70% {transform: scale(1.06, 1.06)} + 80% {transform: scale(1.04, 1.04)} + 90% {transform: scale(1.02, 1.02)} + 100% {transform: scale(1, 1)} +} +@keyframes nextScalePageUBox { + 0% {transform: scale(1, 1)} + 10%, 20% {transform: scale(1.02, 1.02)} + 30%, 40% {transform: scale(1.06, 1.06)} + 50% {transform: scale(1.1, 1.1)} + 60% {transform: scale(1.08, 1.08)} + 70% {transform: scale(1.06, 1.06)} + 80% {transform: scale(1.04, 1.04)} + 90% {transform: scale(1.02, 1.02)} + 100% {transform: scale(1, 1)} +} + +@-moz-keyframes nextScalePageBox { + 0% {transform: translate(100%, 0%);} + 100% {transform: translate(0%, 0%);} +} +@-webkit-keyframes nextScalePageBox { + 0% {transform: translate(100%, 0%);} + 100% {transform: translate(0%, 0%);} +} +@keyframes nextScalePageBox { + 0% {transform: translate(100%, 0%);} + 100% {transform: translate(0%, 0%);} +} + +@-moz-keyframes nextScalePage { + 0% {transform: translate(-100%, 0%);} + 100% {transform: translate(0%, 0%);} +} +@-webkit-keyframes nextScalePage { + 0% {transform: translate(-100%, 0%);} + 100% {transform: translate(0%, 0%);} +} +@keyframes nextScalePage { + 0% {transform: translate(-100%, 0%);} + 100% {transform: translate(0%, 0%);} +} + +@-moz-keyframes nextScalePageBoxInversion { + 0% {transform: translate(-100%, 0%);} + 100% {transform: translate(0%, 0%);} +} +@-webkit-keyframes nextScalePageBoxInversion { + 0% {transform: translate(-100%, 0%);} + 100% {transform: translate(0%, 0%);} +} +@keyframes nextScalePageBoxInversion { + 0% {transform: translate(-100%, 0%);} + 100% {transform: translate(0%, 0%);} +} + +@-moz-keyframes nextScalePageInversion { + 0% {transform: translate(100%, 0%);} + 100% {transform: translate(0%, 0%);} +} +@-webkit-keyframes nextScalePageInversion { + 0% {transform: translate(100%, 0%);} + 100% {transform: translate(0%, 0%);} +} +@keyframes nextScalePageInversion { + 0% {transform: translate(100%, 0%);} + 100% {transform: translate(0%, 0%);} +} + +@media only screen and (max-width: 767px) { + .ModuleSlideV2Giant.layout-109 .slick-dots {bottom: 20px;} + .ModuleSlideV2Giant.layout-109 .slick-dots li {width: 30px;} + .ModuleSlideV2Giant.layout-109 .slick-prev, .ModuleSlideV2Giant.layout-109 .slick-next {font-size: 12px;} + .ModuleSlideV2Giant.layout-109 .slick-prev {left: -10px;} + .ModuleSlideV2Giant.layout-109 .slick-next {right: -10px;} + .ModuleSlideV2Giant.layout-109 .tab-pages {display: none;} +}.module_386714477 .ModuleHead .HeadCenter{float:none;} +#module_386714477 { + padding:0px; +} +#module_386714477 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_386714477 .ModuleHead386714477 { + display:none; +} +#module_386714477 .BodyCenter.BodyCenter386714477 { + background:none;background-color:rgba(0,0,0,0); +} +#module_386714477 >.module_386714477 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_386714477 >.module_386714477{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_386714477 .BodyCenter.BodyCenter386714477 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_386714477 .BodyCenter.BodyCenter386714477 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_386714477 >.module_386714477 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_386714477 >.module_386714477 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_386714477 >.module_386714477 {box-shadow: 0px 0px 0px 0px #ccc} +#module_386714477:hover { + border:none; +} +#module_386714477:hover >.module_386714477 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_386714477 .tab-pages p{color:rgba(255, 255, 255, .5);} +#module_386714477 .tab-pages p.current-page::after{background-color:rgba(255, 255, 255, 1);} +#module_386714477 .slick-dots li{background-color:rgba(209, 209, 209, .3);} +#module_386714477 .slick-prev, #module_386714477 .slick-next{color:rgba(255, 255, 255, 1);} +#module_386714477 .tab-pages p.current-page{color:rgba(255, 255, 255, 1);} +#module_386714477 .slick-dots li.slick-active{background-color:rgba(255, 255, 255, 1);} +#module_386714477 .slick-prev:hover, #module_386714477 .slick-next:hover{color:rgba(255, 255, 255, 1);} +#module_386714477 .SubContainer {} +.module_413896456 .ModuleHead .HeadCenter{float:none;} +#module_413896456 { + padding:0px; +} +#module_413896456 { + position:static; + z-index:0; + top:0px; + width:100%; + height: auto; +} +#module_413896456 .ModuleHead413896456 { + display:none; +} +#module_413896456 .BodyCenter.BodyCenter413896456 { + background:none;background-color:rgba(0,0,0,0); +} +#module_413896456 >.module_413896456 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413896456 >.module_413896456{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_413896456 .BodyCenter.BodyCenter413896456 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413896456 .BodyCenter.BodyCenter413896456 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_413896456 >.module_413896456 { + margin-top:-3.6611%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413896456 >.module_413896456 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_413896456 >.module_413896456 {box-shadow: 0px 0px 0px 0px #ccc} +#module_413896456:hover { + border:none; +} +#module_413896456:hover >.module_413896456 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_413896456 .ModuleSubContainer{background-color:transparent;} +#module_413896456 .ModuleSubContainer{background-image:none;} +#module_413896456 .ModuleSubContainer{background-repeat:no-repeat;} +#module_413896456 .ModuleSubContainer{background-position:0% 0%;} +#module_413896456 .ModuleSubContainer{background-attachment:scroll;} +#module_413896456 .ModuleSubContainer{} +#module_413896456 {!bgVideo!}{bgVideoUrl:} +#module_413896456 .gridBgVideo .bgVideoMask{opacity:0.2} +#module_413896456 .ModuleSubContainer{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0); transition: box-shadow 0.5s ease;} +#module_413896456 .ModuleSubContainer:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +.ModuleGridContainer.ModuleGridContainer413896456 {} +/*ͼÎÄÄ£¿é layout 105*/ +.ModuleImageTextGiant.layout-105 .row{ margin-left:0; margin-right: 0;} +.ModuleImageTextGiant.layout-105 .imageTextGiant-Container{max-height: 100%; max-width: 100%;/*padding: 10px;*/} +.ModuleImageTextGiant.layout-105 .imageTextGiant-Container .ModuleImageTextContent{padding:0; padding-left: 15px; margin: 0px } +.ModuleImageTextGiant.layout-105 .imageTextGiant-Container .GraphicUpper{height:auto;padding-left: 0;padding-right: 0} +.ModuleImageTextGiant.layout-105 .imageTextGiant-Container .normal_ImgtextBox_content{align-items: center;display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */ display: -moz-box; /* OLD - Firefox 19- (buggy but mostly works) */ display: -ms-flexbox; /* TWEENER - IE 10 */ display: -webkit-flex; /* NEW - Chrome */ display: flex;} +.ModuleImageTextGiant.layout-105 .imageTextGiant-Container .GraphicUpper{text-align: left; overflow: hidden; display: block; text-align:center; position: relative;} +/*.ModuleImageTextGiant.layout-105 .imageTextGiant-Container .GraphicUpper .dummy { padding-top: 100%; }*/ +/* .ModuleImageTextGiant.layout-105 .normal_ImgtextBox_content:first-child{ margin-top: 0 !important; } +.ModuleImageTextGiant.layout-105 .normal_ImgtextBox_content:last-child{ margin-bottom: 0 !important; } */ + + +@media only screen and (max-width: 767px) { + .ModuleImageTextGiant.layout-105 .imageTextGiant-Container .row .col-xs-8{padding: 0 3px;width: 91.333333%;} +} +/*@media only screen and (min-width: 992px) and (max-width: 1199px) {*/ +/*.ModuleImageTextGiant.layout-105 .imageTextGiant-Container{min-width: 100%;}*/ +/*.ModuleImageTextGiant.layout-105 .col-md-2{width: 14.666667%;}*/ +/*}*/ +/*@media only screen and (min-width: 769px) and (max-width: 991px) {*/ +/*.ModuleImageTextGiant.layout-105 .imageTextGiant-Container .row{width:auto;}*/ +/*}*/ +@media only screen and (min-width: 768px) { + .ModuleImageTextGiant.layout-105 .col-lg-2 { + width: 10%; + } + .ModuleImageTextGiant.layout-105 .imageTextGiant-Container .normal_ImgtextBox_content .GraphicUpper .TextImage{width: 100%} +}.module_413897057 .ModuleHead .HeadCenter{float:none;} +#module_413897057 { + padding:0px; +} +#module_413897057 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_413897057 .ModuleHead413897057 { + display:none; +} +#module_413897057 .BodyCenter.BodyCenter413897057 { + background-color:transparent; + background-image:url(/comdata/92915/202112/2021122317161753006e.png); + background-size:auto; + background-repeat:no-repeat; + background-position:50% 50%; + background-Attachment:scroll; +} +#module_413897057 >.module_413897057 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413897057 >.module_413897057{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_413897057 .BodyCenter.BodyCenter413897057 { + padding-top:7.5000%; + padding-left:22.5000%; + padding-right:0.0000%; + padding-bottom:5.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413897057 .BodyCenter.BodyCenter413897057 { + padding-top:8.6455%; + padding-left:20.1729%; + padding-right:0.0000%; + padding-bottom:5.7637%; + } +} +@media screen and (min-width: 768px){ + #module_413897057 >.module_413897057 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413897057 >.module_413897057 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_413897057 >.module_413897057 {box-shadow: 0px 0px 0px 0px rgba(0,0,0,0)} +#module_413897057:hover { + border:none; +} +#module_413897057:hover >.module_413897057 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_413897057 .GraphicUpper .TextImage{border-top-left-radius:0px;} +#module_413897057 .GraphicUpper .TextImage{border-top-right-radius:0px;} +#module_413897057 .GraphicUpper .TextImage{border-bottom-left-radius:0px;} +#module_413897057 .GraphicUpper .TextImage{border-bottom-right-radius:0px;} +#module_413897057 .GraphicUpper{padding-top:0px;} +#module_413897057 .GraphicUpper{padding-bottom:0px;} +#module_413897057 .GraphicUpper{padding-left:0px;} +#module_413897057 .GraphicUpper {padding-right:0px;} +#module_413897057 .GraphicUpper{width:20%;} #module_413897057 .ModuleImageTextContent{width: calc(100% - 20%);} +#module_413897057 .MobileGraphicUpper{width:20%;} #module_413897057 .ModuleMobileImageTextContent{width: calc(100% - 20%);} +#module_413897057 .ModuleImageTextGiantContent{padding-top:0px;} +#module_413897057 .ModuleImageTextGiantContent{padding-bottom:0px;} +#module_413897057 .ModuleImageTextGiantContent{padding-left:15px;} +#module_413897057 .ModuleImageTextGiantContent{padding-right:0px;} +#module_413897057 .normal_ImgtextBox_content{padding-top:0px;} +#module_413897057 .normal_ImgtextBox_content{padding-bottom:30px;} +#module_413897057 .normal_ImgtextBox_content{padding-left:0px;} +#module_413897057 .normal_ImgtextBox_content{padding-right:0px;} +#module_413897057 .normal_ImgtextBox_content{margin-top:0px;margin-bottom:0px;} +#module_413897057 .normal_ImgtextBox_content{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +#module_413897057 .normal_ImgtextBox_content{background-color:transparent;} +#module_413897057 .normal_ImgtextBox_content{background-image:none;} +#module_413897057 .normal_ImgtextBox_content{background-repeat:no-repeat;} +#module_413897057 .normal_ImgtextBox_content{background-position:0% 0%;} +#module_413897057 .normal_ImgtextBox_content{background-attachment:none;} +#module_413897057 .normal_ImgtextBox_content{} +#module_413897057 .normal_ImgtextBox_content{border-top-left-radius:0px;} +#module_413897057 .normal_ImgtextBox_content{border-top-right-radius:0px;} +#module_413897057 .normal_ImgtextBox_content{border-bottom-left-radius:0px;} +#module_413897057 .normal_ImgtextBox_content{border-bottom-right-radius:0px;} +#module_413897057 .normal_ImgtextBox_content{border-top-color:rgba(0,0,0,0);} +#module_413897057 .normal_ImgtextBox_content{border-top-style:none;} +#module_413897057 .normal_ImgtextBox_content{border-top-width:0px;} +#module_413897057 .normal_ImgtextBox_content{border-right-color:rgba(0,0,0,0);} +#module_413897057 .normal_ImgtextBox_content{border-right-style:none;} +#module_413897057 .normal_ImgtextBox_content{border-right-width:0px;} +#module_413897057 .normal_ImgtextBox_content{border-bottom-color:rgba(0,0,0,0);} +#module_413897057 .normal_ImgtextBox_content{border-bottom-style:none;} +#module_413897057 .normal_ImgtextBox_content{border-bottom-width:0px;} +#module_413897057 .normal_ImgtextBox_content{border-left-color:rgba(0,0,0,0);} +#module_413897057 .normal_ImgtextBox_content{border-left-style:none;} +#module_413897057 .normal_ImgtextBox_content{border-left-width:0px;} +#module_413897057 .showHandle .btn{font-size:14px;} +#module_413897057 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_413897057 .showHandle .btn{color:#333;} +#module_413897057 .showHandle .btn{font-weight:400;} +#module_413897057 .showHandle .btn{text-decoration:none;} +#module_413897057 .showHandle .btn{font-style:normal;} +#module_413897057 .showHandle div{border-top-color:#ddd !important;} +#module_413897057 .showHandle div{border-top-style:solid !important;} +#module_413897057 .showHandle div{border-top-width:1px !important;} +#module_413897057 .showHandle{background-color:transparent;} +#module_413897057 .showHandle{background-image:none;} +#module_413897057 .showHandle{background-repeat:no-repeat;} +#module_413897057 .showHandle{} +#module_413897057 .showHandle{} +#module_413897057 .showHandle{} +#module_413897057 .normal_ImgtextBox_content:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +#module_413897057 .normal_ImgtextBox_content:hover{border-top-color:rgba(0,0,0,0);} +#module_413897057 .normal_ImgtextBox_content:hover{border-top-style:none;} +#module_413897057 .normal_ImgtextBox_content:hover{border-right-color:rgba(0,0,0,0);} +#module_413897057 .normal_ImgtextBox_content:hover{border-right-style:none;} +#module_413897057 .normal_ImgtextBox_content:hover{border-bottom-color:rgba(0,0,0,0);} +#module_413897057 .normal_ImgtextBox_content:hover{border-bottom-style:none;} +#module_413897057 .normal_ImgtextBox_content:hover{border-left-color:rgba(0,0,0,0);} +#module_413897057 .normal_ImgtextBox_content:hover{border-left-style:none;} +#module_413897057 a{font-size:unset;font-family:unset} +.module_413897130 .ModuleHead .HeadCenter{float:none;} +#module_413897130 { + padding:0px; +} +#module_413897130 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_413897130 .ModuleHead413897130 { + display:none; +} +#module_413897130 .BodyCenter.BodyCenter413897130 { + background-color:transparent; + background-image:url(/comdata/92915/202112/2021122317161753006e.png); + background-size:auto; + background-repeat:no-repeat; + background-position:50% 50%; + background-Attachment:scroll; +} +#module_413897130 >.module_413897130 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413897130 >.module_413897130{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_413897130 .BodyCenter.BodyCenter413897130 { + padding-top:7.5000%; + padding-left:22.5000%; + padding-right:0.0000%; + padding-bottom:5.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413897130 .BodyCenter.BodyCenter413897130 { + padding-top:8.6455%; + padding-left:20.1729%; + padding-right:0.0000%; + padding-bottom:5.7637%; + } +} +@media screen and (min-width: 768px){ + #module_413897130 >.module_413897130 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413897130 >.module_413897130 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_413897130 >.module_413897130 {box-shadow: 0px 0px 0px 0px #ccc} +#module_413897130:hover { + border:none; +} +#module_413897130:hover >.module_413897130 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_413897130 .GraphicUpper .TextImage{border-top-left-radius:0px;} +#module_413897130 .GraphicUpper .TextImage{border-top-right-radius:0px;} +#module_413897130 .GraphicUpper .TextImage{border-bottom-left-radius:0px;} +#module_413897130 .GraphicUpper .TextImage{border-bottom-right-radius:0px;} +#module_413897130 .GraphicUpper{padding-top:0px;} +#module_413897130 .GraphicUpper{padding-bottom:0px;} +#module_413897130 .GraphicUpper{padding-left:0px;} +#module_413897130 .GraphicUpper {padding-right:0px;} +#module_413897130 .GraphicUpper{width:20%;} #module_413897130 .ModuleImageTextContent{width: calc(100% - 20%);} +#module_413897130 .MobileGraphicUpper{width:20%;} #module_413897130 .ModuleMobileImageTextContent{width: calc(100% - 20%);} +#module_413897130 .ModuleImageTextGiantContent{padding-top:0px;} +#module_413897130 .ModuleImageTextGiantContent{padding-bottom:0px;} +#module_413897130 .ModuleImageTextGiantContent{padding-left:15px;} +#module_413897130 .ModuleImageTextGiantContent{padding-right:0px;} +#module_413897130 .normal_ImgtextBox_content{padding-top:0px;} +#module_413897130 .normal_ImgtextBox_content{padding-bottom:30px;} +#module_413897130 .normal_ImgtextBox_content{padding-left:0px;} +#module_413897130 .normal_ImgtextBox_content{padding-right:0px;} +#module_413897130 .normal_ImgtextBox_content{margin-top:0px;margin-bottom:0px;} +#module_413897130 .normal_ImgtextBox_content{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +#module_413897130 .normal_ImgtextBox_content{background-color:transparent;} +#module_413897130 .normal_ImgtextBox_content{background-image:none;} +#module_413897130 .normal_ImgtextBox_content{background-repeat:no-repeat;} +#module_413897130 .normal_ImgtextBox_content{background-position:0% 0%;} +#module_413897130 .normal_ImgtextBox_content{background-attachment:none;} +#module_413897130 .normal_ImgtextBox_content{} +#module_413897130 .normal_ImgtextBox_content{border-top-left-radius:0px;} +#module_413897130 .normal_ImgtextBox_content{border-top-right-radius:0px;} +#module_413897130 .normal_ImgtextBox_content{border-bottom-left-radius:0px;} +#module_413897130 .normal_ImgtextBox_content{border-bottom-right-radius:0px;} +#module_413897130 .normal_ImgtextBox_content{border-top-color:rgba(0,0,0,0);} +#module_413897130 .normal_ImgtextBox_content{border-top-style:none;} +#module_413897130 .normal_ImgtextBox_content{border-top-width:0px;} +#module_413897130 .normal_ImgtextBox_content{border-right-color:rgba(0,0,0,0);} +#module_413897130 .normal_ImgtextBox_content{border-right-style:none;} +#module_413897130 .normal_ImgtextBox_content{border-right-width:0px;} +#module_413897130 .normal_ImgtextBox_content{border-bottom-color:rgba(0,0,0,0);} +#module_413897130 .normal_ImgtextBox_content{border-bottom-style:none;} +#module_413897130 .normal_ImgtextBox_content{border-bottom-width:0px;} +#module_413897130 .normal_ImgtextBox_content{border-left-color:rgba(0,0,0,0);} +#module_413897130 .normal_ImgtextBox_content{border-left-style:none;} +#module_413897130 .normal_ImgtextBox_content{border-left-width:0px;} +#module_413897130 .showHandle .btn{font-size:14px;} +#module_413897130 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_413897130 .showHandle .btn{color:#333;} +#module_413897130 .showHandle .btn{font-weight:400;} +#module_413897130 .showHandle .btn{text-decoration:none;} +#module_413897130 .showHandle .btn{font-style:normal;} +#module_413897130 .showHandle div{border-top-color:#ddd !important;} +#module_413897130 .showHandle div{border-top-style:solid !important;} +#module_413897130 .showHandle div{border-top-width:1px !important;} +#module_413897130 .showHandle{background-color:transparent;} +#module_413897130 .showHandle{background-image:none;} +#module_413897130 .showHandle{background-repeat:no-repeat;} +#module_413897130 .showHandle{} +#module_413897130 .showHandle{} +#module_413897130 .showHandle{} +#module_413897130 .normal_ImgtextBox_content:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +#module_413897130 .normal_ImgtextBox_content:hover{border-top-color:rgba(0,0,0,0);} +#module_413897130 .normal_ImgtextBox_content:hover{border-top-style:none;} +#module_413897130 .normal_ImgtextBox_content:hover{border-right-color:rgba(0,0,0,0);} +#module_413897130 .normal_ImgtextBox_content:hover{border-right-style:none;} +#module_413897130 .normal_ImgtextBox_content:hover{border-bottom-color:rgba(0,0,0,0);} +#module_413897130 .normal_ImgtextBox_content:hover{border-bottom-style:none;} +#module_413897130 .normal_ImgtextBox_content:hover{border-left-color:rgba(0,0,0,0);} +#module_413897130 .normal_ImgtextBox_content:hover{border-left-style:none;} +#module_413897130 a{font-size:unset;font-family:unset} +.module_413897134 .ModuleHead .HeadCenter{float:none;} +#module_413897134 { + padding:0px; +} +#module_413897134 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_413897134 .ModuleHead413897134 { + display:none; +} +#module_413897134 .BodyCenter.BodyCenter413897134 { + background-color:transparent; + background-image:url(/comdata/92915/202112/2021122317161753006e.png); + background-size:auto; + background-repeat:no-repeat; + background-position:50% 50%; + background-Attachment:scroll; +} +#module_413897134 >.module_413897134 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413897134 >.module_413897134{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_413897134 .BodyCenter.BodyCenter413897134 { + padding-top:7.5000%; + padding-left:20.0000%; + padding-right:20.0000%; + padding-bottom:5.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413897134 .BodyCenter.BodyCenter413897134 { + padding-top:8.6455%; + padding-left:20.1729%; + padding-right:14.4092%; + padding-bottom:5.7637%; + } +} +@media screen and (min-width: 768px){ + #module_413897134 >.module_413897134 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413897134 >.module_413897134 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_413897134 >.module_413897134 {box-shadow: 0px 0px 0px 0px #ccc} +#module_413897134:hover { + border:none; +} +#module_413897134:hover >.module_413897134 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_413897134 .GraphicUpper .TextImage{border-top-left-radius:0px;} +#module_413897134 .GraphicUpper .TextImage{border-top-right-radius:0px;} +#module_413897134 .GraphicUpper .TextImage{border-bottom-left-radius:0px;} +#module_413897134 .GraphicUpper .TextImage{border-bottom-right-radius:0px;} +#module_413897134 .GraphicUpper{padding-top:0px;} +#module_413897134 .GraphicUpper{padding-bottom:0px;} +#module_413897134 .GraphicUpper{padding-left:0px;} +#module_413897134 .GraphicUpper {padding-right:0px;} +#module_413897134 .GraphicUpper{width:20%;} #module_413897134 .ModuleImageTextContent{width: calc(100% - 20%);} +#module_413897134 .MobileGraphicUpper{width:20%;} #module_413897134 .ModuleMobileImageTextContent{width: calc(100% - 20%);} +#module_413897134 .ModuleImageTextGiantContent{padding-top:0px;} +#module_413897134 .ModuleImageTextGiantContent{padding-bottom:0px;} +#module_413897134 .ModuleImageTextGiantContent{padding-left:15px;} +#module_413897134 .ModuleImageTextGiantContent{padding-right:0px;} +#module_413897134 .normal_ImgtextBox_content{padding-top:0px;} +#module_413897134 .normal_ImgtextBox_content{padding-bottom:30px;} +#module_413897134 .normal_ImgtextBox_content{padding-left:0px;} +#module_413897134 .normal_ImgtextBox_content{padding-right:0px;} +#module_413897134 .normal_ImgtextBox_content{margin-top:0px;margin-bottom:0px;} +#module_413897134 .normal_ImgtextBox_content{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +#module_413897134 .normal_ImgtextBox_content{background-color:transparent;} +#module_413897134 .normal_ImgtextBox_content{background-image:none;} +#module_413897134 .normal_ImgtextBox_content{background-repeat:no-repeat;} +#module_413897134 .normal_ImgtextBox_content{background-position:0% 0%;} +#module_413897134 .normal_ImgtextBox_content{background-attachment:none;} +#module_413897134 .normal_ImgtextBox_content{} +#module_413897134 .normal_ImgtextBox_content{border-top-left-radius:0px;} +#module_413897134 .normal_ImgtextBox_content{border-top-right-radius:0px;} +#module_413897134 .normal_ImgtextBox_content{border-bottom-left-radius:0px;} +#module_413897134 .normal_ImgtextBox_content{border-bottom-right-radius:0px;} +#module_413897134 .normal_ImgtextBox_content{border-top-color:rgba(0,0,0,0);} +#module_413897134 .normal_ImgtextBox_content{border-top-style:none;} +#module_413897134 .normal_ImgtextBox_content{border-top-width:0px;} +#module_413897134 .normal_ImgtextBox_content{border-right-color:rgba(0,0,0,0);} +#module_413897134 .normal_ImgtextBox_content{border-right-style:none;} +#module_413897134 .normal_ImgtextBox_content{border-right-width:0px;} +#module_413897134 .normal_ImgtextBox_content{border-bottom-color:rgba(0,0,0,0);} +#module_413897134 .normal_ImgtextBox_content{border-bottom-style:none;} +#module_413897134 .normal_ImgtextBox_content{border-bottom-width:0px;} +#module_413897134 .normal_ImgtextBox_content{border-left-color:rgba(0,0,0,0);} +#module_413897134 .normal_ImgtextBox_content{border-left-style:none;} +#module_413897134 .normal_ImgtextBox_content{border-left-width:0px;} +#module_413897134 .showHandle .btn{font-size:14px;} +#module_413897134 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_413897134 .showHandle .btn{color:#333;} +#module_413897134 .showHandle .btn{font-weight:400;} +#module_413897134 .showHandle .btn{text-decoration:none;} +#module_413897134 .showHandle .btn{font-style:normal;} +#module_413897134 .showHandle div{border-top-color:#ddd !important;} +#module_413897134 .showHandle div{border-top-style:solid !important;} +#module_413897134 .showHandle div{border-top-width:1px !important;} +#module_413897134 .showHandle{background-color:transparent;} +#module_413897134 .showHandle{background-image:none;} +#module_413897134 .showHandle{background-repeat:no-repeat;} +#module_413897134 .showHandle{} +#module_413897134 .showHandle{} +#module_413897134 .showHandle{} +#module_413897134 .normal_ImgtextBox_content:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +#module_413897134 .normal_ImgtextBox_content:hover{border-top-color:rgba(0,0,0,0);} +#module_413897134 .normal_ImgtextBox_content:hover{border-top-style:none;} +#module_413897134 .normal_ImgtextBox_content:hover{border-right-color:rgba(0,0,0,0);} +#module_413897134 .normal_ImgtextBox_content:hover{border-right-style:none;} +#module_413897134 .normal_ImgtextBox_content:hover{border-bottom-color:rgba(0,0,0,0);} +#module_413897134 .normal_ImgtextBox_content:hover{border-bottom-style:none;} +#module_413897134 .normal_ImgtextBox_content:hover{border-left-color:rgba(0,0,0,0);} +#module_413897134 .normal_ImgtextBox_content:hover{border-left-style:none;} +#module_413897134 a{font-size:unset;font-family:unset} +.module_408022627 .ModuleHead .HeadCenter{float:none;} +#module_408022627 { + padding:0px; +} +#module_408022627 { + position:static; + z-index:0; + top:0px; + width:100%; + height: auto; +} +#module_408022627 .ModuleHead408022627 { + display:none; +} +#module_408022627 .BodyCenter.BodyCenter408022627 { + background:none;background-color:rgba(0,0,0,0); +} +#module_408022627 >.module_408022627 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_408022627 >.module_408022627{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_408022627 .BodyCenter.BodyCenter408022627 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_408022627 .BodyCenter.BodyCenter408022627 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_408022627 >.module_408022627 { + margin-top:1.0460%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_408022627 >.module_408022627 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_408022627 >.module_408022627 {box-shadow: 0px 0px 0px 0px #ccc} +#module_408022627:hover { + border:none; +} +#module_408022627:hover >.module_408022627 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_408022627 .ModuleSubContainer{background-color:transparent;} +#module_408022627 .ModuleSubContainer{background-image:none;} +#module_408022627 .ModuleSubContainer{background-repeat:no-repeat;} +#module_408022627 .ModuleSubContainer{background-position:0% 0%;} +#module_408022627 .ModuleSubContainer{background-attachment:scroll;} +#module_408022627 .ModuleSubContainer{} +#module_408022627 {!bgVideo!}{bgVideoUrl:} +#module_408022627 .gridBgVideo .bgVideoMask{opacity:0.2} +#module_408022627 .ModuleSubContainer{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0); transition: box-shadow 0.5s ease;} +#module_408022627 .ModuleSubContainer:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +.ModuleGridContainer.ModuleGridContainer408022627 {} +/*´¿Îı¾Ä£¿é layout 101*/ +.ModulePlainTextGiant.layout-101 {font-size: 14px;} +.ModulePlainTextGiant.layout-101 .plainTextGiant-Container{height: auto; word-wrap: break-word;max-height: 100%;padding:10px;max-width: 100%; overflow: hidden;}.module_408022631 .ModuleHead .HeadCenter{float:none;} +#module_408022631 { + padding:0px; +} +#module_408022631 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_408022631 .ModuleHead408022631 { + display:none; +} +#module_408022631 .BodyCenter.BodyCenter408022631 { + background:none;background-color:rgba(0,0,0,0); +} +#module_408022631 >.module_408022631 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_408022631 >.module_408022631{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_408022631 .BodyCenter.BodyCenter408022631 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_408022631 .BodyCenter.BodyCenter408022631 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_408022631 >.module_408022631 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_408022631 >.module_408022631 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_408022631 >.module_408022631 {box-shadow: 0px 0px 0px 0px #ccc} +#module_408022631:hover { + border:none; +} +#module_408022631:hover >.module_408022631 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_408022631 .ModulePlainTextGiantContent{margin-top:0px;} +#module_408022631 .ModulePlainTextGiantContent{margin-bottom:0px;} +#module_408022631 .ModulePlainTextGiantContent{margin-left:0px;} +#module_408022631 .ModulePlainTextGiantContent{margin-right:10px;} +#module_408022631 .plainTextGiant-Container{padding-top:10px;} +#module_408022631 .plainTextGiant-Container{padding-bottom:10px;} +#module_408022631 .plainTextGiant-Container{padding-left:10px;} +#module_408022631 .plainTextGiant-Container{padding-right:10px;} +#module_408022631 a{font-size:unset;font-family:unset} +.module_413897524 .ModuleHead .HeadCenter{float:none;} +#module_413897524 { + padding:0px; +} +#module_413897524 { + position:static; + z-index:0; + top:0px; + width:100%; + height: auto; +} +#module_413897524 .ModuleHead413897524 { + display:none; +} +#module_413897524 .BodyCenter.BodyCenter413897524 { + background:none;background-color:rgba(0,0,0,0); +} +#module_413897524 >.module_413897524 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413897524 >.module_413897524{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_413897524 .BodyCenter.BodyCenter413897524 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413897524 .BodyCenter.BodyCenter413897524 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_413897524 >.module_413897524 { + margin-top:1.5690%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:1.0460%; + } +} +@media screen and (max-width: 767px){ + #module_413897524 >.module_413897524 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_413897524 >.module_413897524 {box-shadow: 0px 0px 0px 0px #ccc;} +#module_413897524:hover { + border:none; +} +#module_413897524:hover >.module_413897524 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_413897524 .ModuleSubContainer{background-color:transparent;} +#module_413897524 .ModuleSubContainer{background-image:none;} +#module_413897524 .ModuleSubContainer{background-repeat:no-repeat;} +#module_413897524 .ModuleSubContainer{background-position:0% 0%;} +#module_413897524 .ModuleSubContainer{background-attachment:scroll;} +#module_413897524 .ModuleSubContainer{} +#module_413897524 {!bgVideo!}{bgVideoUrl:} +#module_413897524 .gridBgVideo .bgVideoMask{opacity:0.2} +#module_413897524 .ModuleSubContainer{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0); transition: box-shadow 0.5s ease;} +#module_413897524 .ModuleSubContainer:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +.ModuleGridContainer.ModuleGridContainer413897524 {} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxContainer{margin-right: auto; margin-left: auto; padding-right: 0; padding-left: 0;} +.ModuleHoverBoxGiant.layout-101 .ModuleSubContainer{display: flex !important; position: relative; width:100%; overflow: hidden; background: none !important;} +.ModuleHoverBoxGiant.layout-101 .row{margin-right: 0px; margin-left: 0px;} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxContainer{width: 100%; height: 100%} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_1{position: relative; overflow: hidden;} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2{overflow: hidden; position: absolute; display: none; background: #fff;height: 100%; opacity: 0; top: 0; visibility: visible;} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2.switchFadeInUp{ -webkit-animation: switchFadeInUp-out .6s ease forwards; animation: switchFadeInUp-out .6s ease forwards; } +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2.switchFadeIn{ -webkit-animation: switchFadeIn-out .6s ease forwards; animation: switchFadeIn-out .6s ease forwards; } +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2.switchFadeInDown{ -webkit-animation: switchFadeInDown-out .6s ease forwards; animation: switchFadeInDown-out .6s ease forwards; } +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2.switchSlideInDown{ -webkit-animation: switchSlideInDown-out .6s ease forwards; animation: switchSlideInDown-out .6s ease forwards; } +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2.switchSlideInUp{ -webkit-animation: switchSlideInUp-out .6s ease forwards; animation: switchSlideInUp-out .6s ease forwards; } +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2.switchBounceIn{ -webkit-animation: switchBounceIn-out .6s ease forwards; animation: switchBounceIn-out .6s ease forwards; } +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2.switchBounceInLeft{ -webkit-animation: switchBounceInLeft-out .6s ease forwards; animation: switchBounceInLeft-out .6s ease forwards; } +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2.switchBounceInRight{ -webkit-animation: switchBounceInRight-out .6s ease forwards; animation: switchBounceInRight-out .6s ease forwards; } +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2.switchPulse{ -webkit-animation: switchPulse-out .6s ease forwards; animation: switchPulse-out .6s ease forwards; } +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2.switchZoomIn{ -webkit-animation: switchZoomIn-out .6s ease forwards; animation: switchZoomIn-out .6s ease forwards; } +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2.switchFlipInY{ -webkit-animation: switchFlipInY-out .6s ease forwards; animation: switchFlipInY-out .6s ease forwards; } +@media only screen and (min-width: 769px) { + /* µ¯ÏÖ */ + .ModuleHoverBoxGiant.layout-101 .ModuleSubContainerHover:hover > .switchFadeIn{-webkit-animation: fadeIn .6s ease forwards; animation: fadeIn .6s ease forwards;} + /* ´ÓÉϵ­Èë */ + .ModuleHoverBoxGiant.layout-101 .ModuleSubContainerHover:hover > .switchFadeInDown{-webkit-animation: fadeInDown .6s ease forwards; animation: fadeInDown .6s ease forwards;} + /* ´Óϵ­Èë */ + .ModuleHoverBoxGiant.layout-101 .ModuleSubContainerHover:hover > .switchFadeInUp{-webkit-animation: fadeInUp .6s ease forwards; animation: fadeInUp .6s ease forwards;} + /* ´ÓÉÏ»¬Èë */ + .ModuleHoverBoxGiant.layout-101 .ModuleSubContainerHover:hover > .switchSlideInDown{-webkit-animation: slideInDown .6s ease forwards; animation: slideInDown .6s ease forwards;} + /* ´ÓÏ»¬Èë */ + .ModuleHoverBoxGiant.layout-101 .ModuleSubContainerHover:hover > .switchSlideInUp{-webkit-animation: slideInUp .6s ease forwards; animation: slideInUp .6s ease forwards;} + /* ´ÓÀﵯÈë */ + .ModuleHoverBoxGiant.layout-101 .ModuleSubContainerHover:hover > .switchBounceIn{-webkit-animation: bounceIn .6s ease forwards; animation: bounceIn .6s ease forwards;} + /* ´Ó×óµ¯Èë */ + .ModuleHoverBoxGiant.layout-101 .ModuleSubContainerHover:hover > .switchBounceInLeft{-webkit-animation: bounceInLeft .6s ease forwards; animation: bounceInLeft .6s ease forwards;} + /* ´ÓÓÒµ¯Èë */ + .ModuleHoverBoxGiant.layout-101 .ModuleSubContainerHover:hover > .switchBounceInRight{-webkit-animation: bounceInRight .6s ease forwards; animation: bounceInRight .6s ease forwards;} + /* Ìø¶¯ */ + .ModuleHoverBoxGiant.layout-101 .ModuleSubContainerHover:hover > .switchPulse{-webkit-animation: pulse .6s ease forwards; animation: pulse .6s ease forwards;} + /* ·Å´ó */ + .ModuleHoverBoxGiant.layout-101 .ModuleSubContainerHover:hover > .switchZoomIn{-webkit-animation: zoomIn .6s ease forwards; animation: zoomIn .6s ease forwards;} + /* YÖᷭת */ + .ModuleHoverBoxGiant.layout-101 .ModuleSubContainerHover:hover > .switchFlipInY{-webkit-animation: flipInY .6s ease forwards; animation: flipInY .6s ease forwards;} +} + +@media only screen and (max-width: 768px) { + .ModuleHoverBoxGiant.layout-101 .ModuleShowHover .ModuleHoverBoxItem_2{display: block !important; height: 100% !important; opacity: 1 !important; top: 0 !important;} + .ModuleHoverBoxGiant.layout-101 .ModuleShowNormal .ModuleHoverBoxItem_2{display: none !important;} +} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2.switchAnimateNone{height: 100%;opacity: 1;top: 0;display: inline-block;visibility: visible;} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2 .wow{visibility: visible !important;} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2 .fadeIn{animation-name:fadeIn !important;} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2 .fadeInLeft{animation-name:fadeInLeft !important;} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2 .fadeInRight{animation-name:fadeInRight !important;} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2 .fadeInUp{animation-name:fadeInUp !important;} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2 .fadeInDown{animation-name:fadeInDown !important;} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2 .slideInUp{animation-name:slideInUp !important;} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2 .slideInDown{animation-name:slideInDown !important;} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2 .slideInLeft{animation-name:slideInLeft !important;} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2 .slideInRight{animation-name:slideInRight !important;} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2 .zoomIn{animation-name:zoomIn !important;} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2 .flipInX{animation-name:flipInX !important;} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2 .flipInY{animation-name:flipInY !important;} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2 .bounce{animation-name:bounce !important;} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2 .flash{animation-name:flash !important;} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2 .pulse{animation-name:pulse !important;} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2 .rotateInDownLeft{animation-name:rotateInDownLeft !important;} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2 .rotateInDownRight{animation-name:rotateInDownRight !important;} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2 .bounceIn{animation-name:bounceIn !important;} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2 .bounceInLeft{animation-name:bounceInLeft !important;} +.ModuleHoverBoxGiant.layout-101 .ModuleHoverBoxItem_2 .bounceInRight{animation-name:bounceInRight !important;} +/*start Í˳ö¶¯»­*/ +@keyframes switchBounceInRight-out { + 0%, 90% , 75%, 60% ,100% { + -webkit-transition-timing-function: cubic-bezier(0.215,.61,.355,1); + transition-timing-function: cubic-bezier(0.215,.61,.355,1); + } + 0% { + -webkit-transform: none; + -ms-transform: none; + transform: none; + } + 60% { + -webkit-transform: translate3d(25px,0,0); + -ms-transform: translate3d(25px,0,0); + transform: translate3d(25px,0,0); + } + 75% { + -webkit-transform: translate3d(-10px,0,0); + -ms-transform: translate3d(-10px,0,0); + transform: translate3d(-10px,0,0); + } + 90% { + -webkit-transform: translate3d(1000px,0,0); + -ms-transform: translate3d(1000px,0,0); + transform: translate3d(1000px,0,0); + } + 100% { + -webkit-transform: translate3d(3000px,0,0); + -ms-transform: translate3d(3000px,0,0); + transform: translate3d(3000px,0,0); + } + +} +@keyframes switchBounceInLeft-out { + 0%, 90% , 75%, 60% ,100% { + -webkit-transition-timing-function:cubic-bezier(0.215,.61,.355,1); + transition-timing-function:cubic-bezier(0.215,.61,.355,1); + } + 0% { + -webkit-transform: none; + -ms-transform: none; + transform: none; + } + 60% { + -webkit-transform: translate3d(-25px, 0, 0); + -ms-transform: translate3d(-25px, 0, 0); + transform: translate3d(-25px, 0, 0) + } + 75% { + -webkit-transform: translate3d(10px, 0, 0); + -ms-transform: translate3d(10px, 0, 0); + transform: translate3d(10px, 0, 0) + } + 90% { + -webkit-transform: translate3d(-1000px, 0, 0); + -ms-transform: translate3d(-1000px, 0, 0); + transform: translate3d(-1000px, 0, 0); + } + 100% { + -webkit-transform: translate3d(-3000px, 0, 0); + -ms-transform: translate3d(-3000px, 0, 0); + transform: translate3d(-3000px, 0, 0); + } +} +@keyframes switchBounceIn-out { + 0%, 100%, 20%, 40%, 60%, 80% { + -webkit-transition-timing-function: cubic-bezier(0.215,.61,.355,1); + transition-timing-function: cubic-bezier(0.215,.61,.355,1); + } + 0% { + opacity: 1; + -webkit-transform: scale3d(1,1,1); + -ms-transform: scale3d(1,1,1); + transform: scale3d(1,1,1); + } + 20% { + -webkit-transform: scale3d(1.1,1.1,1.1); + -ms-transform: scale3d(1.1,1.1,1.1); + transform: scale3d(1.1,1.1,1.1); + } + 40% { + -webkit-transform: scale3d(.9,.9,.9); + -ms-transform: scale3d(.9,.9,.9); + transform: scale3d(.9,.9,.9); + } + 60% { + opacity: 1; + -webkit-transform: scale3d(1.03,1.03,1.03); + -ms-transform: scale3d(1.03,1.03,1.03); + transform: scale3d(1.03,1.03,1.03); + } + 80% { + -webkit-transform: scale3d(.97,.97,.97); + -ms-transform: scale3d(.97,.97,.97); + transform: scale3d(.97,.97,.97); + } + 100% { + opacity: 0; + -webkit-transform: scale3d(.3,.3,.3); + -ms-transform: scale3d(.3,.3,.3); + transform: scale3d(.3,.3,.3); + } + + +} +@keyframes switchPulse-out { + 0% { + -webkit-transform: scale3d(1,1,1); + -ms-transform: scale3d(1,1,1); + transform: scale3d(1,1,1); + opacity: 1; + } + 50% { + -webkit-transform: scale3d(1.05,1.05,1.05); + -ms-transform: scale3d(1.05,1.05,1.05); + transform: scale3d(1.05,1.05,1.05); + } + 100% { + -webkit-transform: scale3d(1,1,1); + -ms-transform: scale3d(1,1,1); + transform: scale3d(1,1,1); + opacity: 0; + } +} +@keyframes switchFlipInY-out { + 0% { + -webkit-transform: perspective(400px); + -ms-transform: perspective(400px); + transform: perspective(400px); + } + 40% { + -webkit-transform: perspective(400px) rotate3d(0,1,0,-20deg); + -ms-transform: perspective(400px) rotate3d(0,1,0,-20deg); + transform: perspective(400px) rotate3d(0,1,0,-20deg); + -webkit-transition-timing-function: ease-in; + transition-timing-function: ease-in; + } + 60% { + -webkit-transform: perspective(400px) rotate3d(0,1,0,10deg); + -ms-transform: perspective(400px) rotate3d(0,1,0,10deg); + transform: perspective(400px) rotate3d(0,1,0,10deg); + opacity: 1; + } + 80% { + -webkit-transform: perspective(400px) rotate3d(0,1,0,-5deg); + -ms-transform: perspective(400px) rotate3d(0,1,0,-5deg); + transform: perspective(400px) rotate3d(0,1,0,-5deg); + } + 100% { + -webkit-transform: perspective(400px) rotate3d(0,1,0,90deg); + -ms-transform: perspective(400px) rotate3d(0,1,0,90deg); + transform: perspective(400px) rotate3d(0,1,0,90deg); + -webkit-transition-timing-function: ease-in; + transition-timing-function: ease-in; + opacity: 0; + } +} +@keyframes switchZoomIn-out { + 0%{ + opacity: 1; + } + 50%{ + opacity: 0; + -webkit-transform: scale3d(.3,.3,.3); + -ms-transform: scale3d(.3,.3,.3); + transform: scale3d(.3,.3,.3); + } + 100%{ + opacity: 0; + } +} +@keyframes switchFadeInUp-out { + 0% { + opacity: 1; + -webkit-transform: none; + -ms-transform: none; + transform: none; + } + 100%{ + opacity: 0; + -webkit-transform: translate3d(0,100%,0); + -ms-transform: translate3d(0,100%,0); + transform: translate3d(0,100%,0); + } +} +@keyframes switchFadeIn-out { + 0%{ + opacity: 1; + } + 100%{ + opacity: 0; + } +} +@keyframes switchFadeInDown-out { + 0%{ + opacity: 1; + -webkit-transform: none; + -ms-transform: none; + transform: none; + } + 100%{ + opacity: 0; + -webkit-transform: translate3d(0,-100%,0); + -ms-transform: translate3d(0,-100%,0); + transform: translate3d(0,-100%,0); + } +} +@keyframes switchSlideInDown-out { + 0%{ + -webkit-transform: translateY(0); + -ms-transform: translateY(0); + transform: translateY(0); + } + 100%{ + -webkit-transform: translateY(-100%); + -ms-transform: translateY(-100%); + transform: translateY(-100%); + } +} +@keyframes switchSlideInUp-out { + 0%{ + -webkit-transform: translateY(0); + -ms-transform: translateY(0); + transform: translateY(0); + } + 100%{ + -webkit-transform: translateY(100%); + -ms-transform: translateY(100%); + transform: translateY(100%); + visibility: visible; + } +} +/*end Í˳ö¶¯»­*/.module_413898075 .ModuleHead .HeadCenter{float:none;} +#module_413898075 { + padding:0px; +} +#module_413898075 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_413898075 .ModuleHead413898075 { + display:none; +} +#module_413898075 >.module_413898075 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413898075 >.module_413898075{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_413898075 .BodyCenter.BodyCenter413898075 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413898075 .BodyCenter.BodyCenter413898075 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_413898075 >.module_413898075 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413898075 >.module_413898075 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_413898075 >.module_413898075 {box-shadow: 0px 0px 0px 0px #ccc} +#module_413898075:hover { + border:none; +} +#module_413898075:hover >.module_413898075 { + border-color:#ccc; +} +#module_413898075:hover >.module_413898075 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_413898075 .ModuleHoverBoxItem_1{background-color:#fff;} +#module_413898075 .ModuleHoverBoxItem_1{background-image:none;} +#module_413898075 .ModuleHoverBoxItem_1{background-repeat:no-repeat;} +#module_413898075 .ModuleHoverBoxItem_1{} +#module_413898075 .ModuleHoverBoxItem_1{background-attachment:scroll;} +#module_413898075 .ModuleHoverBoxItem_1{} +#module_413898075 .ModuleHoverBoxItem_1{padding-top:0px;} +#module_413898075 .ModuleHoverBoxItem_1{padding-bottom:0px;} +#module_413898075 .ModuleHoverBoxItem_1{padding-left:0px;} +#module_413898075 .ModuleHoverBoxItem_1{padding-right:0px;} +#module_413898075 .ModuleHoverBoxItem_2{background-color:#fff;} +#module_413898075 .ModuleHoverBoxItem_2{background-image:none;} +#module_413898075 .ModuleHoverBoxItem_2{background-repeat:no-repeat;} +#module_413898075 .ModuleHoverBoxItem_2{} +#module_413898075 .ModuleHoverBoxItem_2{background-attachment:scroll;} +#module_413898075 .ModuleHoverBoxItem_2{} +#module_413898075 .ModuleHoverBoxItem_2{padding-top:0px;} +#module_413898075 .ModuleHoverBoxItem_2{padding-bottom:0px;} +#module_413898075 .ModuleHoverBoxItem_2{padding-left:0px;} +#module_413898075 .ModuleHoverBoxItem_2{padding-right:0px;} +#module_413898075 .ModuleHoverBoxItem_2 .ModuleItem{opacity:1} +/*ͼÎÄÄ£¿é layout 103*/ +.ModuleImageTextGiant.layout-103 .imageTextGiant-Container{max-height: 100%; max-width: 100%;padding: 10px;} +.ModuleImageTextGiant.layout-103 .imageTextGiant-Container .GraphicUpper{text-align: center;} +.ModuleImageTextGiant.layout-103 .ModuleImageTextContent{width: 100%;} + +.module_413898364 .ModuleHead .HeadCenter{float:none;} +#module_413898364 { + padding:0px; +} +#module_413898364 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_413898364 .ModuleHead413898364 { + display:none; +} +#module_413898364 .BodyCenter.BodyCenter413898364 { + background:none;background-color:rgba(0,0,0,0); +} +#module_413898364 >.module_413898364 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413898364 >.module_413898364{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:15px; + border-top-right-radius:15px; + border-bottom-left-radius:15px; + border-bottom-right-radius:15px; +} +@media screen and (min-width: 768px){ + #module_413898364 .BodyCenter.BodyCenter413898364 { + padding-top:10.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:21.6667%; + } +} +@media screen and (max-width: 767px){ + #module_413898364 .BodyCenter.BodyCenter413898364 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_413898364 >.module_413898364 { + margin-top:3.3333%; + margin-left:6.6667%; + margin-right:6.6667%; + margin-bottom:3.3333%; + } +} +@media screen and (max-width: 767px){ + #module_413898364 >.module_413898364 { + margin-top:2.8736%; + margin-left:2.8736%; + margin-right:2.8736%; + margin-bottom:2.8736%; + } +} +#module_413898364 >.module_413898364 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242)} +#module_413898364:hover { + border:none; +} +#module_413898364:hover >.module_413898364 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242);transition: box-shadow 0.5s ease 0s;} + +#module_413898364 .GraphicUpper .TextImage{border-top-left-radius:0px;} +#module_413898364 .GraphicUpper .TextImage{border-top-right-radius:0px;} +#module_413898364 .GraphicUpper .TextImage{border-bottom-left-radius:0px;} +#module_413898364 .GraphicUpper .TextImage{border-bottom-right-radius:0px;} +#module_413898364 .GraphicUpper .TextImage{margin-top:0px;} +#module_413898364 .GraphicUpper .TextImage{margin-bottom:10px;} +#module_413898364 .GraphicUpper .TextImage{margin-left:0px;} +#module_413898364 .GraphicUpper .TextImage{margin-right:0px;} +#module_413898364 .TextImage{width:30%;} +#module_413898364 .MobileTextImage{width:50%;} +#module_413898364 .imageTextGiant-Container .GraphicUpper{ text-align:center;} +#module_413898364 .imageTextGiant-Container{padding-top:10px;} +#module_413898364 .imageTextGiant-Container{padding-bottom:10px;} +#module_413898364 .imageTextGiant-Container{padding-left:10px;} +#module_413898364 .imageTextGiant-Container{padding-right:10px;} +#module_413898364 .ModuleImageTextGiantContent{padding-top:0px;} +#module_413898364 .ModuleImageTextGiantContent{padding-bottom:30px;} +#module_413898364 .ModuleImageTextGiantContent{padding-left:15px;} +#module_413898364 .ModuleImageTextGiantContent{padding-right:15px;} +#module_413898364 .imageTextGiant-Container{padding-top:0px;} +#module_413898364 .imageTextGiant-Container{padding-bottom:0px;} +#module_413898364 .imageTextGiant-Container{padding-left:0px;} +#module_413898364 .imageTextGiant-Container{padding-right:0px;} +#module_413898364 .showHandle .btn{font-size:14px;} +#module_413898364 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_413898364 .showHandle .btn{color:#333;} +#module_413898364 .showHandle .btn{font-weight:400;} +#module_413898364 .showHandle .btn{text-decoration:none;} +#module_413898364 .showHandle .btn{font-style:normal;} +#module_413898364 .showHandle div{border-top-color:#ddd !important;} +#module_413898364 .showHandle div{border-top-style:solid !important;} +#module_413898364 .showHandle div{border-top-width:1px !important;} +#module_413898364 .showHandle{background-color:transparent;} +#module_413898364 .showHandle{background-image:none;} +#module_413898364 .showHandle{background-repeat:no-repeat;} +#module_413898364 .showHandle{} +#module_413898364 .showHandle{} +#module_413898364 .showHandle{} +#module_413898364 a{font-size:unset;font-family:unset}.module_413899550 .ModuleHead .HeadCenter{float:none;} +#module_413899550 { + padding:0px; +} +#module_413899550 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_413899550 .ModuleHead413899550 { + display:none; +} +#module_413899550 .BodyCenter.BodyCenter413899550 { + background:none;background-color:rgb(73, 133, 252); +} +#module_413899550 >.module_413899550 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413899550 >.module_413899550{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:15px; + border-top-right-radius:15px; + border-bottom-left-radius:15px; + border-bottom-right-radius:15px; +} +@media screen and (min-width: 768px){ + #module_413899550 .BodyCenter.BodyCenter413899550 { + padding-top:10.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:21.6667%; + } +} +@media screen and (max-width: 767px){ + #module_413899550 .BodyCenter.BodyCenter413899550 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_413899550 >.module_413899550 { + margin-top:3.3333%; + margin-left:6.6667%; + margin-right:6.6667%; + margin-bottom:3.3333%; + } +} +@media screen and (max-width: 767px){ + #module_413899550 >.module_413899550 { + margin-top:5.0000%; + margin-left:5.0000%; + margin-right:5.0000%; + margin-bottom:5.0000%; + } +} +#module_413899550 >.module_413899550 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242)} +#module_413899550:hover { + border:none; +} +#module_413899550:hover >.module_413899550 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242);transition: box-shadow 0.5s ease 0s;} + +#module_413899550 .GraphicUpper .TextImage{border-top-left-radius:0px;} +#module_413899550 .GraphicUpper .TextImage{border-top-right-radius:0px;} +#module_413899550 .GraphicUpper .TextImage{border-bottom-left-radius:0px;} +#module_413899550 .GraphicUpper .TextImage{border-bottom-right-radius:0px;} +#module_413899550 .GraphicUpper .TextImage{margin-top:0px;} +#module_413899550 .GraphicUpper .TextImage{margin-bottom:10px;} +#module_413899550 .GraphicUpper .TextImage{margin-left:0px;} +#module_413899550 .GraphicUpper .TextImage{margin-right:0px;} +#module_413899550 .TextImage{width:30%;} +#module_413899550 .MobileTextImage{width:50%;} +#module_413899550 .imageTextGiant-Container .GraphicUpper{ text-align:center;} +#module_413899550 .imageTextGiant-Container{padding-top:10px;} +#module_413899550 .imageTextGiant-Container{padding-bottom:10px;} +#module_413899550 .imageTextGiant-Container{padding-left:10px;} +#module_413899550 .imageTextGiant-Container{padding-right:10px;} +#module_413899550 .ModuleImageTextGiantContent{padding-top:0px;} +#module_413899550 .ModuleImageTextGiantContent{padding-bottom:30px;} +#module_413899550 .ModuleImageTextGiantContent{padding-left:15px;} +#module_413899550 .ModuleImageTextGiantContent{padding-right:15px;} +#module_413899550 .imageTextGiant-Container{padding-top:0px;} +#module_413899550 .imageTextGiant-Container{padding-bottom:0px;} +#module_413899550 .imageTextGiant-Container{padding-left:0px;} +#module_413899550 .imageTextGiant-Container{padding-right:0px;} +#module_413899550 .showHandle .btn{font-size:14px;} +#module_413899550 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_413899550 .showHandle .btn{color:#333;} +#module_413899550 .showHandle .btn{font-weight:400;} +#module_413899550 .showHandle .btn{text-decoration:none;} +#module_413899550 .showHandle .btn{font-style:normal;} +#module_413899550 .showHandle div{border-top-color:#ddd !important;} +#module_413899550 .showHandle div{border-top-style:solid !important;} +#module_413899550 .showHandle div{border-top-width:1px !important;} +#module_413899550 .showHandle{background-color:transparent;} +#module_413899550 .showHandle{background-image:none;} +#module_413899550 .showHandle{background-repeat:no-repeat;} +#module_413899550 .showHandle{} +#module_413899550 .showHandle{} +#module_413899550 .showHandle{} +#module_413899550 a{font-size:unset;font-family:unset} +.module_413898079 .ModuleHead .HeadCenter{float:none;} +#module_413898079 { + padding:0px; +} +#module_413898079 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_413898079 .ModuleHead413898079 { + display:none; +} +#module_413898079 >.module_413898079 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413898079 >.module_413898079{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_413898079 .BodyCenter.BodyCenter413898079 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413898079 .BodyCenter.BodyCenter413898079 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_413898079 >.module_413898079 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413898079 >.module_413898079 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_413898079 >.module_413898079 {box-shadow: 0px 0px 0px 0px #ccc} +#module_413898079:hover { + border:none; +} +#module_413898079:hover >.module_413898079 { + border-color:#ccc; +} +#module_413898079:hover >.module_413898079 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_413898079 .ModuleHoverBoxItem_1{background-color:#fff;} +#module_413898079 .ModuleHoverBoxItem_1{background-image:none;} +#module_413898079 .ModuleHoverBoxItem_1{background-repeat:no-repeat;} +#module_413898079 .ModuleHoverBoxItem_1{} +#module_413898079 .ModuleHoverBoxItem_1{background-attachment:scroll;} +#module_413898079 .ModuleHoverBoxItem_1{} +#module_413898079 .ModuleHoverBoxItem_1{padding-top:0px;} +#module_413898079 .ModuleHoverBoxItem_1{padding-bottom:0px;} +#module_413898079 .ModuleHoverBoxItem_1{padding-left:0px;} +#module_413898079 .ModuleHoverBoxItem_1{padding-right:0px;} +#module_413898079 .ModuleHoverBoxItem_2{background-color:#fff;} +#module_413898079 .ModuleHoverBoxItem_2{background-image:none;} +#module_413898079 .ModuleHoverBoxItem_2{background-repeat:no-repeat;} +#module_413898079 .ModuleHoverBoxItem_2{} +#module_413898079 .ModuleHoverBoxItem_2{background-attachment:scroll;} +#module_413898079 .ModuleHoverBoxItem_2{} +#module_413898079 .ModuleHoverBoxItem_2{padding-top:0px;} +#module_413898079 .ModuleHoverBoxItem_2{padding-bottom:0px;} +#module_413898079 .ModuleHoverBoxItem_2{padding-left:0px;} +#module_413898079 .ModuleHoverBoxItem_2{padding-right:0px;} +#module_413898079 .ModuleHoverBoxItem_2 .ModuleItem{opacity:1} +.module_413905588 .ModuleHead .HeadCenter{float:none;} +#module_413905588 { + padding:0px; +} +#module_413905588 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_413905588 .ModuleHead413905588 { + display:none; +} +#module_413905588 .BodyCenter.BodyCenter413905588 { + background:none;background-color:rgba(0,0,0,0); +} +#module_413905588 >.module_413905588 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413905588 >.module_413905588{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:15px; + border-top-right-radius:15px; + border-bottom-left-radius:15px; + border-bottom-right-radius:15px; +} +@media screen and (min-width: 768px){ + #module_413905588 .BodyCenter.BodyCenter413905588 { + padding-top:10.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:10.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413905588 .BodyCenter.BodyCenter413905588 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_413905588 >.module_413905588 { + margin-top:3.3333%; + margin-left:6.6667%; + margin-right:6.6667%; + margin-bottom:3.3333%; + } +} +@media screen and (max-width: 767px){ + #module_413905588 >.module_413905588 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_413905588 >.module_413905588 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242)} +#module_413905588:hover { + border:none; +} +#module_413905588:hover >.module_413905588 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242);transition: box-shadow 0.5s ease 0s;} + +#module_413905588 .GraphicUpper .TextImage{border-top-left-radius:0px;} +#module_413905588 .GraphicUpper .TextImage{border-top-right-radius:0px;} +#module_413905588 .GraphicUpper .TextImage{border-bottom-left-radius:0px;} +#module_413905588 .GraphicUpper .TextImage{border-bottom-right-radius:0px;} +#module_413905588 .GraphicUpper .TextImage{margin-top:0px;} +#module_413905588 .GraphicUpper .TextImage{margin-bottom:10px;} +#module_413905588 .GraphicUpper .TextImage{margin-left:0px;} +#module_413905588 .GraphicUpper .TextImage{margin-right:0px;} +#module_413905588 .TextImage{width:30%;} +#module_413905588 .MobileTextImage{width:50%;} +#module_413905588 .imageTextGiant-Container .GraphicUpper{ text-align:center;} +#module_413905588 .imageTextGiant-Container{padding-top:10px;} +#module_413905588 .imageTextGiant-Container{padding-bottom:10px;} +#module_413905588 .imageTextGiant-Container{padding-left:10px;} +#module_413905588 .imageTextGiant-Container{padding-right:10px;} +#module_413905588 .ModuleImageTextGiantContent{padding-top:0px;} +#module_413905588 .ModuleImageTextGiantContent{padding-bottom:30px;} +#module_413905588 .ModuleImageTextGiantContent{padding-left:15px;} +#module_413905588 .ModuleImageTextGiantContent{padding-right:15px;} +#module_413905588 .imageTextGiant-Container{padding-top:0px;} +#module_413905588 .imageTextGiant-Container{padding-bottom:0px;} +#module_413905588 .imageTextGiant-Container{padding-left:0px;} +#module_413905588 .imageTextGiant-Container{padding-right:0px;} +#module_413905588 .showHandle .btn{font-size:14px;} +#module_413905588 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_413905588 .showHandle .btn{color:#333;} +#module_413905588 .showHandle .btn{font-weight:400;} +#module_413905588 .showHandle .btn{text-decoration:none;} +#module_413905588 .showHandle .btn{font-style:normal;} +#module_413905588 .showHandle div{border-top-color:#ddd !important;} +#module_413905588 .showHandle div{border-top-style:solid !important;} +#module_413905588 .showHandle div{border-top-width:1px !important;} +#module_413905588 .showHandle{background-color:transparent;} +#module_413905588 .showHandle{background-image:none;} +#module_413905588 .showHandle{background-repeat:no-repeat;} +#module_413905588 .showHandle{} +#module_413905588 .showHandle{} +#module_413905588 .showHandle{} +#module_413905588 a{font-size:unset;font-family:unset}.module_413905589 .ModuleHead .HeadCenter{float:none;} +#module_413905589 { + padding:0px; +} +#module_413905589 { + position:static; + z-index:0; + top:1063px; + left:798px; + width:100%; + height: auto; +} +#module_413905589 .ModuleHead413905589 { + display:none; +} +#module_413905589 .BodyCenter.BodyCenter413905589 { + background:none;background-color:rgb(73, 133, 252); +} +#module_413905589 >.module_413905589 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413905589 >.module_413905589{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:15px; + border-top-right-radius:15px; + border-bottom-left-radius:15px; + border-bottom-right-radius:15px; +} +@media screen and (min-width: 768px){ + #module_413905589 .BodyCenter.BodyCenter413905589 { + padding-top:10.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:10.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413905589 .BodyCenter.BodyCenter413905589 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_413905589 >.module_413905589 { + margin-top:3.3333%; + margin-left:6.6667%; + margin-right:6.6667%; + margin-bottom:3.3333%; + } +} +@media screen and (max-width: 767px){ + #module_413905589 >.module_413905589 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_413905589 >.module_413905589 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242)} +#module_413905589:hover { + border:none; +} +#module_413905589:hover >.module_413905589 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242);transition: box-shadow 0.5s ease 0s;} + +#module_413905589 .GraphicUpper .TextImage{border-top-left-radius:0px;} +#module_413905589 .GraphicUpper .TextImage{border-top-right-radius:0px;} +#module_413905589 .GraphicUpper .TextImage{border-bottom-left-radius:0px;} +#module_413905589 .GraphicUpper .TextImage{border-bottom-right-radius:0px;} +#module_413905589 .GraphicUpper .TextImage{margin-top:0px;} +#module_413905589 .GraphicUpper .TextImage{margin-bottom:10px;} +#module_413905589 .GraphicUpper .TextImage{margin-left:0px;} +#module_413905589 .GraphicUpper .TextImage{margin-right:0px;} +#module_413905589 .TextImage{width:30%;} +#module_413905589 .MobileTextImage{width:50%;} +#module_413905589 .imageTextGiant-Container .GraphicUpper{ text-align:center;} +#module_413905589 .imageTextGiant-Container{padding-top:10px;} +#module_413905589 .imageTextGiant-Container{padding-bottom:10px;} +#module_413905589 .imageTextGiant-Container{padding-left:10px;} +#module_413905589 .imageTextGiant-Container{padding-right:10px;} +#module_413905589 .ModuleImageTextGiantContent{padding-top:0px;} +#module_413905589 .ModuleImageTextGiantContent{padding-bottom:30px;} +#module_413905589 .ModuleImageTextGiantContent{padding-left:15px;} +#module_413905589 .ModuleImageTextGiantContent{padding-right:15px;} +#module_413905589 .imageTextGiant-Container{padding-top:0px;} +#module_413905589 .imageTextGiant-Container{padding-bottom:0px;} +#module_413905589 .imageTextGiant-Container{padding-left:0px;} +#module_413905589 .imageTextGiant-Container{padding-right:0px;} +#module_413905589 .showHandle .btn{font-size:14px;} +#module_413905589 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_413905589 .showHandle .btn{color:#333;} +#module_413905589 .showHandle .btn{font-weight:400;} +#module_413905589 .showHandle .btn{text-decoration:none;} +#module_413905589 .showHandle .btn{font-style:normal;} +#module_413905589 .showHandle div{border-top-color:#ddd !important;} +#module_413905589 .showHandle div{border-top-style:solid !important;} +#module_413905589 .showHandle div{border-top-width:1px !important;} +#module_413905589 .showHandle{background-color:transparent;} +#module_413905589 .showHandle{background-image:none;} +#module_413905589 .showHandle{background-repeat:no-repeat;} +#module_413905589 .showHandle{} +#module_413905589 .showHandle{} +#module_413905589 .showHandle{} +#module_413905589 a{font-size:unset;font-family:unset} +.module_413898350 .ModuleHead .HeadCenter{float:none;} +#module_413898350 { + padding:0px; +} +#module_413898350 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_413898350 .ModuleHead413898350 { + display:none; +} + +#module_413898350 .ModuleHoverBoxItem_1{background-color:#fff;} +#module_413898350 .ModuleHoverBoxItem_1{} +#module_413898350 .ModuleHoverBoxItem_1{background-repeat:no-repeat;} +#module_413898350 .ModuleHoverBoxItem_1{} +#module_413898350 .ModuleHoverBoxItem_1{background-attachment:scroll;} +#module_413898350 .ModuleHoverBoxItem_1{} +#module_413898350 .ModuleHoverBoxItem_1{padding-top:0px;} +#module_413898350 .ModuleHoverBoxItem_1{padding-bottom:0px;} +#module_413898350 .ModuleHoverBoxItem_1{padding-left:0px;} +#module_413898350 .ModuleHoverBoxItem_1{padding-right:0px;} +#module_413898350 .ModuleHoverBoxItem_2{background-color:#fff;} +#module_413898350 .ModuleHoverBoxItem_2{} +#module_413898350 .ModuleHoverBoxItem_2{background-repeat:no-repeat;} +#module_413898350 .ModuleHoverBoxItem_2{} +#module_413898350 .ModuleHoverBoxItem_2{background-attachment:scroll;} +#module_413898350 .ModuleHoverBoxItem_2{} +#module_413898350 .ModuleHoverBoxItem_2{padding-top:0px;} +#module_413898350 .ModuleHoverBoxItem_2{padding-bottom:0px;} +#module_413898350 .ModuleHoverBoxItem_2{padding-left:0px;} +#module_413898350 .ModuleHoverBoxItem_2{padding-right:0px;} +#module_413898350 .ModuleHoverBoxItem_2 .ModuleItem{opacity:1} +.module_413905590 .ModuleHead .HeadCenter{float:none;} +#module_413905590 { + padding:0px; +} +#module_413905590 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_413905590 .ModuleHead413905590 { + display:none; +} +#module_413905590 .BodyCenter.BodyCenter413905590 { + background:none;background-color:rgba(0,0,0,0); +} +#module_413905590 >.module_413905590 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413905590 >.module_413905590{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:15px; + border-top-right-radius:15px; + border-bottom-left-radius:15px; + border-bottom-right-radius:15px; +} +@media screen and (min-width: 768px){ + #module_413905590 .BodyCenter.BodyCenter413905590 { + padding-top:10.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:10.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413905590 .BodyCenter.BodyCenter413905590 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_413905590 >.module_413905590 { + margin-top:3.3333%; + margin-left:6.6667%; + margin-right:6.6667%; + margin-bottom:3.3333%; + } +} +@media screen and (max-width: 767px){ + #module_413905590 >.module_413905590 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_413905590 >.module_413905590 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242)} +#module_413905590:hover { + border:none; +} +#module_413905590:hover >.module_413905590 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242);transition: box-shadow 0.5s ease 0s;} + +#module_413905590 .GraphicUpper .TextImage{border-top-left-radius:0px;} +#module_413905590 .GraphicUpper .TextImage{border-top-right-radius:0px;} +#module_413905590 .GraphicUpper .TextImage{border-bottom-left-radius:0px;} +#module_413905590 .GraphicUpper .TextImage{border-bottom-right-radius:0px;} +#module_413905590 .GraphicUpper .TextImage{margin-top:0px;} +#module_413905590 .GraphicUpper .TextImage{margin-bottom:10px;} +#module_413905590 .GraphicUpper .TextImage{margin-left:0px;} +#module_413905590 .GraphicUpper .TextImage{margin-right:0px;} +#module_413905590 .TextImage{width:30%;} +#module_413905590 .MobileTextImage{width:50%;} +#module_413905590 .imageTextGiant-Container .GraphicUpper{ text-align:center;} +#module_413905590 .imageTextGiant-Container{padding-top:10px;} +#module_413905590 .imageTextGiant-Container{padding-bottom:10px;} +#module_413905590 .imageTextGiant-Container{padding-left:10px;} +#module_413905590 .imageTextGiant-Container{padding-right:10px;} +#module_413905590 .ModuleImageTextGiantContent{padding-top:0px;} +#module_413905590 .ModuleImageTextGiantContent{padding-bottom:30px;} +#module_413905590 .ModuleImageTextGiantContent{padding-left:45px;} +#module_413905590 .ModuleImageTextGiantContent{padding-right:45px;} +#module_413905590 .imageTextGiant-Container{padding-top:0px;} +#module_413905590 .imageTextGiant-Container{padding-bottom:0px;} +#module_413905590 .imageTextGiant-Container{padding-left:0px;} +#module_413905590 .imageTextGiant-Container{padding-right:0px;} +#module_413905590 .showHandle .btn{font-size:14px;} +#module_413905590 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_413905590 .showHandle .btn{color:#333;} +#module_413905590 .showHandle .btn{font-weight:400;} +#module_413905590 .showHandle .btn{text-decoration:none;} +#module_413905590 .showHandle .btn{font-style:normal;} +#module_413905590 .showHandle div{border-top-color:#ddd !important;} +#module_413905590 .showHandle div{border-top-style:solid !important;} +#module_413905590 .showHandle div{border-top-width:1px !important;} +#module_413905590 .showHandle{background-color:transparent;} +#module_413905590 .showHandle{background-image:none;} +#module_413905590 .showHandle{background-repeat:no-repeat;} +#module_413905590 .showHandle{} +#module_413905590 .showHandle{} +#module_413905590 .showHandle{} +#module_413905590 a{font-size:unset;font-family:unset}.module_413905592 .ModuleHead .HeadCenter{float:none;} +#module_413905592 { + padding:0px; +} +#module_413905592 { + position:static; + z-index:0; + top:1096px; + left:1122px; + width:100%; + height: auto; +} +#module_413905592 .ModuleHead413905592 { + display:none; +} +#module_413905592 .BodyCenter.BodyCenter413905592 { + background:none;background-color:rgb(73, 133, 252); +} +#module_413905592 >.module_413905592 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413905592 >.module_413905592{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:15px; + border-top-right-radius:15px; + border-bottom-left-radius:15px; + border-bottom-right-radius:15px; +} +@media screen and (min-width: 768px){ + #module_413905592 .BodyCenter.BodyCenter413905592 { + padding-top:10.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:10.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413905592 .BodyCenter.BodyCenter413905592 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_413905592 >.module_413905592 { + margin-top:3.3333%; + margin-left:6.6667%; + margin-right:6.6667%; + margin-bottom:3.3333%; + } +} +@media screen and (max-width: 767px){ + #module_413905592 >.module_413905592 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_413905592 >.module_413905592 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242)} +#module_413905592:hover { + border:none; +} +#module_413905592:hover >.module_413905592 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242);transition: box-shadow 0.5s ease 0s;} + +#module_413905592 .GraphicUpper .TextImage{border-top-left-radius:0px;} +#module_413905592 .GraphicUpper .TextImage{border-top-right-radius:0px;} +#module_413905592 .GraphicUpper .TextImage{border-bottom-left-radius:0px;} +#module_413905592 .GraphicUpper .TextImage{border-bottom-right-radius:0px;} +#module_413905592 .GraphicUpper .TextImage{margin-top:0px;} +#module_413905592 .GraphicUpper .TextImage{margin-bottom:10px;} +#module_413905592 .GraphicUpper .TextImage{margin-left:0px;} +#module_413905592 .GraphicUpper .TextImage{margin-right:0px;} +#module_413905592 .TextImage{width:30%;} +#module_413905592 .MobileTextImage{width:50%;} +#module_413905592 .imageTextGiant-Container .GraphicUpper{ text-align:center;} +#module_413905592 .imageTextGiant-Container{padding-top:10px;} +#module_413905592 .imageTextGiant-Container{padding-bottom:10px;} +#module_413905592 .imageTextGiant-Container{padding-left:10px;} +#module_413905592 .imageTextGiant-Container{padding-right:10px;} +#module_413905592 .ModuleImageTextGiantContent{padding-top:0px;} +#module_413905592 .ModuleImageTextGiantContent{padding-bottom:30px;} +#module_413905592 .ModuleImageTextGiantContent{padding-left:45px;} +#module_413905592 .ModuleImageTextGiantContent{padding-right:45px;} +#module_413905592 .imageTextGiant-Container{padding-top:0px;} +#module_413905592 .imageTextGiant-Container{padding-bottom:0px;} +#module_413905592 .imageTextGiant-Container{padding-left:0px;} +#module_413905592 .imageTextGiant-Container{padding-right:0px;} +#module_413905592 .showHandle .btn{font-size:14px;} +#module_413905592 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_413905592 .showHandle .btn{color:#333;} +#module_413905592 .showHandle .btn{font-weight:400;} +#module_413905592 .showHandle .btn{text-decoration:none;} +#module_413905592 .showHandle .btn{font-style:normal;} +#module_413905592 .showHandle div{border-top-color:#ddd !important;} +#module_413905592 .showHandle div{border-top-style:solid !important;} +#module_413905592 .showHandle div{border-top-width:1px !important;} +#module_413905592 .showHandle{background-color:transparent;} +#module_413905592 .showHandle{background-image:none;} +#module_413905592 .showHandle{background-repeat:no-repeat;} +#module_413905592 .showHandle{} +#module_413905592 .showHandle{} +#module_413905592 .showHandle{} +#module_413905592 a{font-size:unset;font-family:unset} +.module_413898353 .ModuleHead .HeadCenter{float:none;} +#module_413898353 { + padding:0px; +} +#module_413898353 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_413898353 .ModuleHead413898353 { + display:none; +} + +#module_413898353 .ModuleHoverBoxItem_1{background-color:#fff;} +#module_413898353 .ModuleHoverBoxItem_1{} +#module_413898353 .ModuleHoverBoxItem_1{background-repeat:no-repeat;} +#module_413898353 .ModuleHoverBoxItem_1{} +#module_413898353 .ModuleHoverBoxItem_1{background-attachment:scroll;} +#module_413898353 .ModuleHoverBoxItem_1{} +#module_413898353 .ModuleHoverBoxItem_1{padding-top:0px;} +#module_413898353 .ModuleHoverBoxItem_1{padding-bottom:0px;} +#module_413898353 .ModuleHoverBoxItem_1{padding-left:0px;} +#module_413898353 .ModuleHoverBoxItem_1{padding-right:0px;} +#module_413898353 .ModuleHoverBoxItem_2{background-color:#fff;} +#module_413898353 .ModuleHoverBoxItem_2{} +#module_413898353 .ModuleHoverBoxItem_2{background-repeat:no-repeat;} +#module_413898353 .ModuleHoverBoxItem_2{} +#module_413898353 .ModuleHoverBoxItem_2{background-attachment:scroll;} +#module_413898353 .ModuleHoverBoxItem_2{} +#module_413898353 .ModuleHoverBoxItem_2{padding-top:0px;} +#module_413898353 .ModuleHoverBoxItem_2{padding-bottom:0px;} +#module_413898353 .ModuleHoverBoxItem_2{padding-left:0px;} +#module_413898353 .ModuleHoverBoxItem_2{padding-right:0px;} +#module_413898353 .ModuleHoverBoxItem_2 .ModuleItem{opacity:1} +.module_413905591 .ModuleHead .HeadCenter{float:none;} +#module_413905591 { + padding:0px; +} +#module_413905591 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_413905591 .ModuleHead413905591 { + display:none; +} +#module_413905591 .BodyCenter.BodyCenter413905591 { + background:none;background-color:rgba(0,0,0,0); +} +#module_413905591 >.module_413905591 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413905591 >.module_413905591{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:15px; + border-top-right-radius:15px; + border-bottom-left-radius:15px; + border-bottom-right-radius:15px; +} +@media screen and (min-width: 768px){ + #module_413905591 .BodyCenter.BodyCenter413905591 { + padding-top:10.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:31.6667%; + } +} +@media screen and (max-width: 767px){ + #module_413905591 .BodyCenter.BodyCenter413905591 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_413905591 >.module_413905591 { + margin-top:3.3333%; + margin-left:6.6667%; + margin-right:6.6667%; + margin-bottom:3.3333%; + } +} +@media screen and (max-width: 767px){ + #module_413905591 >.module_413905591 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_413905591 >.module_413905591 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242)} +#module_413905591:hover { + border:none; +} +#module_413905591:hover >.module_413905591 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242);transition: box-shadow 0.5s ease 0s;} + +#module_413905591 .GraphicUpper .TextImage{border-top-left-radius:0px;} +#module_413905591 .GraphicUpper .TextImage{border-top-right-radius:0px;} +#module_413905591 .GraphicUpper .TextImage{border-bottom-left-radius:0px;} +#module_413905591 .GraphicUpper .TextImage{border-bottom-right-radius:0px;} +#module_413905591 .GraphicUpper .TextImage{margin-top:0px;} +#module_413905591 .GraphicUpper .TextImage{margin-bottom:10px;} +#module_413905591 .GraphicUpper .TextImage{margin-left:0px;} +#module_413905591 .GraphicUpper .TextImage{margin-right:0px;} +#module_413905591 .TextImage{width:30%;} +#module_413905591 .MobileTextImage{width:50%;} +#module_413905591 .imageTextGiant-Container .GraphicUpper{ text-align:center;} +#module_413905591 .imageTextGiant-Container{padding-top:10px;} +#module_413905591 .imageTextGiant-Container{padding-bottom:10px;} +#module_413905591 .imageTextGiant-Container{padding-left:10px;} +#module_413905591 .imageTextGiant-Container{padding-right:10px;} +#module_413905591 .ModuleImageTextGiantContent{padding-top:0px;} +#module_413905591 .ModuleImageTextGiantContent{padding-bottom:30px;} +#module_413905591 .ModuleImageTextGiantContent{padding-left:15px;} +#module_413905591 .ModuleImageTextGiantContent{padding-right:15px;} +#module_413905591 .imageTextGiant-Container{padding-top:0px;} +#module_413905591 .imageTextGiant-Container{padding-bottom:0px;} +#module_413905591 .imageTextGiant-Container{padding-left:0px;} +#module_413905591 .imageTextGiant-Container{padding-right:0px;} +#module_413905591 .showHandle .btn{font-size:14px;} +#module_413905591 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_413905591 .showHandle .btn{color:#333;} +#module_413905591 .showHandle .btn{font-weight:400;} +#module_413905591 .showHandle .btn{text-decoration:none;} +#module_413905591 .showHandle .btn{font-style:normal;} +#module_413905591 .showHandle div{border-top-color:#ddd !important;} +#module_413905591 .showHandle div{border-top-style:solid !important;} +#module_413905591 .showHandle div{border-top-width:1px !important;} +#module_413905591 .showHandle{background-color:transparent;} +#module_413905591 .showHandle{background-image:none;} +#module_413905591 .showHandle{background-repeat:no-repeat;} +#module_413905591 .showHandle{} +#module_413905591 .showHandle{} +#module_413905591 .showHandle{} +#module_413905591 a{font-size:unset;font-family:unset}.module_413905593 .ModuleHead .HeadCenter{float:none;} +#module_413905593 { + padding:0px; +} +#module_413905593 { + position:static; + z-index:0; + top:1072px; + left:1406px; + width:100%; + height: auto; +} +#module_413905593 .ModuleHead413905593 { + display:none; +} +#module_413905593 .BodyCenter.BodyCenter413905593 { + background:none;background-color:rgb(73, 133, 252); +} +#module_413905593 >.module_413905593 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413905593 >.module_413905593{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:15px; + border-top-right-radius:15px; + border-bottom-left-radius:15px; + border-bottom-right-radius:15px; +} +@media screen and (min-width: 768px){ + #module_413905593 .BodyCenter.BodyCenter413905593 { + padding-top:10.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:31.6667%; + } +} +@media screen and (max-width: 767px){ + #module_413905593 .BodyCenter.BodyCenter413905593 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_413905593 >.module_413905593 { + margin-top:3.3333%; + margin-left:6.6667%; + margin-right:6.6667%; + margin-bottom:3.3333%; + } +} +@media screen and (max-width: 767px){ + #module_413905593 >.module_413905593 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_413905593 >.module_413905593 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242)} +#module_413905593:hover { + border:none; +} +#module_413905593:hover >.module_413905593 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242);transition: box-shadow 0.5s ease 0s;} + +#module_413905593 .GraphicUpper .TextImage{border-top-left-radius:0px;} +#module_413905593 .GraphicUpper .TextImage{border-top-right-radius:0px;} +#module_413905593 .GraphicUpper .TextImage{border-bottom-left-radius:0px;} +#module_413905593 .GraphicUpper .TextImage{border-bottom-right-radius:0px;} +#module_413905593 .GraphicUpper .TextImage{margin-top:0px;} +#module_413905593 .GraphicUpper .TextImage{margin-bottom:10px;} +#module_413905593 .GraphicUpper .TextImage{margin-left:0px;} +#module_413905593 .GraphicUpper .TextImage{margin-right:0px;} +#module_413905593 .TextImage{width:30%;} +#module_413905593 .MobileTextImage{width:50%;} +#module_413905593 .imageTextGiant-Container .GraphicUpper{ text-align:center;} +#module_413905593 .imageTextGiant-Container{padding-top:10px;} +#module_413905593 .imageTextGiant-Container{padding-bottom:10px;} +#module_413905593 .imageTextGiant-Container{padding-left:10px;} +#module_413905593 .imageTextGiant-Container{padding-right:10px;} +#module_413905593 .ModuleImageTextGiantContent{padding-top:0px;} +#module_413905593 .ModuleImageTextGiantContent{padding-bottom:30px;} +#module_413905593 .ModuleImageTextGiantContent{padding-left:15px;} +#module_413905593 .ModuleImageTextGiantContent{padding-right:15px;} +#module_413905593 .imageTextGiant-Container{padding-top:0px;} +#module_413905593 .imageTextGiant-Container{padding-bottom:0px;} +#module_413905593 .imageTextGiant-Container{padding-left:0px;} +#module_413905593 .imageTextGiant-Container{padding-right:0px;} +#module_413905593 .showHandle .btn{font-size:14px;} +#module_413905593 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_413905593 .showHandle .btn{color:#333;} +#module_413905593 .showHandle .btn{font-weight:400;} +#module_413905593 .showHandle .btn{text-decoration:none;} +#module_413905593 .showHandle .btn{font-style:normal;} +#module_413905593 .showHandle div{border-top-color:#ddd !important;} +#module_413905593 .showHandle div{border-top-style:solid !important;} +#module_413905593 .showHandle div{border-top-width:1px !important;} +#module_413905593 .showHandle{background-color:transparent;} +#module_413905593 .showHandle{background-image:none;} +#module_413905593 .showHandle{background-repeat:no-repeat;} +#module_413905593 .showHandle{} +#module_413905593 .showHandle{} +#module_413905593 .showHandle{} +#module_413905593 a{font-size:unset;font-family:unset} +.module_408022650 .ModuleHead .HeadCenter{float:none;} +#module_408022650 { + padding:0px; +} +#module_408022650 { + position:static; + z-index:0; + top:0px; + width:100%; + height: auto; +} +#module_408022650 .ModuleHead408022650 { + display:none; +} +#module_408022650 .BodyCenter.BodyCenter408022650 { + background:none;background-color:rgba(0,0,0,0); +} +#module_408022650 >.module_408022650 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_408022650 >.module_408022650{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_408022650 .BodyCenter.BodyCenter408022650 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_408022650 .BodyCenter.BodyCenter408022650 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_408022650 >.module_408022650 { + margin-top:1.0460%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:1.5690%; + } +} +@media screen and (max-width: 767px){ + #module_408022650 >.module_408022650 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_408022650 >.module_408022650 {box-shadow: 0px 0px 0px 0px #ccc} +#module_408022650:hover { + border:none; +} +#module_408022650:hover >.module_408022650 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_408022650 .ModuleSubContainer{background-color:transparent;} +#module_408022650 .ModuleSubContainer{background-image:none;} +#module_408022650 .ModuleSubContainer{background-repeat:no-repeat;} +#module_408022650 .ModuleSubContainer{background-position:0% 0%;} +#module_408022650 .ModuleSubContainer{background-attachment:scroll;} +#module_408022650 .ModuleSubContainer{} +#module_408022650 {!bgVideo!}{bgVideoUrl:} +#module_408022650 .gridBgVideo .bgVideoMask{opacity:0.2} +#module_408022650 .ModuleSubContainer{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0); transition: box-shadow 0.5s ease;} +#module_408022650 .ModuleSubContainer:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +.ModuleGridContainer.ModuleGridContainer408022650 {} +.module_408022662 .ModuleHead .HeadCenter{float:none;} +#module_408022662 { + padding:0px; +} +#module_408022662 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_408022662 .ModuleHead408022662 { + display:none; +} +#module_408022662 .BodyCenter.BodyCenter408022662 { + background:none;background-color:rgba(0,0,0,0); +} +#module_408022662 >.module_408022662 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_408022662 >.module_408022662{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:15px; + border-top-right-radius:15px; + border-bottom-left-radius:15px; + border-bottom-right-radius:15px; +} +@media screen and (min-width: 768px){ + #module_408022662 .BodyCenter.BodyCenter408022662 { + padding-top:10.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:21.6667%; + } +} +@media screen and (max-width: 767px){ + #module_408022662 .BodyCenter.BodyCenter408022662 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_408022662 >.module_408022662 { + margin-top:3.3333%; + margin-left:6.6667%; + margin-right:6.6667%; + margin-bottom:3.3333%; + } +} +@media screen and (max-width: 767px){ + #module_408022662 >.module_408022662 { + margin-top:2.8736%; + margin-left:2.8736%; + margin-right:2.8736%; + margin-bottom:2.8736%; + } +} +#module_408022662 >.module_408022662 {box-shadow: 0px 2px 5px 0px rgb(204, 204, 204)} +#module_408022662:hover { + border:none; +} +#module_408022662:hover >.module_408022662 {box-shadow: 0px 2px 5px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_408022662 .GraphicUpper .TextImage{border-top-left-radius:0px;} +#module_408022662 .GraphicUpper .TextImage{border-top-right-radius:0px;} +#module_408022662 .GraphicUpper .TextImage{border-bottom-left-radius:0px;} +#module_408022662 .GraphicUpper .TextImage{border-bottom-right-radius:0px;} +#module_408022662 .GraphicUpper .TextImage{margin-top:10px;} +#module_408022662 .GraphicUpper .TextImage{margin-bottom:10px;} +#module_408022662 .GraphicUpper .TextImage{margin-left:0px;} +#module_408022662 .GraphicUpper .TextImage{margin-right:0px;} +#module_408022662 .TextImage{width:30%;} +#module_408022662 .MobileTextImage{width:30%;} +#module_408022662 .imageTextGiant-Container .GraphicUpper{ text-align:center;} +#module_408022662 .imageTextGiant-Container{padding-top:10px;} +#module_408022662 .imageTextGiant-Container{padding-bottom:10px;} +#module_408022662 .imageTextGiant-Container{padding-left:10px;} +#module_408022662 .imageTextGiant-Container{padding-right:10px;} +#module_408022662 .ModuleImageTextGiantContent{padding-top:0px;} +#module_408022662 .ModuleImageTextGiantContent{padding-bottom:30px;} +#module_408022662 .ModuleImageTextGiantContent{padding-left:15px;} +#module_408022662 .ModuleImageTextGiantContent{padding-right:15px;} +#module_408022662 .imageTextGiant-Container{padding-top:0px;} +#module_408022662 .imageTextGiant-Container{padding-bottom:0px;} +#module_408022662 .imageTextGiant-Container{padding-left:0px;} +#module_408022662 .imageTextGiant-Container{padding-right:0px;} +#module_408022662 .showHandle .btn{font-size:14px;} +#module_408022662 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_408022662 .showHandle .btn{color:#333;} +#module_408022662 .showHandle .btn{font-weight:400;} +#module_408022662 .showHandle .btn{text-decoration:none;} +#module_408022662 .showHandle .btn{font-style:normal;} +#module_408022662 .showHandle div{border-top-color:#ddd !important;} +#module_408022662 .showHandle div{border-top-style:solid !important;} +#module_408022662 .showHandle div{border-top-width:1px !important;} +#module_408022662 .showHandle{background-color:transparent;} +#module_408022662 .showHandle{background-image:none;} +#module_408022662 .showHandle{background-repeat:no-repeat;} +#module_408022662 .showHandle{} +#module_408022662 .showHandle{} +#module_408022662 .showHandle{} +#module_408022662 a{font-size:unset;font-family:unset} +.module_408028276 .ModuleHead .HeadCenter{float:none;} +#module_408028276 { + padding:0px; +} +#module_408028276 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_408028276 .ModuleHead408028276 { + display:none; +} +#module_408028276 .BodyCenter.BodyCenter408028276 { + background:none;background-color:rgba(0,0,0,0); +} +#module_408028276 >.module_408028276 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_408028276 >.module_408028276{/* overflow: hidden; *//* -webkit-backface-visibility:hidden; *//* border-top-left-radius:15px; *//* border-top-right-radius:15px; *//* border-bottom-left-radius:15px; *//* border-bottom-right-radius:15px; */} +@media screen and (min-width: 768px){ + #module_408028276 .BodyCenter.BodyCenter408028276 { + padding-top:10.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:10.0000%; + } +} +@media screen and (max-width: 767px){ + #module_408028276 .BodyCenter.BodyCenter408028276 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:17.2414%; + } +} +@media screen and (min-width: 768px){ + #module_408028276 >.module_408028276 { + margin-top:3.3333%; + margin-left:6.6667%; + margin-right:6.6667%; + margin-bottom:3.3333%; + } +} +@media screen and (max-width: 767px){ + #module_408028276 >.module_408028276 {/* margin-top:2.8736%; *//* margin-left:2.8736%; *//* margin-right:2.8736%; *//* margin-bottom:2.8736%; */} +} +#module_408028276 >.module_408028276 {box-shadow: 0px 2px 5px 0px #ccc;} +#module_408028276:hover { + border:none; +} +#module_408028276:hover >.module_408028276 {box-shadow: 0px 2px 5px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_408028276 .GraphicUpper .TextImage{border-top-left-radius:0px;} +#module_408028276 .GraphicUpper .TextImage{border-top-right-radius:0px;} +#module_408028276 .GraphicUpper .TextImage{border-bottom-left-radius:0px;} +#module_408028276 .GraphicUpper .TextImage{border-bottom-right-radius:0px;} +#module_408028276 .GraphicUpper .TextImage{margin-top:10px;} +#module_408028276 .GraphicUpper .TextImage{margin-bottom:10px;} +#module_408028276 .GraphicUpper .TextImage{margin-left:0px;} +#module_408028276 .GraphicUpper .TextImage{margin-right:0px;} +#module_408028276 .TextImage{width:30%;} +#module_408028276 .MobileTextImage{width:30%;} +#module_408028276 .imageTextGiant-Container .GraphicUpper{ text-align:center;} +#module_408028276 .imageTextGiant-Container{padding-top:10px;} +#module_408028276 .imageTextGiant-Container{padding-bottom:10px;} +#module_408028276 .imageTextGiant-Container{padding-left:10px;} +#module_408028276 .imageTextGiant-Container{padding-right:10px;} +#module_408028276 .ModuleImageTextGiantContent{padding-top:0px;} +#module_408028276 .ModuleImageTextGiantContent{padding-bottom:30px;} +#module_408028276 .ModuleImageTextGiantContent{padding-left:15px;} +#module_408028276 .ModuleImageTextGiantContent{padding-right:15px;} +#module_408028276 .imageTextGiant-Container{padding-top:0px;} +#module_408028276 .imageTextGiant-Container{padding-bottom:0px;} +#module_408028276 .imageTextGiant-Container{padding-left:0px;} +#module_408028276 .imageTextGiant-Container{padding-right:0px;} +#module_408028276 .showHandle .btn{font-size:14px;} +#module_408028276 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_408028276 .showHandle .btn{color:#333;} +#module_408028276 .showHandle .btn{font-weight:400;} +#module_408028276 .showHandle .btn{text-decoration:none;} +#module_408028276 .showHandle .btn{font-style:normal;} +#module_408028276 .showHandle div{border-top-color:#ddd !important;} +#module_408028276 .showHandle div{border-top-style:solid !important;} +#module_408028276 .showHandle div{border-top-width:1px !important;} +#module_408028276 .showHandle{background-color:transparent;} +#module_408028276 .showHandle{background-image:none;} +#module_408028276 .showHandle{background-repeat:no-repeat;} +#module_408028276 .showHandle{} +#module_408028276 .showHandle{} +#module_408028276 .showHandle{} +#module_408028276 a{font-size:unset;font-family:unset} +.module_408028277 .ModuleHead .HeadCenter{float:none;} +#module_408028277 { + padding:0px; +} +#module_408028277 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_408028277 .ModuleHead408028277 { + display:none; +} +#module_408028277 .BodyCenter.BodyCenter408028277 { + background:none;background-color:rgba(0,0,0,0); +} +#module_408028277 >.module_408028277 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_408028277 >.module_408028277{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:15px; + border-top-right-radius:15px; + border-bottom-left-radius:15px; + border-bottom-right-radius:15px; +} +@media screen and (min-width: 768px){ + #module_408028277 .BodyCenter.BodyCenter408028277 { + padding-top:10.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:10.0000%; + } +} +@media screen and (max-width: 767px){ + #module_408028277 .BodyCenter.BodyCenter408028277 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:34.4828%; + } +} +@media screen and (min-width: 768px){ + #module_408028277 >.module_408028277 { + margin-top:3.3333%; + margin-left:6.6667%; + margin-right:6.6667%; + margin-bottom:3.3333%; + } +} +@media screen and (max-width: 767px){ + #module_408028277 >.module_408028277 { + margin-top:2.8736%; + margin-left:2.8736%; + margin-right:2.8736%; + margin-bottom:2.8736%; + } +} +#module_408028277 >.module_408028277 {box-shadow: 0px 2px 5px 0px #ccc} +#module_408028277:hover { + border:none; +} +#module_408028277:hover >.module_408028277 {box-shadow: 0px 2px 5px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_408028277 .GraphicUpper .TextImage{border-top-left-radius:0px;} +#module_408028277 .GraphicUpper .TextImage{border-top-right-radius:0px;} +#module_408028277 .GraphicUpper .TextImage{border-bottom-left-radius:0px;} +#module_408028277 .GraphicUpper .TextImage{border-bottom-right-radius:0px;} +#module_408028277 .GraphicUpper .TextImage{margin-top:10px;} +#module_408028277 .GraphicUpper .TextImage{margin-bottom:10px;} +#module_408028277 .GraphicUpper .TextImage{margin-left:0px;} +#module_408028277 .GraphicUpper .TextImage{margin-right:0px;} +#module_408028277 .TextImage{width:30%;} +#module_408028277 .MobileTextImage{width:30%;} +#module_408028277 .imageTextGiant-Container .GraphicUpper{ text-align:center;} +#module_408028277 .imageTextGiant-Container{padding-top:10px;} +#module_408028277 .imageTextGiant-Container{padding-bottom:10px;} +#module_408028277 .imageTextGiant-Container{padding-left:10px;} +#module_408028277 .imageTextGiant-Container{padding-right:10px;} +#module_408028277 .ModuleImageTextGiantContent{padding-top:0px;} +#module_408028277 .ModuleImageTextGiantContent{padding-bottom:30px;} +#module_408028277 .ModuleImageTextGiantContent{padding-left:15px;} +#module_408028277 .ModuleImageTextGiantContent{padding-right:15px;} +#module_408028277 .imageTextGiant-Container{padding-top:0px;} +#module_408028277 .imageTextGiant-Container{padding-bottom:0px;} +#module_408028277 .imageTextGiant-Container{padding-left:0px;} +#module_408028277 .imageTextGiant-Container{padding-right:0px;} +#module_408028277 .showHandle .btn{font-size:14px;} +#module_408028277 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_408028277 .showHandle .btn{color:#333;} +#module_408028277 .showHandle .btn{font-weight:400;} +#module_408028277 .showHandle .btn{text-decoration:none;} +#module_408028277 .showHandle .btn{font-style:normal;} +#module_408028277 .showHandle div{border-top-color:#ddd !important;} +#module_408028277 .showHandle div{border-top-style:solid !important;} +#module_408028277 .showHandle div{border-top-width:1px !important;} +#module_408028277 .showHandle{background-color:transparent;} +#module_408028277 .showHandle{background-image:none;} +#module_408028277 .showHandle{background-repeat:no-repeat;} +#module_408028277 .showHandle{} +#module_408028277 .showHandle{} +#module_408028277 .showHandle{} +#module_408028277 a{font-size:unset;font-family:unset} +.module_408028278 .ModuleHead .HeadCenter{float:none;} +#module_408028278 { + padding:0px; +} +#module_408028278 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_408028278 .ModuleHead408028278 { + display:none; +} +#module_408028278 .BodyCenter.BodyCenter408028278 { + background:none;background-color:rgba(0,0,0,0); +} +#module_408028278 >.module_408028278 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_408028278 >.module_408028278{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:15px; + border-top-right-radius:15px; + border-bottom-left-radius:15px; + border-bottom-right-radius:15px; +} +@media screen and (min-width: 768px){ + #module_408028278 .BodyCenter.BodyCenter408028278 { + padding-top:10.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:31.6667%; + } +} +@media screen and (max-width: 767px){ + #module_408028278 .BodyCenter.BodyCenter408028278 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_408028278 >.module_408028278 { + margin-top:3.3333%; + margin-left:6.6667%; + margin-right:6.6667%; + margin-bottom:3.3333%; + } +} +@media screen and (max-width: 767px){ + #module_408028278 >.module_408028278 { + margin-top:2.8736%; + margin-left:2.8736%; + margin-right:2.8736%; + margin-bottom:2.8736%; + } +} +#module_408028278 >.module_408028278 {box-shadow: 0px 2px 5px 0px #ccc} +#module_408028278:hover { + border:none; +} +#module_408028278:hover >.module_408028278 {box-shadow: 0px 2px 5px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_408028278 .GraphicUpper .TextImage{border-top-left-radius:0px;} +#module_408028278 .GraphicUpper .TextImage{border-top-right-radius:0px;} +#module_408028278 .GraphicUpper .TextImage{border-bottom-left-radius:0px;} +#module_408028278 .GraphicUpper .TextImage{border-bottom-right-radius:0px;} +#module_408028278 .GraphicUpper .TextImage{margin-top:10px;} +#module_408028278 .GraphicUpper .TextImage{margin-bottom:10px;} +#module_408028278 .GraphicUpper .TextImage{margin-left:0px;} +#module_408028278 .GraphicUpper .TextImage{margin-right:0px;} +#module_408028278 .TextImage{width:30%;} +#module_408028278 .MobileTextImage{width:30%;} +#module_408028278 .imageTextGiant-Container .GraphicUpper{ text-align:center;} +#module_408028278 .imageTextGiant-Container{padding-top:10px;} +#module_408028278 .imageTextGiant-Container{padding-bottom:10px;} +#module_408028278 .imageTextGiant-Container{padding-left:10px;} +#module_408028278 .imageTextGiant-Container{padding-right:10px;} +#module_408028278 .ModuleImageTextGiantContent{padding-top:0px;} +#module_408028278 .ModuleImageTextGiantContent{padding-bottom:30px;} +#module_408028278 .ModuleImageTextGiantContent{padding-left:15px;} +#module_408028278 .ModuleImageTextGiantContent{padding-right:15px;} +#module_408028278 .imageTextGiant-Container{padding-top:0px;} +#module_408028278 .imageTextGiant-Container{padding-bottom:0px;} +#module_408028278 .imageTextGiant-Container{padding-left:0px;} +#module_408028278 .imageTextGiant-Container{padding-right:0px;} +#module_408028278 .showHandle .btn{font-size:14px;} +#module_408028278 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_408028278 .showHandle .btn{color:#333;} +#module_408028278 .showHandle .btn{font-weight:400;} +#module_408028278 .showHandle .btn{text-decoration:none;} +#module_408028278 .showHandle .btn{font-style:normal;} +#module_408028278 .showHandle div{border-top-color:#ddd !important;} +#module_408028278 .showHandle div{border-top-style:solid !important;} +#module_408028278 .showHandle div{border-top-width:1px !important;} +#module_408028278 .showHandle{background-color:transparent;} +#module_408028278 .showHandle{background-image:none;} +#module_408028278 .showHandle{background-repeat:no-repeat;} +#module_408028278 .showHandle{} +#module_408028278 .showHandle{} +#module_408028278 .showHandle{} +#module_408028278 a{font-size:unset;font-family:unset} +.module_408029116 .ModuleHead .HeadCenter{float:none;} +#module_408029116 { + padding:0px; +} +#module_408029116 { + position:static; + z-index:0; + top:0px; + width:100%; + height: auto; +} +#module_408029116 .ModuleHead408029116 { + display:none; +} +#module_408029116 .BodyCenter.BodyCenter408029116 { + background-color:transparent; + background-image:url(/comdata/92915/202112/2021122409580856817c.png); + background-size:auto; + background-repeat:no-repeat; + background-position:50% 50%; + background-Attachment:scroll; +} +#module_408029116 >.module_408029116 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_408029116 >.module_408029116{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_408029116 .BodyCenter.BodyCenter408029116 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_408029116 .BodyCenter.BodyCenter408029116 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_408029116 >.module_408029116 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_408029116 >.module_408029116 { + margin-top:8.6455%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_408029116 >.module_408029116 {box-shadow: 0px 0px 0px 0px #ccc} +#module_408029116:hover { + border:none; +} +#module_408029116:hover >.module_408029116 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_408029116 .ModuleSubContainer{background-color:transparent;} +#module_408029116 .ModuleSubContainer{background-image:none;} +#module_408029116 .ModuleSubContainer{background-repeat:no-repeat;} +#module_408029116 .ModuleSubContainer{background-position:0% 0%;} +#module_408029116 .ModuleSubContainer{background-attachment:scroll;} +#module_408029116 .ModuleSubContainer{} +#module_408029116 {!bgVideo!}{bgVideoUrl:} +#module_408029116 .gridBgVideo .bgVideoMask{opacity:0.2} +#module_408029116 .ModuleSubContainer{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0); transition: box-shadow 0.5s ease;} +#module_408029116 .ModuleSubContainer:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +.ModuleGridContainer.ModuleGridContainer408029116 {} +.module_408029263 .ModuleHead .HeadCenter{float:none;} +#module_408029263 { + padding:0px; +} +#module_408029263 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_408029263 .ModuleHead408029263 { + display:none; +} +#module_408029263 .BodyCenter.BodyCenter408029263 { + background:none;background-color:rgba(0,0,0,0); +} +#module_408029263 >.module_408029263 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_408029263 >.module_408029263{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_408029263 .BodyCenter.BodyCenter408029263 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_408029263 .BodyCenter.BodyCenter408029263 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_408029263 >.module_408029263 { + margin-top:5.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_408029263 >.module_408029263 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_408029263 >.module_408029263 {box-shadow: 0px 0px 0px 0px #ccc} +#module_408029263:hover { + border:none; +} +#module_408029263:hover >.module_408029263 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_408029263 .ModulePlainTextGiantContent{margin-top:0px;} +#module_408029263 .ModulePlainTextGiantContent{margin-bottom:0px;} +#module_408029263 .ModulePlainTextGiantContent{margin-left:0px;} +#module_408029263 .ModulePlainTextGiantContent{margin-right:10px;} +#module_408029263 .plainTextGiant-Container{padding-top:10px;} +#module_408029263 .plainTextGiant-Container{padding-bottom:10px;} +#module_408029263 .plainTextGiant-Container{padding-left:10px;} +#module_408029263 .plainTextGiant-Container{padding-right:10px;} +#module_408029263 a{font-size:unset;font-family:unset} +.module_408029280 .ModuleHead .HeadCenter{float:none;} +#module_408029280 { + padding:0px; +} +#module_408029280 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_408029280 .ModuleHead408029280 { + display:none; +} +#module_408029280 .BodyCenter.BodyCenter408029280 { + background:none;background-color:rgba(0,0,0,0); +} +#module_408029280 >.module_408029280 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_408029280 >.module_408029280{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_408029280 .BodyCenter.BodyCenter408029280 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_408029280 .BodyCenter.BodyCenter408029280 { + padding-top:0.0000%; + padding-left:2.8818%; + padding-right:2.8818%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_408029280 >.module_408029280 { + margin-top:0.8333%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_408029280 >.module_408029280 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_408029280 >.module_408029280 {box-shadow: 0px 0px 0px 0px #ccc} +#module_408029280:hover { + border:none; +} +#module_408029280:hover >.module_408029280 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_408029280 img{border-top-color:transparent;} +#module_408029280 img{border-top-style:none;} +#module_408029280 img{border-top-width:0px;} +#module_408029280 img{border-right-color:transparent;} +#module_408029280 img{border-right-style:none;} +#module_408029280 img{border-right-width:0px;} +#module_408029280 img{border-bottom-color:transparent;} +#module_408029280 img{border-bottom-style:none;} +#module_408029280 img{border-bottom-width:0px;} +#module_408029280 img{border-left-color:transparent;} +#module_408029280 img{border-left-style:none;} +#module_408029280 img{border-left-width:0px;} +#module_408029280 img{border-top-left-radius:0px;} +#module_408029280 img{border-top-right-radius:0px;} +#module_408029280 img{border-bottom-left-radius:0px;} +#module_408029280 img{border-bottom-right-radius:0px;} +#module_408029280 .BodyCenter{text-align: center;} + +.module_413908958 .ModuleHead .HeadCenter{float:none;} +#module_413908958 { + padding:0px; +} +#module_413908958 { + position:static; + z-index:0; + top:1660px; + left:1172px; + width:100%; + height: auto; +} +#module_413908958 .ModuleHead413908958 { + display:none; +} +#module_413908958 .BodyCenter.BodyCenter413908958 { + background:none;background-color:rgba(0,0,0,0); +} +#module_413908958 >.module_413908958 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413908958 >.module_413908958{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_413908958 .BodyCenter.BodyCenter413908958 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413908958 .BodyCenter.BodyCenter413908958 { + padding-top:0.0000%; + padding-left:2.8818%; + padding-right:2.8818%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_413908958 >.module_413908958 { + margin-top:-1.6667%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413908958 >.module_413908958 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_413908958 >.module_413908958 {box-shadow: 0px 0px 0px 0px #ccc} +#module_413908958:hover { + border:none; +} +#module_413908958:hover >.module_413908958 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_413908958 img{border-top-color:transparent;} +#module_413908958 img{border-top-style:none;} +#module_413908958 img{border-top-width:0px;} +#module_413908958 img{border-right-color:transparent;} +#module_413908958 img{border-right-style:none;} +#module_413908958 img{border-right-width:0px;} +#module_413908958 img{border-bottom-color:transparent;} +#module_413908958 img{border-bottom-style:none;} +#module_413908958 img{border-bottom-width:0px;} +#module_413908958 img{border-left-color:transparent;} +#module_413908958 img{border-left-style:none;} +#module_413908958 img{border-left-width:0px;} +#module_413908958 img{border-top-left-radius:0px;} +#module_413908958 img{border-top-right-radius:0px;} +#module_413908958 img{border-bottom-left-radius:0px;} +#module_413908958 img{border-bottom-right-radius:0px;} +#module_413908958 .BodyCenter{text-align: center;} + +.module_413908968 .ModuleHead .HeadCenter{float:none;} +#module_413908968 { + padding:0px; +} +#module_413908968 { + position:static; + z-index:0; + top:0px; + width:100%; + height: auto; +} +#module_413908968 .ModuleHead413908968 { + display:none; +} +#module_413908968 .BodyCenter.BodyCenter413908968 { + background:none;background-color:rgba(0,0,0,0); +} +#module_413908968 >.module_413908968 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413908968 >.module_413908968{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_413908968 .BodyCenter.BodyCenter413908968 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413908968 .BodyCenter.BodyCenter413908968 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_413908968 >.module_413908968 { + margin-top:1.6667%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:2.5000%; + } +} +@media screen and (max-width: 767px){ + #module_413908968 >.module_413908968 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_413908968 >.module_413908968 {box-shadow: 0px 0px 0px 0px #ccc} +#module_413908968:hover { + border:none; +} +#module_413908968:hover >.module_413908968 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_413908968 img{border-top-color:transparent;} +#module_413908968 img{border-top-style:none;} +#module_413908968 img{border-top-width:0px;} +#module_413908968 img{border-right-color:transparent;} +#module_413908968 img{border-right-style:none;} +#module_413908968 img{border-right-width:0px;} +#module_413908968 img{border-bottom-color:transparent;} +#module_413908968 img{border-bottom-style:none;} +#module_413908968 img{border-bottom-width:0px;} +#module_413908968 img{border-left-color:transparent;} +#module_413908968 img{border-left-style:none;} +#module_413908968 img{border-left-width:0px;} +#module_413908968 img{border-top-left-radius:0px;} +#module_413908968 img{border-top-right-radius:0px;} +#module_413908968 img{border-bottom-left-radius:0px;} +#module_413908968 img{border-bottom-right-radius:0px;} +#module_413908968 .BodyCenter{text-align: center;} + +.module_413908974 .ModuleHead .HeadCenter{float:none;} +#module_413908974 { + padding:0px; +} +#module_413908974 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_413908974 .ModuleHead413908974 { + display:none; +} +#module_413908974 .BodyCenter.BodyCenter413908974 { + background:none;background-color:rgba(0,0,0,0); +} +#module_413908974 >.module_413908974 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413908974 >.module_413908974{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_413908974 .BodyCenter.BodyCenter413908974 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413908974 .BodyCenter.BodyCenter413908974 { + padding-top:0.0000%; + padding-left:2.8818%; + padding-right:2.8818%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_413908974 >.module_413908974 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:6.6667%; + } +} +@media screen and (max-width: 767px){ + #module_413908974 >.module_413908974 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_413908974 >.module_413908974 {box-shadow: 0px 0px 0px 0px #ccc} +#module_413908974:hover { + border:none; +} +#module_413908974:hover >.module_413908974 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_413908974 img{border-top-color:transparent;} +#module_413908974 img{border-top-style:none;} +#module_413908974 img{border-top-width:0px;} +#module_413908974 img{border-right-color:transparent;} +#module_413908974 img{border-right-style:none;} +#module_413908974 img{border-right-width:0px;} +#module_413908974 img{border-bottom-color:transparent;} +#module_413908974 img{border-bottom-style:none;} +#module_413908974 img{border-bottom-width:0px;} +#module_413908974 img{border-left-color:transparent;} +#module_413908974 img{border-left-style:none;} +#module_413908974 img{border-left-width:0px;} +#module_413908974 img{border-top-left-radius:0px;} +#module_413908974 img{border-top-right-radius:0px;} +#module_413908974 img{border-bottom-left-radius:0px;} +#module_413908974 img{border-bottom-right-radius:0px;} +#module_413908974 .BodyCenter{text-align: center;} + +.module_408031427 .ModuleHead .HeadCenter{float:none;} +#module_408031427 { + padding:0px; +} +#module_408031427 { + position:static; + z-index:0; + top:0px; + width:100%; + height: auto; +} +#module_408031427 .ModuleHead408031427 { + display:none; +} +#module_408031427 .BodyCenter.BodyCenter408031427 { + background:none;background-color:rgb(255, 255, 255); +} +#module_408031427 >.module_408031427 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_408031427 >.module_408031427{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_408031427 .BodyCenter.BodyCenter408031427 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_408031427 .BodyCenter.BodyCenter408031427 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_408031427 >.module_408031427 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_408031427 >.module_408031427 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_408031427 >.module_408031427 {box-shadow: 0px 0px 0px 0px #ccc} +#module_408031427:hover { + border:none; +} +#module_408031427:hover >.module_408031427 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_408031427 .ModuleSubContainer{background-color:transparent;} +#module_408031427 .ModuleSubContainer{background-image:none;} +#module_408031427 .ModuleSubContainer{background-repeat:no-repeat;} +#module_408031427 .ModuleSubContainer{background-position:0% 0%;} +#module_408031427 .ModuleSubContainer{background-attachment:scroll;} +#module_408031427 .ModuleSubContainer{} +#module_408031427 {!bgVideo!}{bgVideoUrl:} +#module_408031427 .gridBgVideo .bgVideoMask{opacity:0.2} +#module_408031427 .ModuleSubContainer{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0); transition: box-shadow 0.5s ease;} +#module_408031427 .ModuleSubContainer:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +.ModuleGridContainer.ModuleGridContainer408031427 {} +.module_408031432 .ModuleHead .HeadCenter{float:none;} +#module_408031432 { + padding:0px; +} +#module_408031432 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_408031432 .ModuleHead408031432 { + display:none; +} +#module_408031432 .BodyCenter.BodyCenter408031432 { + background:none;background-color:rgba(0,0,0,0); +} +#module_408031432 >.module_408031432 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_408031432 >.module_408031432{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_408031432 .BodyCenter.BodyCenter408031432 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_408031432 .BodyCenter.BodyCenter408031432 { + padding-top:0.0000%; + padding-left:2.8818%; + padding-right:2.8818%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_408031432 >.module_408031432 { + margin-top:2.5000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_408031432 >.module_408031432 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_408031432 >.module_408031432 {box-shadow: 0px 0px 0px 0px #ccc} +#module_408031432:hover { + border:none; +} +#module_408031432:hover >.module_408031432 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_408031432 .ModulePlainTextGiantContent{margin-top:0px;} +#module_408031432 .ModulePlainTextGiantContent{margin-bottom:0px;} +#module_408031432 .ModulePlainTextGiantContent{margin-left:0px;} +#module_408031432 .ModulePlainTextGiantContent{margin-right:10px;} +#module_408031432 .plainTextGiant-Container{padding-top:10px;} +#module_408031432 .plainTextGiant-Container{padding-bottom:10px;} +#module_408031432 .plainTextGiant-Container{padding-left:10px;} +#module_408031432 .plainTextGiant-Container{padding-right:10px;} +#module_408031432 a{font-size:unset;font-family:unset} +.module_408031454 .ModuleHead .HeadCenter{float:none;} +#module_408031454 { + padding:0px; +} +#module_408031454 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_408031454 .ModuleHead408031454 { + display:none; +} +#module_408031454 .BodyCenter.BodyCenter408031454 { + background:none;background-color:rgba(0,0,0,0); +} +#module_408031454 >.module_408031454 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_408031454 >.module_408031454{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_408031454 .BodyCenter.BodyCenter408031454 { + padding-top:0.0000%; + padding-left:15.6667%; + padding-right:15.6667%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_408031454 .BodyCenter.BodyCenter408031454 { + padding-top:0.0000%; + padding-left:2.8818%; + padding-right:2.8818%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_408031454 >.module_408031454 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_408031454 >.module_408031454 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_408031454 >.module_408031454 {box-shadow: 0px 0px 0px 0px #ccc} +#module_408031454:hover { + border:none; +} +#module_408031454:hover >.module_408031454 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_408031454 .ModulePlainTextGiantContent{margin-top:0px;} +#module_408031454 .ModulePlainTextGiantContent{margin-bottom:0px;} +#module_408031454 .ModulePlainTextGiantContent{margin-left:0px;} +#module_408031454 .ModulePlainTextGiantContent{margin-right:10px;} +#module_408031454 .plainTextGiant-Container{padding-top:10px;} +#module_408031454 .plainTextGiant-Container{padding-bottom:10px;} +#module_408031454 .plainTextGiant-Container{padding-left:10px;} +#module_408031454 .plainTextGiant-Container{padding-right:10px;} +#module_408031454 a{font-size:unset;font-family:unset} +.module_413913840 .ModuleHead .HeadCenter{float:none;} +#module_413913840 { + padding:0px; +} +#module_413913840 { + position:static; + z-index:0; + top:0px; + width:100%; + height: auto; +} +#module_413913840 .ModuleHead413913840 { + display:none; +} +#module_413913840 .BodyCenter.BodyCenter413913840 { + background-color:transparent; + background-image:url(/comdata/92915/202112/20211224115334c8a497.png); + background-size:auto; + background-repeat:no-repeat; + background-position:50% 50%; + background-Attachment:scroll; +} +#module_413913840 >.module_413913840 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413913840 >.module_413913840{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_413913840 .BodyCenter.BodyCenter413913840 { + padding-top:0.5230%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.5230%; + } +} +@media screen and (max-width: 767px){ + #module_413913840 .BodyCenter.BodyCenter413913840 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_413913840 >.module_413913840 { + margin-top:1.0460%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413913840 >.module_413913840 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_413913840 >.module_413913840 {box-shadow: 0px 0px 0px 0px #ccc} +#module_413913840:hover { + border:none; +} +#module_413913840:hover >.module_413913840 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_413913840 .ModuleSubContainer{background-color:transparent;} +#module_413913840 .ModuleSubContainer{background-image:none;} +#module_413913840 .ModuleSubContainer{background-repeat:no-repeat;} +#module_413913840 .ModuleSubContainer{background-position:0% 0%;} +#module_413913840 .ModuleSubContainer{background-attachment:scroll;} +#module_413913840 .ModuleSubContainer{} +#module_413913840 {!bgVideo!}{bgVideoUrl:} +#module_413913840 .gridBgVideo .bgVideoMask{opacity:0.2} +#module_413913840 .ModuleSubContainer{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0); transition: box-shadow 0.5s ease;} +#module_413913840 .ModuleSubContainer:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +.ModuleGridContainer.ModuleGridContainer413913840 {} +.module_413914024 .ModuleHead .HeadCenter{float:none;} +#module_413914024 { + padding:0px; +} +#module_413914024 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_413914024 .ModuleHead413914024 { + display:none; +} +#module_413914024 .BodyCenter.BodyCenter413914024 { + background:none;background-color:rgba(0,0,0,0); +} +#module_413914024 >.module_413914024 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413914024 >.module_413914024{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_413914024 .BodyCenter.BodyCenter413914024 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413914024 .BodyCenter.BodyCenter413914024 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_413914024 >.module_413914024 { + margin-top:0.0000%; + margin-left:25.0000%; + margin-right:0.0000%; + margin-bottom:21.6667%; + } +} +@media screen and (max-width: 767px){ + #module_413914024 >.module_413914024 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_413914024 >.module_413914024 {box-shadow: 0px 0px 0px 0px #ccc} +#module_413914024:hover { + border:none; +} +#module_413914024:hover >.module_413914024 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_413914024 .GraphicUpper .TextImage{border-top-left-radius:0px;} +#module_413914024 .GraphicUpper .TextImage{border-top-right-radius:0px;} +#module_413914024 .GraphicUpper .TextImage{border-bottom-left-radius:0px;} +#module_413914024 .GraphicUpper .TextImage{border-bottom-right-radius:0px;} +#module_413914024 .GraphicUpper{padding-top:0px;} +#module_413914024 .GraphicUpper{padding-bottom:0px;} +#module_413914024 .GraphicUpper{padding-left:0px;} +#module_413914024 .GraphicUpper {padding-right:0px;} +#module_413914024 .GraphicUpper{width:15%;} #module_413914024 .ModuleImageTextContent{width: calc(100% - 15%);} +#module_413914024 .MobileGraphicUpper{width:10%;} #module_413914024 .ModuleMobileImageTextContent{width: calc(100% - 10%);} +#module_413914024 .ModuleImageTextGiantContent{padding-top:0px;} +#module_413914024 .ModuleImageTextGiantContent{padding-bottom:0px;} +#module_413914024 .ModuleImageTextGiantContent{padding-left:15px;} +#module_413914024 .ModuleImageTextGiantContent{padding-right:0px;} +#module_413914024 .normal_ImgtextBox_content{padding-top:0px;} +#module_413914024 .normal_ImgtextBox_content{padding-bottom:30px;} +#module_413914024 .normal_ImgtextBox_content{padding-left:0px;} +#module_413914024 .normal_ImgtextBox_content{padding-right:0px;} +#module_413914024 .normal_ImgtextBox_content{margin-top:0px;margin-bottom:0px;} +#module_413914024 .normal_ImgtextBox_content{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +#module_413914024 .normal_ImgtextBox_content{background-color:transparent;} +#module_413914024 .normal_ImgtextBox_content{background-image:none;} +#module_413914024 .normal_ImgtextBox_content{background-repeat:no-repeat;} +#module_413914024 .normal_ImgtextBox_content{background-position:0% 0%;} +#module_413914024 .normal_ImgtextBox_content{background-attachment:none;} +#module_413914024 .normal_ImgtextBox_content{} +#module_413914024 .normal_ImgtextBox_content{border-top-left-radius:0px;} +#module_413914024 .normal_ImgtextBox_content{border-top-right-radius:0px;} +#module_413914024 .normal_ImgtextBox_content{border-bottom-left-radius:0px;} +#module_413914024 .normal_ImgtextBox_content{border-bottom-right-radius:0px;} +#module_413914024 .normal_ImgtextBox_content{border-top-color:rgba(0,0,0,0);} +#module_413914024 .normal_ImgtextBox_content{border-top-style:none;} +#module_413914024 .normal_ImgtextBox_content{border-top-width:0px;} +#module_413914024 .normal_ImgtextBox_content{border-right-color:rgba(0,0,0,0);} +#module_413914024 .normal_ImgtextBox_content{border-right-style:none;} +#module_413914024 .normal_ImgtextBox_content{border-right-width:0px;} +#module_413914024 .normal_ImgtextBox_content{border-bottom-color:rgba(0,0,0,0);} +#module_413914024 .normal_ImgtextBox_content{border-bottom-style:none;} +#module_413914024 .normal_ImgtextBox_content{border-bottom-width:0px;} +#module_413914024 .normal_ImgtextBox_content{border-left-color:rgba(0,0,0,0);} +#module_413914024 .normal_ImgtextBox_content{border-left-style:none;} +#module_413914024 .normal_ImgtextBox_content{border-left-width:0px;} +#module_413914024 .showHandle .btn{font-size:14px;} +#module_413914024 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_413914024 .showHandle .btn{color:#333;} +#module_413914024 .showHandle .btn{font-weight:400;} +#module_413914024 .showHandle .btn{text-decoration:none;} +#module_413914024 .showHandle .btn{font-style:normal;} +#module_413914024 .showHandle div{border-top-color:#ddd !important;} +#module_413914024 .showHandle div{border-top-style:solid !important;} +#module_413914024 .showHandle div{border-top-width:1px !important;} +#module_413914024 .showHandle{background-color:transparent;} +#module_413914024 .showHandle{background-image:none;} +#module_413914024 .showHandle{background-repeat:no-repeat;} +#module_413914024 .showHandle{} +#module_413914024 .showHandle{} +#module_413914024 .showHandle{} +#module_413914024 .normal_ImgtextBox_content:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +#module_413914024 .normal_ImgtextBox_content:hover{border-top-color:rgba(0,0,0,0);} +#module_413914024 .normal_ImgtextBox_content:hover{border-top-style:none;} +#module_413914024 .normal_ImgtextBox_content:hover{border-right-color:rgba(0,0,0,0);} +#module_413914024 .normal_ImgtextBox_content:hover{border-right-style:none;} +#module_413914024 .normal_ImgtextBox_content:hover{border-bottom-color:rgba(0,0,0,0);} +#module_413914024 .normal_ImgtextBox_content:hover{border-bottom-style:none;} +#module_413914024 .normal_ImgtextBox_content:hover{border-left-color:rgba(0,0,0,0);} +#module_413914024 .normal_ImgtextBox_content:hover{border-left-style:none;} +#module_413914024 a{font-size:unset;font-family:unset} +.module_413914551 .ModuleHead .HeadCenter{float:none;} +#module_413914551 { + padding:0px; +} +#module_413914551 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_413914551 .ModuleHead413914551 { + display:none; +} +#module_413914551 .BodyCenter.BodyCenter413914551 { + background:none;background-color:rgba(0,0,0,0); +} +#module_413914551 >.module_413914551 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413914551 >.module_413914551{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_413914551 .BodyCenter.BodyCenter413914551 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413914551 .BodyCenter.BodyCenter413914551 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_413914551 >.module_413914551 { + margin-top:5.0000%; + margin-left:21.6667%; + margin-right:0.0000%; + margin-bottom:3.3333%; + } +} +@media screen and (max-width: 767px){ + #module_413914551 >.module_413914551 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_413914551 >.module_413914551 {box-shadow: 0px 0px 0px 0px #ccc} +#module_413914551:hover { + border:none; +} +#module_413914551:hover >.module_413914551 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_413914551 .GraphicUpper .TextImage{border-top-left-radius:0px;} +#module_413914551 .GraphicUpper .TextImage{border-top-right-radius:0px;} +#module_413914551 .GraphicUpper .TextImage{border-bottom-left-radius:0px;} +#module_413914551 .GraphicUpper .TextImage{border-bottom-right-radius:0px;} +#module_413914551 .GraphicUpper{padding-top:0px;} +#module_413914551 .GraphicUpper{padding-bottom:0px;} +#module_413914551 .GraphicUpper{padding-left:0px;} +#module_413914551 .GraphicUpper {padding-right:0px;} +#module_413914551 .GraphicUpper{width:15%;} #module_413914551 .ModuleImageTextContent{width: calc(100% - 15%);} +#module_413914551 .MobileGraphicUpper{width:10%;} #module_413914551 .ModuleMobileImageTextContent{width: calc(100% - 10%);} +#module_413914551 .ModuleImageTextGiantContent{padding-top:0px;} +#module_413914551 .ModuleImageTextGiantContent{padding-bottom:0px;} +#module_413914551 .ModuleImageTextGiantContent{padding-left:15px;} +#module_413914551 .ModuleImageTextGiantContent{padding-right:0px;} +#module_413914551 .normal_ImgtextBox_content{padding-top:0px;} +#module_413914551 .normal_ImgtextBox_content{padding-bottom:30px;} +#module_413914551 .normal_ImgtextBox_content{padding-left:0px;} +#module_413914551 .normal_ImgtextBox_content{padding-right:0px;} +#module_413914551 .normal_ImgtextBox_content{margin-top:0px;margin-bottom:0px;} +#module_413914551 .normal_ImgtextBox_content{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +#module_413914551 .normal_ImgtextBox_content{background-color:transparent;} +#module_413914551 .normal_ImgtextBox_content{background-image:none;} +#module_413914551 .normal_ImgtextBox_content{background-repeat:no-repeat;} +#module_413914551 .normal_ImgtextBox_content{background-position:0% 0%;} +#module_413914551 .normal_ImgtextBox_content{background-attachment:none;} +#module_413914551 .normal_ImgtextBox_content{} +#module_413914551 .normal_ImgtextBox_content{border-top-left-radius:0px;} +#module_413914551 .normal_ImgtextBox_content{border-top-right-radius:0px;} +#module_413914551 .normal_ImgtextBox_content{border-bottom-left-radius:0px;} +#module_413914551 .normal_ImgtextBox_content{border-bottom-right-radius:0px;} +#module_413914551 .normal_ImgtextBox_content{border-top-color:rgba(0,0,0,0);} +#module_413914551 .normal_ImgtextBox_content{border-top-style:none;} +#module_413914551 .normal_ImgtextBox_content{border-top-width:0px;} +#module_413914551 .normal_ImgtextBox_content{border-right-color:rgba(0,0,0,0);} +#module_413914551 .normal_ImgtextBox_content{border-right-style:none;} +#module_413914551 .normal_ImgtextBox_content{border-right-width:0px;} +#module_413914551 .normal_ImgtextBox_content{border-bottom-color:rgba(0,0,0,0);} +#module_413914551 .normal_ImgtextBox_content{border-bottom-style:none;} +#module_413914551 .normal_ImgtextBox_content{border-bottom-width:0px;} +#module_413914551 .normal_ImgtextBox_content{border-left-color:rgba(0,0,0,0);} +#module_413914551 .normal_ImgtextBox_content{border-left-style:none;} +#module_413914551 .normal_ImgtextBox_content{border-left-width:0px;} +#module_413914551 .showHandle .btn{font-size:14px;} +#module_413914551 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_413914551 .showHandle .btn{color:#333;} +#module_413914551 .showHandle .btn{font-weight:400;} +#module_413914551 .showHandle .btn{text-decoration:none;} +#module_413914551 .showHandle .btn{font-style:normal;} +#module_413914551 .showHandle div{border-top-color:#ddd !important;} +#module_413914551 .showHandle div{border-top-style:solid !important;} +#module_413914551 .showHandle div{border-top-width:1px !important;} +#module_413914551 .showHandle{background-color:transparent;} +#module_413914551 .showHandle{background-image:none;} +#module_413914551 .showHandle{background-repeat:no-repeat;} +#module_413914551 .showHandle{} +#module_413914551 .showHandle{} +#module_413914551 .showHandle{} +#module_413914551 .normal_ImgtextBox_content:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +#module_413914551 .normal_ImgtextBox_content:hover{border-top-color:rgba(0,0,0,0);} +#module_413914551 .normal_ImgtextBox_content:hover{border-top-style:none;} +#module_413914551 .normal_ImgtextBox_content:hover{border-right-color:rgba(0,0,0,0);} +#module_413914551 .normal_ImgtextBox_content:hover{border-right-style:none;} +#module_413914551 .normal_ImgtextBox_content:hover{border-bottom-color:rgba(0,0,0,0);} +#module_413914551 .normal_ImgtextBox_content:hover{border-bottom-style:none;} +#module_413914551 .normal_ImgtextBox_content:hover{border-left-color:rgba(0,0,0,0);} +#module_413914551 .normal_ImgtextBox_content:hover{border-left-style:none;} +#module_413914551 a{font-size:unset;font-family:unset} +/*ͼÎÄÄ£¿é layout 118*/ +.ModuleImageTextGiant.layout-118 .row{ margin-left:0; margin-right: 0;} +.ModuleImageTextGiant.layout-118 .imageTextGiant-Container{max-height: 100%; max-width: 100%;/*padding: 10px;*/} +.ModuleImageTextGiant.layout-118 .imageTextGiant-Container .ModuleImageTextContent{padding:0; margin: 0px;width: 100%;} +.ModuleImageTextGiant.layout-118 .imageTextGiant-Container .ModuleMobileImageTextContent{width: 100%;} +.ModuleImageTextGiant.layout-118 .imageTextGiant-Container .GraphicUpper{height:auto;padding-left: 0;padding-right: 0} +.ModuleImageTextGiant.layout-118 .imageTextGiant-Container .normal_ImgtextBox_content{align-items: center;display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */ display: -moz-box; /* OLD - Firefox 19- (buggy but mostly works) */ display: -ms-flexbox; /* TWEENER - IE 10 */ display: -webkit-flex; /* NEW - Chrome */ display: flex;} +.ModuleImageTextGiant.layout-118 .imageTextGiant-Container .GraphicUpper{text-align: left; overflow: hidden; display: block; text-align:center; position: relative;} + +@media only screen and (max-width: 767px) { + .ModuleImageTextGiant.layout-118 .imageTextGiant-Container .row .col-xs-8{padding: 0 3px;width: 91.333333%;} +} +@media only screen and (min-width: 768px) { + .ModuleImageTextGiant.layout-118 .col-lg-2 { + width: 10%; + } + .ModuleImageTextGiant.layout-118 .imageTextGiant-Container .normal_ImgtextBox_content .GraphicUpper .TextImage{width: 100%} +}.module_413914554 .ModuleHead .HeadCenter{float:none;} +#module_413914554 { + padding:0px; +} +#module_413914554 { + position:static; + z-index:0; + top:2055px; + left:1192px; + width:100%; + height: auto; +} +#module_413914554 .ModuleHead413914554 { + display:none; +} +#module_413914554 .BodyCenter.BodyCenter413914554 { + background:none;background-color:rgba(0,0,0,0); +} +#module_413914554 >.module_413914554 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413914554 >.module_413914554{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_413914554 .BodyCenter.BodyCenter413914554 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413914554 .BodyCenter.BodyCenter413914554 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_413914554 >.module_413914554 { + margin-top:3.3333%; + margin-left:0.0000%; + margin-right:21.6667%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413914554 >.module_413914554 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_413914554 >.module_413914554 {box-shadow: 0px 0px 0px 0px #ccc} +#module_413914554:hover { + border:none; +} +#module_413914554:hover >.module_413914554 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_413914554 .GraphicUpper .TextImage{border-top-left-radius:0px;} +#module_413914554 .GraphicUpper .TextImage{border-top-right-radius:0px;} +#module_413914554 .GraphicUpper .TextImage{border-bottom-left-radius:0px;} +#module_413914554 .GraphicUpper .TextImage{border-bottom-right-radius:0px;} +#module_413914554 .GraphicUpper .TextImage{border-top-color:rgba(0,0,0,0);} +#module_413914554 .GraphicUpper .TextImage{border-top-style:none;} +#module_413914554 .GraphicUpper .TextImage{border-top-width:0px;} +#module_413914554 .GraphicUpper .TextImage{border-right-color:rgba(0,0,0,0);} +#module_413914554 .GraphicUpper .TextImage{border-right-style:none;} +#module_413914554 .GraphicUpper .TextImage{border-right-width:0px;} +#module_413914554 .GraphicUpper .TextImage{border-bottom-color:rgba(0,0,0,0);} +#module_413914554 .GraphicUpper .TextImage{border-bottom-style:none;} +#module_413914554 .GraphicUpper .TextImage{border-bottom-width:0px;} +#module_413914554 .GraphicUpper .TextImage{border-left-color:rgba(0,0,0,0);} +#module_413914554 .GraphicUpper .TextImage{border-left-style:none;} +#module_413914554 .GraphicUpper .TextImage{border-left-width:0px;} +#module_413914554 .GraphicUpper .TextImage{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +#module_413914554 .GraphicUpper .aBox{margin-top:0px;} +#module_413914554 .GraphicUpper .aBox{margin-bottom:0px;} +#module_413914554 .GraphicUpper .aBox{margin-left:0px;} +#module_413914554 .GraphicUpper .aBox{margin-right:8px;} +#module_413914554 .GraphicUpper{width:20%;} +#module_413914554 .MobileGraphicUpper{width:30%;} +#module_413914554 .ModuleImageTextGiantContent{margin-top:0px;} +#module_413914554 .ModuleImageTextGiantContent{margin-bottom:0px;} +#module_413914554 .ModuleImageTextGiantContent{margin-left:8px;} +#module_413914554 .ModuleImageTextGiantContent{margin-right:0px;} +#module_413914554 .normal_ImgtextBox_content{padding-top:11px;} +#module_413914554 .normal_ImgtextBox_content{padding-bottom:11px;} +#module_413914554 .normal_ImgtextBox_content{padding-left:0px;} +#module_413914554 .normal_ImgtextBox_content{padding-right:0px;} +#module_413914554 .normal_ImgtextBox_content{margin-top:0px;margin-bottom:0px;} +#module_413914554 .normal_ImgtextBox_content{margin-left:0px;margin-right:0px;} +#module_413914554 .normal_ImgtextBox_content{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +#module_413914554 .normal_ImgtextBox_content{background-color:transparent;} +#module_413914554 .normal_ImgtextBox_content{background-image:none;} +#module_413914554 .normal_ImgtextBox_content{background-repeat:no-repeat;} +#module_413914554 .normal_ImgtextBox_content{background-position:0% 0%;} +#module_413914554 .normal_ImgtextBox_content{background-attachment:none;} +#module_413914554 .normal_ImgtextBox_content{} +#module_413914554 .normal_ImgtextBox_content{border-top-left-radius:0px;} +#module_413914554 .normal_ImgtextBox_content{border-top-right-radius:0px;} +#module_413914554 .normal_ImgtextBox_content{border-bottom-left-radius:0px;} +#module_413914554 .normal_ImgtextBox_content{border-bottom-right-radius:0px;} +#module_413914554 .normal_ImgtextBox_content{border-top-color:rgba(0,0,0,0);} +#module_413914554 .normal_ImgtextBox_content{border-top-style:none;} +#module_413914554 .normal_ImgtextBox_content{border-top-width:0px;} +#module_413914554 .normal_ImgtextBox_content{border-right-color:rgba(0,0,0,0);} +#module_413914554 .normal_ImgtextBox_content{border-right-style:none;} +#module_413914554 .normal_ImgtextBox_content{border-right-width:0px;} +#module_413914554 .normal_ImgtextBox_content{border-bottom-color:rgba(0,0,0,0);} +#module_413914554 .normal_ImgtextBox_content{border-bottom-style:none;} +#module_413914554 .normal_ImgtextBox_content{border-bottom-width:0px;} +#module_413914554 .normal_ImgtextBox_content{border-left-color:rgba(0,0,0,0);} +#module_413914554 .normal_ImgtextBox_content{border-left-style:none;} +#module_413914554 .normal_ImgtextBox_content{border-left-width:0px;} +#module_413914554 .showHandle .btn{font-size:14px;} +#module_413914554 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_413914554 .showHandle .btn{color:#333;} +#module_413914554 .showHandle .btn{font-weight:400;} +#module_413914554 .showHandle .btn{text-decoration:none;} +#module_413914554 .showHandle .btn{font-style:normal;} +#module_413914554 .showHandle div{border-top-color:#ddd !important;} +#module_413914554 .showHandle div{border-top-style:solid !important;} +#module_413914554 .showHandle div{border-top-width:1px !important;} +#module_413914554 .showHandle{background-color:transparent;} +#module_413914554 .showHandle{background-image:none;} +#module_413914554 .showHandle{background-repeat:no-repeat;} +#module_413914554 .showHandle{} +#module_413914554 .showHandle{} +#module_413914554 .showHandle{} +#module_413914554 .normal_ImgtextBox_content:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +#module_413914554 .normal_ImgtextBox_content:hover{border-top-color:rgba(0,0,0,0);} +#module_413914554 .normal_ImgtextBox_content:hover{border-top-style:none;} +#module_413914554 .normal_ImgtextBox_content:hover{border-right-color:rgba(0,0,0,0);} +#module_413914554 .normal_ImgtextBox_content:hover{border-right-style:none;} +#module_413914554 .normal_ImgtextBox_content:hover{border-bottom-color:rgba(0,0,0,0);} +#module_413914554 .normal_ImgtextBox_content:hover{border-bottom-style:none;} +#module_413914554 .normal_ImgtextBox_content:hover{border-left-color:rgba(0,0,0,0);} +#module_413914554 .normal_ImgtextBox_content:hover{border-left-style:none;} +#module_413914554 .normal_ImgtextBox_content:hover{border-top-left-radius:0px;} +#module_413914554 .normal_ImgtextBox_content:hover{border-top-right-radius:0px;} +#module_413914554 .normal_ImgtextBox_content:hover{border-bottom-left-radius:0px;} +#module_413914554 .normal_ImgtextBox_content:hover{border-bottom-right-radius:0px;} +#module_413914554 .normal_ImgtextBox_content:hover{background-color:transparent;} +#module_413914554 .normal_ImgtextBox_content:hover{background-image:none;} +#module_413914554 .normal_ImgtextBox_content:hover{background-repeat:no-repeat;} +#module_413914554 .normal_ImgtextBox_content:hover{background-position:0% 0%;} +#module_413914554 .normal_ImgtextBox_content:hover{background-attachment:none;} +#module_413914554 .normal_ImgtextBox_content:hover{} +#module_413914554 a{font-size:unset;font-family:unset} +.module_413914582 .ModuleHead .HeadCenter{float:none;} +#module_413914582 { + padding:0px; +} +#module_413914582 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_413914582 .ModuleHead413914582 { + display:none; +} +#module_413914582 .BodyCenter.BodyCenter413914582 { + background:none;background-color:rgba(0,0,0,0); +} +#module_413914582 >.module_413914582 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413914582 >.module_413914582{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_413914582 .BodyCenter.BodyCenter413914582 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413914582 .BodyCenter.BodyCenter413914582 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_413914582 >.module_413914582 { + margin-top:25.0000%; + margin-left:0.0000%; + margin-right:40.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413914582 >.module_413914582 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_413914582 >.module_413914582 {box-shadow: 0px 0px 0px 0px #ccc} +#module_413914582:hover { + border:none; +} +#module_413914582:hover >.module_413914582 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_413914582 .GraphicUpper .TextImage{border-top-left-radius:0px;} +#module_413914582 .GraphicUpper .TextImage{border-top-right-radius:0px;} +#module_413914582 .GraphicUpper .TextImage{border-bottom-left-radius:0px;} +#module_413914582 .GraphicUpper .TextImage{border-bottom-right-radius:0px;} +#module_413914582 .GraphicUpper .TextImage{border-top-color:rgba(0,0,0,0);} +#module_413914582 .GraphicUpper .TextImage{border-top-style:none;} +#module_413914582 .GraphicUpper .TextImage{border-top-width:0px;} +#module_413914582 .GraphicUpper .TextImage{border-right-color:rgba(0,0,0,0);} +#module_413914582 .GraphicUpper .TextImage{border-right-style:none;} +#module_413914582 .GraphicUpper .TextImage{border-right-width:0px;} +#module_413914582 .GraphicUpper .TextImage{border-bottom-color:rgba(0,0,0,0);} +#module_413914582 .GraphicUpper .TextImage{border-bottom-style:none;} +#module_413914582 .GraphicUpper .TextImage{border-bottom-width:0px;} +#module_413914582 .GraphicUpper .TextImage{border-left-color:rgba(0,0,0,0);} +#module_413914582 .GraphicUpper .TextImage{border-left-style:none;} +#module_413914582 .GraphicUpper .TextImage{border-left-width:0px;} +#module_413914582 .GraphicUpper .TextImage{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +#module_413914582 .GraphicUpper .aBox{margin-top:0px;} +#module_413914582 .GraphicUpper .aBox{margin-bottom:0px;} +#module_413914582 .GraphicUpper .aBox{margin-left:0px;} +#module_413914582 .GraphicUpper .aBox{margin-right:8px;} +#module_413914582 .GraphicUpper{width:20%;} +#module_413914582 .MobileGraphicUpper{width:30%;} +#module_413914582 .ModuleImageTextGiantContent{margin-top:0px;} +#module_413914582 .ModuleImageTextGiantContent{margin-bottom:0px;} +#module_413914582 .ModuleImageTextGiantContent{margin-left:8px;} +#module_413914582 .ModuleImageTextGiantContent{margin-right:0px;} +#module_413914582 .normal_ImgtextBox_content{padding-top:11px;} +#module_413914582 .normal_ImgtextBox_content{padding-bottom:11px;} +#module_413914582 .normal_ImgtextBox_content{padding-left:0px;} +#module_413914582 .normal_ImgtextBox_content{padding-right:0px;} +#module_413914582 .normal_ImgtextBox_content{margin-top:0px;margin-bottom:0px;} +#module_413914582 .normal_ImgtextBox_content{margin-left:0px;margin-right:0px;} +#module_413914582 .normal_ImgtextBox_content{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +#module_413914582 .normal_ImgtextBox_content{background-color:transparent;} +#module_413914582 .normal_ImgtextBox_content{background-image:none;} +#module_413914582 .normal_ImgtextBox_content{background-repeat:no-repeat;} +#module_413914582 .normal_ImgtextBox_content{background-position:0% 0%;} +#module_413914582 .normal_ImgtextBox_content{background-attachment:none;} +#module_413914582 .normal_ImgtextBox_content{} +#module_413914582 .normal_ImgtextBox_content{border-top-left-radius:0px;} +#module_413914582 .normal_ImgtextBox_content{border-top-right-radius:0px;} +#module_413914582 .normal_ImgtextBox_content{border-bottom-left-radius:0px;} +#module_413914582 .normal_ImgtextBox_content{border-bottom-right-radius:0px;} +#module_413914582 .normal_ImgtextBox_content{border-top-color:rgba(0,0,0,0);} +#module_413914582 .normal_ImgtextBox_content{border-top-style:none;} +#module_413914582 .normal_ImgtextBox_content{border-top-width:0px;} +#module_413914582 .normal_ImgtextBox_content{border-right-color:rgba(0,0,0,0);} +#module_413914582 .normal_ImgtextBox_content{border-right-style:none;} +#module_413914582 .normal_ImgtextBox_content{border-right-width:0px;} +#module_413914582 .normal_ImgtextBox_content{border-bottom-color:rgba(0,0,0,0);} +#module_413914582 .normal_ImgtextBox_content{border-bottom-style:none;} +#module_413914582 .normal_ImgtextBox_content{border-bottom-width:0px;} +#module_413914582 .normal_ImgtextBox_content{border-left-color:rgba(0,0,0,0);} +#module_413914582 .normal_ImgtextBox_content{border-left-style:none;} +#module_413914582 .normal_ImgtextBox_content{border-left-width:0px;} +#module_413914582 .showHandle .btn{font-size:14px;} +#module_413914582 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_413914582 .showHandle .btn{color:#333;} +#module_413914582 .showHandle .btn{font-weight:400;} +#module_413914582 .showHandle .btn{text-decoration:none;} +#module_413914582 .showHandle .btn{font-style:normal;} +#module_413914582 .showHandle div{border-top-color:#ddd !important;} +#module_413914582 .showHandle div{border-top-style:solid !important;} +#module_413914582 .showHandle div{border-top-width:1px !important;} +#module_413914582 .showHandle{background-color:transparent;} +#module_413914582 .showHandle{background-image:none;} +#module_413914582 .showHandle{background-repeat:no-repeat;} +#module_413914582 .showHandle{} +#module_413914582 .showHandle{} +#module_413914582 .showHandle{} +#module_413914582 .normal_ImgtextBox_content:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +#module_413914582 .normal_ImgtextBox_content:hover{border-top-color:rgba(0,0,0,0);} +#module_413914582 .normal_ImgtextBox_content:hover{border-top-style:none;} +#module_413914582 .normal_ImgtextBox_content:hover{border-right-color:rgba(0,0,0,0);} +#module_413914582 .normal_ImgtextBox_content:hover{border-right-style:none;} +#module_413914582 .normal_ImgtextBox_content:hover{border-bottom-color:rgba(0,0,0,0);} +#module_413914582 .normal_ImgtextBox_content:hover{border-bottom-style:none;} +#module_413914582 .normal_ImgtextBox_content:hover{border-left-color:rgba(0,0,0,0);} +#module_413914582 .normal_ImgtextBox_content:hover{border-left-style:none;} +#module_413914582 .normal_ImgtextBox_content:hover{border-top-left-radius:0px;} +#module_413914582 .normal_ImgtextBox_content:hover{border-top-right-radius:0px;} +#module_413914582 .normal_ImgtextBox_content:hover{border-bottom-left-radius:0px;} +#module_413914582 .normal_ImgtextBox_content:hover{border-bottom-right-radius:0px;} +#module_413914582 .normal_ImgtextBox_content:hover{background-color:transparent;} +#module_413914582 .normal_ImgtextBox_content:hover{background-image:none;} +#module_413914582 .normal_ImgtextBox_content:hover{background-repeat:no-repeat;} +#module_413914582 .normal_ImgtextBox_content:hover{background-position:0% 0%;} +#module_413914582 .normal_ImgtextBox_content:hover{background-attachment:none;} +#module_413914582 .normal_ImgtextBox_content:hover{} +#module_413914582 a{font-size:unset;font-family:unset} +.module_413916525 .ModuleHead .HeadCenter{float:none;} +#module_413916525 { + padding:0px; +} +#module_413916525 { + position:static; + z-index:0; + top:0px; + width:100%; + height: auto; +} +#module_413916525 .ModuleHead413916525 { + display:none; +} + +#module_413916525 .ModuleSubContainer{background-color:transparent;} +#module_413916525 .ModuleSubContainer{} +#module_413916525 .ModuleSubContainer{background-repeat:no-repeat;} +#module_413916525 .ModuleSubContainer{background-position:0% 0%;} +#module_413916525 .ModuleSubContainer{background-attachment:scroll;} +#module_413916525 .ModuleSubContainer{} +#module_413916525 {!bgVideo!}{bgVideoUrl:} +#module_413916525 .gridBgVideo .bgVideoMask{opacity:0.2} +#module_413916525 .ModuleSubContainer{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0); transition: box-shadow 0.5s ease;} +#module_413916525 .ModuleSubContainer:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +.ModuleGridContainer.ModuleGridContainer413916525 {} +.module_413916527 .ModuleHead .HeadCenter{float:none;} +#module_413916527 { + padding:0px; +} +#module_413916527 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_413916527 .ModuleHead413916527 { + display:none; +} +#module_413916527 .BodyCenter.BodyCenter413916527 { + background:none;background-color:rgba(0,0,0,0); +} +#module_413916527 >.module_413916527 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413916527 >.module_413916527{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_413916527 .BodyCenter.BodyCenter413916527 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_413916527 .BodyCenter.BodyCenter413916527 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_413916527 >.module_413916527 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_413916527 >.module_413916527 { + margin-top:0.0000%; + margin-left:1.4409%; + margin-right:1.4409%; + margin-bottom:0.0000%; + } +} +#module_413916527 >.module_413916527 {box-shadow: 0px 0px 0px 0px #ccc} +#module_413916527:hover { + border:none; +} +#module_413916527:hover >.module_413916527 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_413916527 .GraphicUpper .TextImage{border-top-left-radius:0px;} +#module_413916527 .GraphicUpper .TextImage{border-top-right-radius:0px;} +#module_413916527 .GraphicUpper .TextImage{border-bottom-left-radius:0px;} +#module_413916527 .GraphicUpper .TextImage{border-bottom-right-radius:0px;} +#module_413916527 .GraphicUpper{padding-top:0px;} +#module_413916527 .GraphicUpper{padding-bottom:0px;} +#module_413916527 .GraphicUpper{padding-left:0px;} +#module_413916527 .GraphicUpper {padding-right:0px;} +#module_413916527 .GraphicUpper{width:10%;} #module_413916527 .ModuleImageTextContent{width: calc(100% - 10%);} +#module_413916527 .MobileGraphicUpper{width:20%;} #module_413916527 .ModuleMobileImageTextContent{width: calc(100% - 20%);} +#module_413916527 .ModuleImageTextGiantContent{padding-top:0px;} +#module_413916527 .ModuleImageTextGiantContent{padding-bottom:0px;} +#module_413916527 .ModuleImageTextGiantContent{padding-left:15px;} +#module_413916527 .ModuleImageTextGiantContent{padding-right:0px;} +#module_413916527 .normal_ImgtextBox_content{padding-top:0px;} +#module_413916527 .normal_ImgtextBox_content{padding-bottom:30px;} +#module_413916527 .normal_ImgtextBox_content{padding-left:5px;} +#module_413916527 .normal_ImgtextBox_content{padding-right:5px;} +#module_413916527 .normal_ImgtextBox_content{margin-top:0px;margin-bottom:0px;} +#module_413916527 .normal_ImgtextBox_content{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +#module_413916527 .normal_ImgtextBox_content{background-color:transparent;} +#module_413916527 .normal_ImgtextBox_content{background-image:none;} +#module_413916527 .normal_ImgtextBox_content{background-repeat:no-repeat;} +#module_413916527 .normal_ImgtextBox_content{background-position:0% 0%;} +#module_413916527 .normal_ImgtextBox_content{background-attachment:none;} +#module_413916527 .normal_ImgtextBox_content{} +#module_413916527 .normal_ImgtextBox_content{border-top-left-radius:0px;} +#module_413916527 .normal_ImgtextBox_content{border-top-right-radius:0px;} +#module_413916527 .normal_ImgtextBox_content{border-bottom-left-radius:0px;} +#module_413916527 .normal_ImgtextBox_content{border-bottom-right-radius:0px;} +#module_413916527 .normal_ImgtextBox_content{border-top-color:rgba(0,0,0,0);} +#module_413916527 .normal_ImgtextBox_content{border-top-style:none;} +#module_413916527 .normal_ImgtextBox_content{border-top-width:0px;} +#module_413916527 .normal_ImgtextBox_content{border-right-color:rgba(0,0,0,0);} +#module_413916527 .normal_ImgtextBox_content{border-right-style:none;} +#module_413916527 .normal_ImgtextBox_content{border-right-width:0px;} +#module_413916527 .normal_ImgtextBox_content{border-bottom-color:rgba(0,0,0,0);} +#module_413916527 .normal_ImgtextBox_content{border-bottom-style:none;} +#module_413916527 .normal_ImgtextBox_content{border-bottom-width:0px;} +#module_413916527 .normal_ImgtextBox_content{border-left-color:rgba(0,0,0,0);} +#module_413916527 .normal_ImgtextBox_content{border-left-style:none;} +#module_413916527 .normal_ImgtextBox_content{border-left-width:0px;} +#module_413916527 .showHandle .btn{font-size:14px;} +#module_413916527 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_413916527 .showHandle .btn{color:#333;} +#module_413916527 .showHandle .btn{font-weight:400;} +#module_413916527 .showHandle .btn{text-decoration:none;} +#module_413916527 .showHandle .btn{font-style:normal;} +#module_413916527 .showHandle div{border-top-color:#ddd !important;} +#module_413916527 .showHandle div{border-top-style:solid !important;} +#module_413916527 .showHandle div{border-top-width:1px !important;} +#module_413916527 .showHandle{background-color:transparent;} +#module_413916527 .showHandle{background-image:none;} +#module_413916527 .showHandle{background-repeat:no-repeat;} +#module_413916527 .showHandle{} +#module_413916527 .showHandle{} +#module_413916527 .showHandle{} +#module_413916527 .normal_ImgtextBox_content:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +#module_413916527 .normal_ImgtextBox_content:hover{border-top-color:rgba(0,0,0,0);} +#module_413916527 .normal_ImgtextBox_content:hover{border-top-style:none;} +#module_413916527 .normal_ImgtextBox_content:hover{border-right-color:rgba(0,0,0,0);} +#module_413916527 .normal_ImgtextBox_content:hover{border-right-style:none;} +#module_413916527 .normal_ImgtextBox_content:hover{border-bottom-color:rgba(0,0,0,0);} +#module_413916527 .normal_ImgtextBox_content:hover{border-bottom-style:none;} +#module_413916527 .normal_ImgtextBox_content:hover{border-left-color:rgba(0,0,0,0);} +#module_413916527 .normal_ImgtextBox_content:hover{border-left-style:none;} +#module_413916527 a{font-size:unset;font-family:unset} +.module_413916528 .ModuleHead .HeadCenter{float:none;} +#module_413916528 { + padding:0px; +} +#module_413916528 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_413916528 .ModuleHead413916528 { + display:none; +} +#module_413916528 .BodyCenter.BodyCenter413916528 { + background:none;background-color:rgba(0,0,0,0); +} +#module_413916528 >.module_413916528 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413916528 >.module_413916528{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_413916528 .BodyCenter.BodyCenter413916528 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_413916528 .BodyCenter.BodyCenter413916528 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_413916528 >.module_413916528 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_413916528 >.module_413916528 { + margin-top:0.0000%; + margin-left:1.4409%; + margin-right:1.4409%; + margin-bottom:0.0000%; + } +} +#module_413916528 >.module_413916528 {box-shadow: 0px 0px 0px 0px #ccc} +#module_413916528:hover { + border:none; +} +#module_413916528:hover >.module_413916528 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_413916528 .GraphicUpper .TextImage{border-top-left-radius:0px;} +#module_413916528 .GraphicUpper .TextImage{border-top-right-radius:0px;} +#module_413916528 .GraphicUpper .TextImage{border-bottom-left-radius:0px;} +#module_413916528 .GraphicUpper .TextImage{border-bottom-right-radius:0px;} +#module_413916528 .GraphicUpper{padding-top:0px;} +#module_413916528 .GraphicUpper{padding-bottom:0px;} +#module_413916528 .GraphicUpper{padding-left:0px;} +#module_413916528 .GraphicUpper {padding-right:0px;} +#module_413916528 .GraphicUpper{width:10%;} #module_413916528 .ModuleImageTextContent{width: calc(100% - 10%);} +#module_413916528 .MobileGraphicUpper{width:20%;} #module_413916528 .ModuleMobileImageTextContent{width: calc(100% - 20%);} +#module_413916528 .ModuleImageTextGiantContent{padding-top:0px;} +#module_413916528 .ModuleImageTextGiantContent{padding-bottom:0px;} +#module_413916528 .ModuleImageTextGiantContent{padding-left:15px;} +#module_413916528 .ModuleImageTextGiantContent{padding-right:0px;} +#module_413916528 .normal_ImgtextBox_content{padding-top:0px;} +#module_413916528 .normal_ImgtextBox_content{padding-bottom:30px;} +#module_413916528 .normal_ImgtextBox_content{padding-left:5px;} +#module_413916528 .normal_ImgtextBox_content{padding-right:5px;} +#module_413916528 .normal_ImgtextBox_content{margin-top:0px;margin-bottom:0px;} +#module_413916528 .normal_ImgtextBox_content{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +#module_413916528 .normal_ImgtextBox_content{background-color:transparent;} +#module_413916528 .normal_ImgtextBox_content{background-image:none;} +#module_413916528 .normal_ImgtextBox_content{background-repeat:no-repeat;} +#module_413916528 .normal_ImgtextBox_content{background-position:0% 0%;} +#module_413916528 .normal_ImgtextBox_content{background-attachment:none;} +#module_413916528 .normal_ImgtextBox_content{} +#module_413916528 .normal_ImgtextBox_content{border-top-left-radius:0px;} +#module_413916528 .normal_ImgtextBox_content{border-top-right-radius:0px;} +#module_413916528 .normal_ImgtextBox_content{border-bottom-left-radius:0px;} +#module_413916528 .normal_ImgtextBox_content{border-bottom-right-radius:0px;} +#module_413916528 .normal_ImgtextBox_content{border-top-color:rgba(0,0,0,0);} +#module_413916528 .normal_ImgtextBox_content{border-top-style:none;} +#module_413916528 .normal_ImgtextBox_content{border-top-width:0px;} +#module_413916528 .normal_ImgtextBox_content{border-right-color:rgba(0,0,0,0);} +#module_413916528 .normal_ImgtextBox_content{border-right-style:none;} +#module_413916528 .normal_ImgtextBox_content{border-right-width:0px;} +#module_413916528 .normal_ImgtextBox_content{border-bottom-color:rgba(0,0,0,0);} +#module_413916528 .normal_ImgtextBox_content{border-bottom-style:none;} +#module_413916528 .normal_ImgtextBox_content{border-bottom-width:0px;} +#module_413916528 .normal_ImgtextBox_content{border-left-color:rgba(0,0,0,0);} +#module_413916528 .normal_ImgtextBox_content{border-left-style:none;} +#module_413916528 .normal_ImgtextBox_content{border-left-width:0px;} +#module_413916528 .showHandle .btn{font-size:14px;} +#module_413916528 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_413916528 .showHandle .btn{color:#333;} +#module_413916528 .showHandle .btn{font-weight:400;} +#module_413916528 .showHandle .btn{text-decoration:none;} +#module_413916528 .showHandle .btn{font-style:normal;} +#module_413916528 .showHandle div{border-top-color:#ddd !important;} +#module_413916528 .showHandle div{border-top-style:solid !important;} +#module_413916528 .showHandle div{border-top-width:1px !important;} +#module_413916528 .showHandle{background-color:transparent;} +#module_413916528 .showHandle{background-image:none;} +#module_413916528 .showHandle{background-repeat:no-repeat;} +#module_413916528 .showHandle{} +#module_413916528 .showHandle{} +#module_413916528 .showHandle{} +#module_413916528 .normal_ImgtextBox_content:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +#module_413916528 .normal_ImgtextBox_content:hover{border-top-color:rgba(0,0,0,0);} +#module_413916528 .normal_ImgtextBox_content:hover{border-top-style:none;} +#module_413916528 .normal_ImgtextBox_content:hover{border-right-color:rgba(0,0,0,0);} +#module_413916528 .normal_ImgtextBox_content:hover{border-right-style:none;} +#module_413916528 .normal_ImgtextBox_content:hover{border-bottom-color:rgba(0,0,0,0);} +#module_413916528 .normal_ImgtextBox_content:hover{border-bottom-style:none;} +#module_413916528 .normal_ImgtextBox_content:hover{border-left-color:rgba(0,0,0,0);} +#module_413916528 .normal_ImgtextBox_content:hover{border-left-style:none;} +#module_413916528 a{font-size:unset;font-family:unset} +.module_408031882 .ModuleHead .HeadCenter{float:none;} +#module_408031882 { + padding:0px; +} +#module_408031882 { + position:static; + z-index:0; + top:0px; + width:100%; + height: auto; +} +#module_408031882 .ModuleHead408031882 { + display:none; +} +#module_408031882 .BodyCenter.BodyCenter408031882 { + background:none;background-color:rgba(0,0,0,0); +} +#module_408031882 >.module_408031882 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_408031882 >.module_408031882{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_408031882 .BodyCenter.BodyCenter408031882 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_408031882 .BodyCenter.BodyCenter408031882 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_408031882 >.module_408031882 { + margin-top:1.0460%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_408031882 >.module_408031882 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_408031882 >.module_408031882 {box-shadow: 0px 0px 0px 0px #ccc} +#module_408031882:hover { + border:none; +} +#module_408031882:hover >.module_408031882 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_408031882 .ModuleSubContainer{background-color:transparent;} +#module_408031882 .ModuleSubContainer{background-image:none;} +#module_408031882 .ModuleSubContainer{background-repeat:no-repeat;} +#module_408031882 .ModuleSubContainer{background-position:0% 0%;} +#module_408031882 .ModuleSubContainer{background-attachment:scroll;} +#module_408031882 .ModuleSubContainer{} +#module_408031882 {!bgVideo!}{bgVideoUrl:} +#module_408031882 .gridBgVideo .bgVideoMask{opacity:0.2} +#module_408031882 .ModuleSubContainer{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0); transition: box-shadow 0.5s ease;} +#module_408031882 .ModuleSubContainer:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +.ModuleGridContainer.ModuleGridContainer408031882 {} +.module_408032543 .ModuleHead .HeadCenter{float:none;} +#module_408032543 { + padding:0px; +} +#module_408032543 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_408032543 .ModuleHead408032543 { + display:none; +} +#module_408032543 .BodyCenter.BodyCenter408032543 { + background:none;background-color:rgba(0,0,0,0); +} +#module_408032543 >.module_408032543 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_408032543 >.module_408032543{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_408032543 .BodyCenter.BodyCenter408032543 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_408032543 .BodyCenter.BodyCenter408032543 { + padding-top:0.0000%; + padding-left:2.8818%; + padding-right:2.8818%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_408032543 >.module_408032543 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_408032543 >.module_408032543 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_408032543 >.module_408032543 {box-shadow: 0px 0px 0px 0px #ccc} +#module_408032543:hover { + border:none; +} +#module_408032543:hover >.module_408032543 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_408032543 .ModulePlainTextGiantContent{margin-top:0px;} +#module_408032543 .ModulePlainTextGiantContent{margin-bottom:0px;} +#module_408032543 .ModulePlainTextGiantContent{margin-left:0px;} +#module_408032543 .ModulePlainTextGiantContent{margin-right:10px;} +#module_408032543 .plainTextGiant-Container{padding-top:10px;} +#module_408032543 .plainTextGiant-Container{padding-bottom:10px;} +#module_408032543 .plainTextGiant-Container{padding-left:10px;} +#module_408032543 .plainTextGiant-Container{padding-right:10px;} +#module_408032543 a{font-size:unset;font-family:unset} +.module_413916618 .ModuleHead .HeadCenter{float:none;} +#module_413916618 { + padding:0px; +} +#module_413916618 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_413916618 .ModuleHead413916618 { + display:none; +} +#module_413916618 .BodyCenter.BodyCenter413916618 { + background:none;background-color:rgba(0,0,0,0); +} +#module_413916618 >.module_413916618 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413916618 >.module_413916618{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_413916618 .BodyCenter.BodyCenter413916618 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413916618 .BodyCenter.BodyCenter413916618 { + padding-top:0.0000%; + padding-left:2.8818%; + padding-right:2.8818%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_413916618 >.module_413916618 { + margin-top:1.6667%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:1.6667%; + } +} +@media screen and (max-width: 767px){ + #module_413916618 >.module_413916618 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_413916618 >.module_413916618 {box-shadow: 0px 0px 0px 0px #ccc} +#module_413916618:hover { + border:none; +} +#module_413916618:hover >.module_413916618 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_413916618 img{border-top-color:transparent;} +#module_413916618 img{border-top-style:none;} +#module_413916618 img{border-top-width:0px;} +#module_413916618 img{border-right-color:transparent;} +#module_413916618 img{border-right-style:none;} +#module_413916618 img{border-right-width:0px;} +#module_413916618 img{border-bottom-color:transparent;} +#module_413916618 img{border-bottom-style:none;} +#module_413916618 img{border-bottom-width:0px;} +#module_413916618 img{border-left-color:transparent;} +#module_413916618 img{border-left-style:none;} +#module_413916618 img{border-left-width:0px;} +#module_413916618 img{border-top-left-radius:0px;} +#module_413916618 img{border-top-right-radius:0px;} +#module_413916618 img{border-bottom-left-radius:0px;} +#module_413916618 img{border-bottom-right-radius:0px;} +#module_413916618 .BodyCenter{text-align: center;} + +.module_413920432 .ModuleHead .HeadCenter{float:none;} +#module_413920432 { + padding:0px; +} +#module_413920432 { + position:static; + z-index:0; + top:0px; + width:100%; + height: auto; +} +#module_413920432 .ModuleHead413920432 { + display:none; +} +#module_413920432 .BodyCenter.BodyCenter413920432 { + background-color:transparent; + background-image:url(/comdata/92915/202112/2021122415342194d45f.png); + background-size:auto; + background-repeat:no-repeat; + background-position:50% 50%; + background-Attachment:scroll; +} +#module_413920432 >.module_413920432 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413920432 >.module_413920432{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_413920432 .BodyCenter.BodyCenter413920432 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413920432 .BodyCenter.BodyCenter413920432 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_413920432 >.module_413920432 { + margin-top:4.1841%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:1.5690%; + } +} +@media screen and (max-width: 767px){ + #module_413920432 >.module_413920432 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_413920432 >.module_413920432 {box-shadow: 0px 0px 0px 0px #ccc} +#module_413920432:hover { + border:none; +} +#module_413920432:hover >.module_413920432 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_413920432 .ModuleSubContainer{background-color:transparent;} +#module_413920432 .ModuleSubContainer{background-image:none;} +#module_413920432 .ModuleSubContainer{background-repeat:no-repeat;} +#module_413920432 .ModuleSubContainer{background-position:0% 0%;} +#module_413920432 .ModuleSubContainer{background-attachment:scroll;} +#module_413920432 .ModuleSubContainer{} +#module_413920432 {!bgVideo!}{bgVideoUrl:} +#module_413920432 .gridBgVideo .bgVideoMask{opacity:0.2} +#module_413920432 .ModuleSubContainer{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0); transition: box-shadow 0.5s ease;} +#module_413920432 .ModuleSubContainer:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +.ModuleGridContainer.ModuleGridContainer413920432 {} +.module_408044075 .ModuleHead .HeadCenter{float:none;} +#module_408044075 { + padding:0px; +} +#module_408044075 { + position:static; + z-index:0; + top:3334px; + left:972px; + width:100%; + height: auto; +} +#module_408044075 .ModuleHead408044075 { + display:none; +} +#module_408044075 .BodyCenter.BodyCenter408044075 { + background:none;background-color:rgba(0,0,0,0); +} +#module_408044075 >.module_408044075 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_408044075 >.module_408044075{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_408044075 .BodyCenter.BodyCenter408044075 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_408044075 .BodyCenter.BodyCenter408044075 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_408044075 >.module_408044075 { + margin-top:4.1667%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_408044075 >.module_408044075 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_408044075 >.module_408044075 {box-shadow: 0px 0px 0px 0px #ccc} +#module_408044075:hover { + border:none; +} +#module_408044075:hover >.module_408044075 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_408044075 .ModulePlainTextGiantContent{margin-top:0px;} +#module_408044075 .ModulePlainTextGiantContent{margin-bottom:0px;} +#module_408044075 .ModulePlainTextGiantContent{margin-left:0px;} +#module_408044075 .ModulePlainTextGiantContent{margin-right:10px;} +#module_408044075 .plainTextGiant-Container{padding-top:10px;} +#module_408044075 .plainTextGiant-Container{padding-bottom:10px;} +#module_408044075 .plainTextGiant-Container{padding-left:10px;} +#module_408044075 .plainTextGiant-Container{padding-right:10px;} +#module_408044075 a{font-size:unset;font-family:unset} +.module_413920507 .ModuleHead .HeadCenter{float:none;} +#module_413920507 { + padding:0px; +} +#module_413920507 { + position:static; + z-index:0; + top:3530px; + left:1251px; + width:100%; + height: auto; +} +#module_413920507 .ModuleHead413920507 { + display:none; +} +#module_413920507 .BodyCenter.BodyCenter413920507 { + background:none;background-color:rgba(0,0,0,0); +} +#module_413920507 >.module_413920507 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413920507 >.module_413920507{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_413920507 .BodyCenter.BodyCenter413920507 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_413920507 .BodyCenter.BodyCenter413920507 { + padding-top:0.0000%; + padding-left:2.8818%; + padding-right:2.8818%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_413920507 >.module_413920507 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_413920507 >.module_413920507 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_413920507 >.module_413920507 {box-shadow: 0px 0px 0px 0px #ccc} +#module_413920507:hover { + border:none; +} +#module_413920507:hover >.module_413920507 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_413920507 .ModulePlainTextGiantContent{margin-top:0px;} +#module_413920507 .ModulePlainTextGiantContent{margin-bottom:0px;} +#module_413920507 .ModulePlainTextGiantContent{margin-left:0px;} +#module_413920507 .ModulePlainTextGiantContent{margin-right:10px;} +#module_413920507 .plainTextGiant-Container{padding-top:10px;} +#module_413920507 .plainTextGiant-Container{padding-bottom:10px;} +#module_413920507 .plainTextGiant-Container{padding-left:10px;} +#module_413920507 .plainTextGiant-Container{padding-right:10px;} +#module_413920507 a{font-size:unset;font-family:unset} +.module_413921624 .ModuleHead .HeadCenter{float:none;} +#module_413921624 { + padding:0px; +} +#module_413921624 { + position:static; + z-index:0; + top:0px; + width:100%; + height: auto; +} +#module_413921624 .ModuleHead413921624 { + display:none; +} +#module_413921624 .BodyCenter.BodyCenter413921624 { + background:none;background-color:rgba(0,0,0,0); +} +#module_413921624 >.module_413921624 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413921624 >.module_413921624{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_413921624 .BodyCenter.BodyCenter413921624 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413921624 .BodyCenter.BodyCenter413921624 { + padding-top:5.7637%; + padding-left:5.7637%; + padding-right:5.7637%; + padding-bottom:5.7637%; + } +} +@media screen and (min-width: 768px){ + #module_413921624 >.module_413921624 { + margin-top:0.8333%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.8333%; + } +} +@media screen and (max-width: 767px){ + #module_413921624 >.module_413921624 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_413921624 >.module_413921624 {box-shadow: 0px 0px 0px 0px #ccc} +#module_413921624:hover { + border:none; +} +#module_413921624:hover >.module_413921624 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_413921624 img{border-top-color:transparent;} +#module_413921624 img{border-top-style:none;} +#module_413921624 img{border-top-width:0px;} +#module_413921624 img{border-right-color:transparent;} +#module_413921624 img{border-right-style:none;} +#module_413921624 img{border-right-width:0px;} +#module_413921624 img{border-bottom-color:transparent;} +#module_413921624 img{border-bottom-style:none;} +#module_413921624 img{border-bottom-width:0px;} +#module_413921624 img{border-left-color:transparent;} +#module_413921624 img{border-left-style:none;} +#module_413921624 img{border-left-width:0px;} +#module_413921624 img{border-top-left-radius:0px;} +#module_413921624 img{border-top-right-radius:0px;} +#module_413921624 img{border-bottom-left-radius:0px;} +#module_413921624 img{border-bottom-right-radius:0px;} +#module_413921624 .BodyCenter{text-align: center;} + +.module_413922371 .ModuleHead .HeadCenter{float:none;} +#module_413922371 { + padding:0px; +} +#module_413922371 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_413922371 .ModuleHead413922371 { + display:none; +} +#module_413922371 .BodyCenter.BodyCenter413922371 { + background:none;background-color:rgba(0,0,0,0); +} +#module_413922371 >.module_413922371 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_413922371 >.module_413922371{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_413922371 .BodyCenter.BodyCenter413922371 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_413922371 .BodyCenter.BodyCenter413922371 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_413922371 >.module_413922371 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:35.8333%; + } +} +@media screen and (max-width: 767px){ + #module_413922371 >.module_413922371 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_413922371 >.module_413922371 {box-shadow: 0px 0px 0px 0px #ccc} +#module_413922371:hover { + border:none; +} +#module_413922371:hover >.module_413922371 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_413922371 .ModulePlainTextGiantContent{margin-top:0px;} +#module_413922371 .ModulePlainTextGiantContent{margin-bottom:0px;} +#module_413922371 .ModulePlainTextGiantContent{margin-left:0px;} +#module_413922371 .ModulePlainTextGiantContent{margin-right:10px;} +#module_413922371 .plainTextGiant-Container{padding-top:10px;} +#module_413922371 .plainTextGiant-Container{padding-bottom:10px;} +#module_413922371 .plainTextGiant-Container{padding-left:10px;} +#module_413922371 .plainTextGiant-Container{padding-right:10px;} +#module_413922371 a{font-size:unset;font-family:unset} +.module_414180803 .ModuleHead .HeadCenter{float:none;} +#module_414180803 { + padding:0px; +} +#module_414180803 { + position:static; + z-index:0; + top:4436px; + left:1820px; + width:100%; + height: auto; +} +#module_414180803 .ModuleHead414180803 { + display:none; +} + +#module_414180803 .ModuleSubContainer{background-color:transparent;} +#module_414180803 .ModuleSubContainer{} +#module_414180803 .ModuleSubContainer{background-repeat:no-repeat;} +#module_414180803 .ModuleSubContainer{background-position:0% 0%;} +#module_414180803 .ModuleSubContainer{background-attachment:scroll;} +#module_414180803 .ModuleSubContainer{} +#module_414180803 {!bgVideo!}{bgVideoUrl:} +#module_414180803 .gridBgVideo .bgVideoMask{opacity:0.2} +#module_414180803 .ModuleSubContainer{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0); transition: box-shadow 0.5s ease;} +#module_414180803 .ModuleSubContainer:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +.ModuleGridContainer.ModuleGridContainer414180803 {} +.module_414180809 .ModuleHead .HeadCenter{float:none;} +#module_414180809 { + padding:0px; +} +#module_414180809 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_414180809 .ModuleHead414180809 { + display:none; +} + +#module_414180809 .ModulePlainTextGiantContent{margin-top:0px;} +#module_414180809 .ModulePlainTextGiantContent{margin-bottom:0px;} +#module_414180809 .ModulePlainTextGiantContent{margin-left:0px;} +#module_414180809 .ModulePlainTextGiantContent{margin-right:10px;} +#module_414180809 .plainTextGiant-Container{padding-top:10px;} +#module_414180809 .plainTextGiant-Container{padding-bottom:10px;} +#module_414180809 .plainTextGiant-Container{padding-left:10px;} +#module_414180809 .plainTextGiant-Container{padding-right:10px;} +#module_414180809 a{font-size:unset;font-family:unset} +.module_414180084 .ModuleHead .HeadCenter{float:none;} +#module_414180084 { + padding:0px; +} +#module_414180084 { + position:static; + z-index:0; + top:0px; + width:100%; + height: auto; +} +#module_414180084 .ModuleHead414180084 { + display:none; +} +#module_414180084 .BodyCenter.BodyCenter414180084 { + background:none;background-color:rgba(0,0,0,0); +} +#module_414180084 >.module_414180084 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_414180084 >.module_414180084{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_414180084 .BodyCenter.BodyCenter414180084 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_414180084 .BodyCenter.BodyCenter414180084 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_414180084 >.module_414180084 { + margin-top:-22.4895%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_414180084 >.module_414180084 { + margin-top:5.7637%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:5.7637%; + } +} +#module_414180084 >.module_414180084 {box-shadow: 0px 0px 0px 0px #ccc} +#module_414180084:hover { + border:none; +} +#module_414180084:hover >.module_414180084 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_414180084 .ModuleSubContainer{background-color:transparent;} +#module_414180084 .ModuleSubContainer{background-image:none;} +#module_414180084 .ModuleSubContainer{background-repeat:no-repeat;} +#module_414180084 .ModuleSubContainer{background-position:0% 0%;} +#module_414180084 .ModuleSubContainer{background-attachment:scroll;} +#module_414180084 .ModuleSubContainer{} +#module_414180084 {!bgVideo!}{bgVideoUrl:} +#module_414180084 .gridBgVideo .bgVideoMask{opacity:0.2} +#module_414180084 .ModuleSubContainer{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0); transition: box-shadow 0.5s ease;} +#module_414180084 .ModuleSubContainer:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +.ModuleGridContainer.ModuleGridContainer414180084 {} +.module_414180085 .ModuleHead .HeadCenter{float:none;} +#module_414180085 { + padding:0px; +} +#module_414180085 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_414180085 .ModuleHead414180085 { + display:none; +} + +#module_414180085 .ModuleHoverBoxItem_1{background-color:#fff;} +#module_414180085 .ModuleHoverBoxItem_1{} +#module_414180085 .ModuleHoverBoxItem_1{background-repeat:no-repeat;} +#module_414180085 .ModuleHoverBoxItem_1{} +#module_414180085 .ModuleHoverBoxItem_1{background-attachment:scroll;} +#module_414180085 .ModuleHoverBoxItem_1{} +#module_414180085 .ModuleHoverBoxItem_1{padding-top:0px;} +#module_414180085 .ModuleHoverBoxItem_1{padding-bottom:0px;} +#module_414180085 .ModuleHoverBoxItem_1{padding-left:0px;} +#module_414180085 .ModuleHoverBoxItem_1{padding-right:0px;} +#module_414180085 .ModuleHoverBoxItem_2{background-color:#fff;} +#module_414180085 .ModuleHoverBoxItem_2{} +#module_414180085 .ModuleHoverBoxItem_2{background-repeat:no-repeat;} +#module_414180085 .ModuleHoverBoxItem_2{} +#module_414180085 .ModuleHoverBoxItem_2{background-attachment:scroll;} +#module_414180085 .ModuleHoverBoxItem_2{} +#module_414180085 .ModuleHoverBoxItem_2{padding-top:0px;} +#module_414180085 .ModuleHoverBoxItem_2{padding-bottom:0px;} +#module_414180085 .ModuleHoverBoxItem_2{padding-left:0px;} +#module_414180085 .ModuleHoverBoxItem_2{padding-right:0px;} +#module_414180085 .ModuleHoverBoxItem_2 .ModuleItem{opacity:1} +/*ͼÎÄÄ£¿é layout 101*/ +.ModuleImageTextGiant.layout-101 {font-size: 14px;} +.ModuleImageTextGiant.layout-101 .imageTextGiant-Container{height: auto; word-wrap: break-word;max-height: 100%;padding:10px;max-width: 100%; overflow: hidden; position: relative;}.module_414180088 .ModuleHead .HeadCenter{float:none;} +#module_414180088 { + padding:0px; +} +#module_414180088 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_414180088 .ModuleHead414180088 { + display:none; +} +#module_414180088 .BodyCenter.BodyCenter414180088 { + background:none;background-color:rgba(0,0,0,0); +} +#module_414180088 >.module_414180088 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_414180088 >.module_414180088{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:15px; + border-top-right-radius:15px; + border-bottom-left-radius:15px; + border-bottom-right-radius:15px; +} +@media screen and (min-width: 768px){ + #module_414180088 .BodyCenter.BodyCenter414180088 { + padding-top:20.0000%; + padding-left:12.5000%; + padding-right:12.5000%; + padding-bottom:20.0000%; + } +} +@media screen and (max-width: 767px){ + #module_414180088 .BodyCenter.BodyCenter414180088 { + padding-top:5.7637%; + padding-left:8.6455%; + padding-right:8.6455%; + padding-bottom:5.7637%; + } +} +@media screen and (min-width: 768px){ + #module_414180088 >.module_414180088 { + margin-top:2.5000%; + margin-left:5.0000%; + margin-right:5.0000%; + margin-bottom:2.5000%; + } +} +@media screen and (max-width: 767px){ + #module_414180088 >.module_414180088 { + margin-top:2.8818%; + margin-left:5.7637%; + margin-right:5.7637%; + margin-bottom:2.8818%; + } +} +#module_414180088 >.module_414180088 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242)} +#module_414180088:hover { + border:none; +} +#module_414180088:hover >.module_414180088 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242);transition: box-shadow 0.5s ease 0s;} + +#module_414180088 .ModuleImageTextGiantContent{margin-top:0px;} +#module_414180088 .ModuleImageTextGiantContent{margin-bottom:0px;} +#module_414180088 .ModuleImageTextGiantContent{margin-left:0px;} +#module_414180088 .ModuleImageTextGiantContent{margin-right:0px;} +#module_414180088 .imageTextGiant-Container{padding-top:10px;} +#module_414180088 .imageTextGiant-Container{padding-bottom:10px;} +#module_414180088 .imageTextGiant-Container{padding-left:10px;} +#module_414180088 .imageTextGiant-Container{padding-right:10px;} +#module_414180088 .showHandle .btn{font-size:14px;} +#module_414180088 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_414180088 .showHandle .btn{color:#333;} +#module_414180088 .showHandle .btn{font-weight:400;} +#module_414180088 .showHandle .btn{text-decoration:none;} +#module_414180088 .showHandle .btn{font-style:normal;} +#module_414180088 .showHandle div{border-top-color:#ddd !important;} +#module_414180088 .showHandle div{border-top-style:solid !important;} +#module_414180088 .showHandle div{border-top-width:1px !important;} +#module_414180088 .showHandle{background-color:transparent;} +#module_414180088 .showHandle{background-image:none;} +#module_414180088 .showHandle{background-repeat:no-repeat;} +#module_414180088 .showHandle{} +#module_414180088 .showHandle{} +#module_414180088 .showHandle{} +#module_414180088 a{font-size:unset;font-family:unset}.module_414180124 .ModuleHead .HeadCenter{float:none;} +#module_414180124 { + padding:0px; +} +#module_414180124 { + position:static; + z-index:0; + top:4494px; + left:458px; + width:100%; + height: auto; +} +#module_414180124 .ModuleHead414180124 { + display:none; +} +#module_414180124 .BodyCenter.BodyCenter414180124 { + background:none;background-color:rgb(73, 133, 252); +} +#module_414180124 >.module_414180124 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_414180124 >.module_414180124{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:15px; + border-top-right-radius:15px; + border-bottom-left-radius:15px; + border-bottom-right-radius:15px; +} +@media screen and (min-width: 768px){ + #module_414180124 .BodyCenter.BodyCenter414180124 { + padding-top:20.0000%; + padding-left:12.5000%; + padding-right:12.5000%; + padding-bottom:20.0000%; + } +} +@media screen and (max-width: 767px){ + #module_414180124 .BodyCenter.BodyCenter414180124 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_414180124 >.module_414180124 { + margin-top:2.5000%; + margin-left:5.0000%; + margin-right:5.0000%; + margin-bottom:2.5000%; + } +} +@media screen and (max-width: 767px){ + #module_414180124 >.module_414180124 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_414180124 >.module_414180124 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242)} +#module_414180124:hover { + border:none; +} +#module_414180124:hover >.module_414180124 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242);transition: box-shadow 0.5s ease 0s;} + +#module_414180124 .ModuleImageTextGiantContent{margin-top:0px;} +#module_414180124 .ModuleImageTextGiantContent{margin-bottom:0px;} +#module_414180124 .ModuleImageTextGiantContent{margin-left:0px;} +#module_414180124 .ModuleImageTextGiantContent{margin-right:0px;} +#module_414180124 .imageTextGiant-Container{padding-top:10px;} +#module_414180124 .imageTextGiant-Container{padding-bottom:10px;} +#module_414180124 .imageTextGiant-Container{padding-left:10px;} +#module_414180124 .imageTextGiant-Container{padding-right:10px;} +#module_414180124 .showHandle .btn{font-size:14px;} +#module_414180124 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_414180124 .showHandle .btn{color:#333;} +#module_414180124 .showHandle .btn{font-weight:400;} +#module_414180124 .showHandle .btn{text-decoration:none;} +#module_414180124 .showHandle .btn{font-style:normal;} +#module_414180124 .showHandle div{border-top-color:#ddd !important;} +#module_414180124 .showHandle div{border-top-style:solid !important;} +#module_414180124 .showHandle div{border-top-width:1px !important;} +#module_414180124 .showHandle{background-color:transparent;} +#module_414180124 .showHandle{background-image:none;} +#module_414180124 .showHandle{background-repeat:no-repeat;} +#module_414180124 .showHandle{} +#module_414180124 .showHandle{} +#module_414180124 .showHandle{} +#module_414180124 a{font-size:unset;font-family:unset} +.module_414180086 .ModuleHead .HeadCenter{float:none;} +#module_414180086 { + padding:0px; +} +#module_414180086 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_414180086 .ModuleHead414180086 { + display:none; +} + +#module_414180086 .ModuleHoverBoxItem_1{background-color:#fff;} +#module_414180086 .ModuleHoverBoxItem_1{} +#module_414180086 .ModuleHoverBoxItem_1{background-repeat:no-repeat;} +#module_414180086 .ModuleHoverBoxItem_1{} +#module_414180086 .ModuleHoverBoxItem_1{background-attachment:scroll;} +#module_414180086 .ModuleHoverBoxItem_1{} +#module_414180086 .ModuleHoverBoxItem_1{padding-top:0px;} +#module_414180086 .ModuleHoverBoxItem_1{padding-bottom:0px;} +#module_414180086 .ModuleHoverBoxItem_1{padding-left:0px;} +#module_414180086 .ModuleHoverBoxItem_1{padding-right:0px;} +#module_414180086 .ModuleHoverBoxItem_2{background-color:#fff;} +#module_414180086 .ModuleHoverBoxItem_2{} +#module_414180086 .ModuleHoverBoxItem_2{background-repeat:no-repeat;} +#module_414180086 .ModuleHoverBoxItem_2{} +#module_414180086 .ModuleHoverBoxItem_2{background-attachment:scroll;} +#module_414180086 .ModuleHoverBoxItem_2{} +#module_414180086 .ModuleHoverBoxItem_2{padding-top:0px;} +#module_414180086 .ModuleHoverBoxItem_2{padding-bottom:0px;} +#module_414180086 .ModuleHoverBoxItem_2{padding-left:0px;} +#module_414180086 .ModuleHoverBoxItem_2{padding-right:0px;} +#module_414180086 .ModuleHoverBoxItem_2 .ModuleItem{opacity:1} +.module_414180112 .ModuleHead .HeadCenter{float:none;} +#module_414180112 { + padding:0px; +} +#module_414180112 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_414180112 .ModuleHead414180112 { + display:none; +} +#module_414180112 .BodyCenter.BodyCenter414180112 { + background:none;background-color:rgba(0,0,0,0); +} +#module_414180112 >.module_414180112 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_414180112 >.module_414180112{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:15px; + border-top-right-radius:15px; + border-bottom-left-radius:15px; + border-bottom-right-radius:15px; +} +@media screen and (min-width: 768px){ + #module_414180112 .BodyCenter.BodyCenter414180112 { + padding-top:20.0000%; + padding-left:12.5000%; + padding-right:12.5000%; + padding-bottom:20.0000%; + } +} +@media screen and (max-width: 767px){ + #module_414180112 .BodyCenter.BodyCenter414180112 { + padding-top:5.7637%; + padding-left:8.6455%; + padding-right:8.6455%; + padding-bottom:5.7637%; + } +} +@media screen and (min-width: 768px){ + #module_414180112 >.module_414180112 { + margin-top:2.5000%; + margin-left:5.0000%; + margin-right:5.0000%; + margin-bottom:2.5000%; + } +} +@media screen and (max-width: 767px){ + #module_414180112 >.module_414180112 { + margin-top:2.8818%; + margin-left:5.7637%; + margin-right:5.7637%; + margin-bottom:2.8818%; + } +} +#module_414180112 >.module_414180112 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242)} +#module_414180112:hover { + border:none; +} +#module_414180112:hover >.module_414180112 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242);transition: box-shadow 0.5s ease 0s;} + +#module_414180112 .ModuleImageTextGiantContent{margin-top:0px;} +#module_414180112 .ModuleImageTextGiantContent{margin-bottom:0px;} +#module_414180112 .ModuleImageTextGiantContent{margin-left:0px;} +#module_414180112 .ModuleImageTextGiantContent{margin-right:0px;} +#module_414180112 .imageTextGiant-Container{padding-top:10px;} +#module_414180112 .imageTextGiant-Container{padding-bottom:10px;} +#module_414180112 .imageTextGiant-Container{padding-left:10px;} +#module_414180112 .imageTextGiant-Container{padding-right:10px;} +#module_414180112 .showHandle .btn{font-size:14px;} +#module_414180112 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_414180112 .showHandle .btn{color:#333;} +#module_414180112 .showHandle .btn{font-weight:400;} +#module_414180112 .showHandle .btn{text-decoration:none;} +#module_414180112 .showHandle .btn{font-style:normal;} +#module_414180112 .showHandle div{border-top-color:#ddd !important;} +#module_414180112 .showHandle div{border-top-style:solid !important;} +#module_414180112 .showHandle div{border-top-width:1px !important;} +#module_414180112 .showHandle{background-color:transparent;} +#module_414180112 .showHandle{background-image:none;} +#module_414180112 .showHandle{background-repeat:no-repeat;} +#module_414180112 .showHandle{} +#module_414180112 .showHandle{} +#module_414180112 .showHandle{} +#module_414180112 a{font-size:unset;font-family:unset}.module_414180136 .ModuleHead .HeadCenter{float:none;} +#module_414180136 { + padding:0px; +} +#module_414180136 { + position:static; + z-index:0; + top:4502px; + left:861px; + width:100%; + height: auto; +} +#module_414180136 .ModuleHead414180136 { + display:none; +} +#module_414180136 .BodyCenter.BodyCenter414180136 { + background:none;background-color:rgb(73, 133, 252); +} +#module_414180136 >.module_414180136 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_414180136 >.module_414180136{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:15px; + border-top-right-radius:15px; + border-bottom-left-radius:15px; + border-bottom-right-radius:15px; +} +@media screen and (min-width: 768px){ + #module_414180136 .BodyCenter.BodyCenter414180136 { + padding-top:20.0000%; + padding-left:12.5000%; + padding-right:12.5000%; + padding-bottom:20.0000%; + } +} +@media screen and (max-width: 767px){ + #module_414180136 .BodyCenter.BodyCenter414180136 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_414180136 >.module_414180136 { + margin-top:2.5000%; + margin-left:5.0000%; + margin-right:5.0000%; + margin-bottom:2.5000%; + } +} +@media screen and (max-width: 767px){ + #module_414180136 >.module_414180136 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_414180136 >.module_414180136 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242)} +#module_414180136:hover { + border:none; +} +#module_414180136:hover >.module_414180136 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242);transition: box-shadow 0.5s ease 0s;} + +#module_414180136 .ModuleImageTextGiantContent{margin-top:0px;} +#module_414180136 .ModuleImageTextGiantContent{margin-bottom:0px;} +#module_414180136 .ModuleImageTextGiantContent{margin-left:0px;} +#module_414180136 .ModuleImageTextGiantContent{margin-right:0px;} +#module_414180136 .imageTextGiant-Container{padding-top:10px;} +#module_414180136 .imageTextGiant-Container{padding-bottom:10px;} +#module_414180136 .imageTextGiant-Container{padding-left:10px;} +#module_414180136 .imageTextGiant-Container{padding-right:10px;} +#module_414180136 .showHandle .btn{font-size:14px;} +#module_414180136 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_414180136 .showHandle .btn{color:#333;} +#module_414180136 .showHandle .btn{font-weight:400;} +#module_414180136 .showHandle .btn{text-decoration:none;} +#module_414180136 .showHandle .btn{font-style:normal;} +#module_414180136 .showHandle div{border-top-color:#ddd !important;} +#module_414180136 .showHandle div{border-top-style:solid !important;} +#module_414180136 .showHandle div{border-top-width:1px !important;} +#module_414180136 .showHandle{background-color:transparent;} +#module_414180136 .showHandle{background-image:none;} +#module_414180136 .showHandle{background-repeat:no-repeat;} +#module_414180136 .showHandle{} +#module_414180136 .showHandle{} +#module_414180136 .showHandle{} +#module_414180136 a{font-size:unset;font-family:unset} +.module_414180087 .ModuleHead .HeadCenter{float:none;} +#module_414180087 { + padding:0px; +} +#module_414180087 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_414180087 .ModuleHead414180087 { + display:none; +} + +#module_414180087 .ModuleHoverBoxItem_1{background-color:#fff;} +#module_414180087 .ModuleHoverBoxItem_1{} +#module_414180087 .ModuleHoverBoxItem_1{background-repeat:no-repeat;} +#module_414180087 .ModuleHoverBoxItem_1{} +#module_414180087 .ModuleHoverBoxItem_1{background-attachment:scroll;} +#module_414180087 .ModuleHoverBoxItem_1{} +#module_414180087 .ModuleHoverBoxItem_1{padding-top:0px;} +#module_414180087 .ModuleHoverBoxItem_1{padding-bottom:0px;} +#module_414180087 .ModuleHoverBoxItem_1{padding-left:0px;} +#module_414180087 .ModuleHoverBoxItem_1{padding-right:0px;} +#module_414180087 .ModuleHoverBoxItem_2{background-color:#fff;} +#module_414180087 .ModuleHoverBoxItem_2{} +#module_414180087 .ModuleHoverBoxItem_2{background-repeat:no-repeat;} +#module_414180087 .ModuleHoverBoxItem_2{} +#module_414180087 .ModuleHoverBoxItem_2{background-attachment:scroll;} +#module_414180087 .ModuleHoverBoxItem_2{} +#module_414180087 .ModuleHoverBoxItem_2{padding-top:0px;} +#module_414180087 .ModuleHoverBoxItem_2{padding-bottom:0px;} +#module_414180087 .ModuleHoverBoxItem_2{padding-left:0px;} +#module_414180087 .ModuleHoverBoxItem_2{padding-right:0px;} +#module_414180087 .ModuleHoverBoxItem_2 .ModuleItem{opacity:1} +.module_414180114 .ModuleHead .HeadCenter{float:none;} +#module_414180114 { + padding:0px; +} +#module_414180114 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_414180114 .ModuleHead414180114 { + display:none; +} +#module_414180114 .BodyCenter.BodyCenter414180114 { + background:none;background-color:rgba(0,0,0,0); +} +#module_414180114 >.module_414180114 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_414180114 >.module_414180114{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:15px; + border-top-right-radius:15px; + border-bottom-left-radius:15px; + border-bottom-right-radius:15px; +} +@media screen and (min-width: 768px){ + #module_414180114 .BodyCenter.BodyCenter414180114 { + padding-top:20.0000%; + padding-left:12.5000%; + padding-right:12.5000%; + padding-bottom:20.0000%; + } +} +@media screen and (max-width: 767px){ + #module_414180114 .BodyCenter.BodyCenter414180114 { + padding-top:5.7637%; + padding-left:8.6455%; + padding-right:8.6455%; + padding-bottom:5.7637%; + } +} +@media screen and (min-width: 768px){ + #module_414180114 >.module_414180114 { + margin-top:2.5000%; + margin-left:5.0000%; + margin-right:5.0000%; + margin-bottom:2.5000%; + } +} +@media screen and (max-width: 767px){ + #module_414180114 >.module_414180114 { + margin-top:2.8818%; + margin-left:5.7637%; + margin-right:5.7637%; + margin-bottom:2.8818%; + } +} +#module_414180114 >.module_414180114 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242)} +#module_414180114:hover { + border:none; +} +#module_414180114:hover >.module_414180114 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242);transition: box-shadow 0.5s ease 0s;} + +#module_414180114 .ModuleImageTextGiantContent{margin-top:0px;} +#module_414180114 .ModuleImageTextGiantContent{margin-bottom:0px;} +#module_414180114 .ModuleImageTextGiantContent{margin-left:0px;} +#module_414180114 .ModuleImageTextGiantContent{margin-right:0px;} +#module_414180114 .imageTextGiant-Container{padding-top:10px;} +#module_414180114 .imageTextGiant-Container{padding-bottom:10px;} +#module_414180114 .imageTextGiant-Container{padding-left:10px;} +#module_414180114 .imageTextGiant-Container{padding-right:10px;} +#module_414180114 .showHandle .btn{font-size:14px;} +#module_414180114 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_414180114 .showHandle .btn{color:#333;} +#module_414180114 .showHandle .btn{font-weight:400;} +#module_414180114 .showHandle .btn{text-decoration:none;} +#module_414180114 .showHandle .btn{font-style:normal;} +#module_414180114 .showHandle div{border-top-color:#ddd !important;} +#module_414180114 .showHandle div{border-top-style:solid !important;} +#module_414180114 .showHandle div{border-top-width:1px !important;} +#module_414180114 .showHandle{background-color:transparent;} +#module_414180114 .showHandle{background-image:none;} +#module_414180114 .showHandle{background-repeat:no-repeat;} +#module_414180114 .showHandle{} +#module_414180114 .showHandle{} +#module_414180114 .showHandle{} +#module_414180114 a{font-size:unset;font-family:unset}.module_414180137 .ModuleHead .HeadCenter{float:none;} +#module_414180137 { + padding:0px; +} +#module_414180137 { + position:static; + z-index:0; + top:4509px; + left:1232px; + width:100%; + height: auto; +} +#module_414180137 .ModuleHead414180137 { + display:none; +} +#module_414180137 .BodyCenter.BodyCenter414180137 { + background:none;background-color:rgb(73, 133, 252); +} +#module_414180137 >.module_414180137 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_414180137 >.module_414180137{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:15px; + border-top-right-radius:15px; + border-bottom-left-radius:15px; + border-bottom-right-radius:15px; +} +@media screen and (min-width: 768px){ + #module_414180137 .BodyCenter.BodyCenter414180137 { + padding-top:20.0000%; + padding-left:12.5000%; + padding-right:12.5000%; + padding-bottom:20.0000%; + } +} +@media screen and (max-width: 767px){ + #module_414180137 .BodyCenter.BodyCenter414180137 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_414180137 >.module_414180137 { + margin-top:2.5000%; + margin-left:5.0000%; + margin-right:5.0000%; + margin-bottom:2.5000%; + } +} +@media screen and (max-width: 767px){ + #module_414180137 >.module_414180137 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_414180137 >.module_414180137 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242)} +#module_414180137:hover { + border:none; +} +#module_414180137:hover >.module_414180137 {box-shadow: 0px 2px 15px 2px rgb(242, 242, 242);transition: box-shadow 0.5s ease 0s;} + +#module_414180137 .ModuleImageTextGiantContent{margin-top:0px;} +#module_414180137 .ModuleImageTextGiantContent{margin-bottom:0px;} +#module_414180137 .ModuleImageTextGiantContent{margin-left:0px;} +#module_414180137 .ModuleImageTextGiantContent{margin-right:0px;} +#module_414180137 .imageTextGiant-Container{padding-top:10px;} +#module_414180137 .imageTextGiant-Container{padding-bottom:10px;} +#module_414180137 .imageTextGiant-Container{padding-left:10px;} +#module_414180137 .imageTextGiant-Container{padding-right:10px;} +#module_414180137 .showHandle .btn{font-size:14px;} +#module_414180137 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_414180137 .showHandle .btn{color:#333;} +#module_414180137 .showHandle .btn{font-weight:400;} +#module_414180137 .showHandle .btn{text-decoration:none;} +#module_414180137 .showHandle .btn{font-style:normal;} +#module_414180137 .showHandle div{border-top-color:#ddd !important;} +#module_414180137 .showHandle div{border-top-style:solid !important;} +#module_414180137 .showHandle div{border-top-width:1px !important;} +#module_414180137 .showHandle{background-color:transparent;} +#module_414180137 .showHandle{background-image:none;} +#module_414180137 .showHandle{background-repeat:no-repeat;} +#module_414180137 .showHandle{} +#module_414180137 .showHandle{} +#module_414180137 .showHandle{} +#module_414180137 a{font-size:unset;font-family:unset} +.module_409041406 .ModuleHead .HeadCenter{float:none;} +#module_409041406 { + padding:0px; +} +#module_409041406 { + position:static; + z-index:0; + top:0px; + width:100%; + height: auto; +} +#module_409041406 .ModuleHead409041406 { + display:none; +} +#module_409041406 .BodyCenter.BodyCenter409041406 { + background:none;background-color:rgb(73, 133, 252); +} +#module_409041406 >.module_409041406 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_409041406 >.module_409041406{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_409041406 .BodyCenter.BodyCenter409041406 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_409041406 .BodyCenter.BodyCenter409041406 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_409041406 >.module_409041406 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_409041406 >.module_409041406 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_409041406 >.module_409041406 {box-shadow: 0px 0px 0px 0px #ccc} +#module_409041406:hover { + border:none; +} +#module_409041406:hover >.module_409041406 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_409041406 .ModuleSubContainer{background-color:transparent;} +#module_409041406 .ModuleSubContainer{background-image:none;} +#module_409041406 .ModuleSubContainer{background-repeat:no-repeat;} +#module_409041406 .ModuleSubContainer{background-position:0% 0%;} +#module_409041406 .ModuleSubContainer{background-attachment:scroll;} +#module_409041406 .ModuleSubContainer{} +#module_409041406 {!bgVideo!}{bgVideoUrl:} +#module_409041406 .gridBgVideo .bgVideoMask{opacity:0.2} +#module_409041406 .ModuleSubContainer{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0); transition: box-shadow 0.5s ease;} +#module_409041406 .ModuleSubContainer:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +.ModuleGridContainer.ModuleGridContainer409041406 {} +.module_409041457 .ModuleHead .HeadCenter{float:none;} +#module_409041457 { + padding:0px; +} +#module_409041457 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_409041457 .ModuleHead409041457 { + display:none; +} +#module_409041457 .BodyCenter.BodyCenter409041457 { + background:none;background-color:rgba(0,0,0,0); +} +#module_409041457 >.module_409041457 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_409041457 >.module_409041457{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_409041457 .BodyCenter.BodyCenter409041457 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_409041457 .BodyCenter.BodyCenter409041457 { + padding-top:8.6455%; + padding-left:2.8818%; + padding-right:2.8818%; + padding-bottom:8.6455%; + } +} +@media screen and (min-width: 768px){ + #module_409041457 >.module_409041457 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_409041457 >.module_409041457 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_409041457 >.module_409041457 {box-shadow: 0px 0px 0px 0px #ccc} +#module_409041457:hover { + border:none; +} +#module_409041457:hover >.module_409041457 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_409041457 .GraphicUpper .TextImage{border-top-left-radius:0px;} +#module_409041457 .GraphicUpper .TextImage{border-top-right-radius:0px;} +#module_409041457 .GraphicUpper .TextImage{border-bottom-left-radius:0px;} +#module_409041457 .GraphicUpper .TextImage{border-bottom-right-radius:0px;} +#module_409041457 .GraphicUpper{padding-top:0px;} +#module_409041457 .GraphicUpper{padding-bottom:0px;} +#module_409041457 .GraphicUpper{padding-left:0px;} +#module_409041457 .GraphicUpper {padding-right:0px;} +#module_409041457 .GraphicUpper{width:10%;} #module_409041457 .ModuleImageTextContent{width: calc(100% - 10%);} +#module_409041457 .MobileGraphicUpper{width:20%;} #module_409041457 .ModuleMobileImageTextContent{width: calc(100% - 20%);} +#module_409041457 .ModuleImageTextGiantContent{padding-top:0px;} +#module_409041457 .ModuleImageTextGiantContent{padding-bottom:0px;} +#module_409041457 .ModuleImageTextGiantContent{padding-left:15px;} +#module_409041457 .ModuleImageTextGiantContent{padding-right:0px;} +#module_409041457 .normal_ImgtextBox_content{padding-top:0px;} +#module_409041457 .normal_ImgtextBox_content{padding-bottom:30px;} +#module_409041457 .normal_ImgtextBox_content{padding-left:0px;} +#module_409041457 .normal_ImgtextBox_content{padding-right:0px;} +#module_409041457 .normal_ImgtextBox_content{margin-top:0px;margin-bottom:0px;} +#module_409041457 .normal_ImgtextBox_content{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +#module_409041457 .normal_ImgtextBox_content{background-color:transparent;} +#module_409041457 .normal_ImgtextBox_content{background-image:none;} +#module_409041457 .normal_ImgtextBox_content{background-repeat:no-repeat;} +#module_409041457 .normal_ImgtextBox_content{background-position:0% 0%;} +#module_409041457 .normal_ImgtextBox_content{background-attachment:none;} +#module_409041457 .normal_ImgtextBox_content{} +#module_409041457 .normal_ImgtextBox_content{border-top-left-radius:0px;} +#module_409041457 .normal_ImgtextBox_content{border-top-right-radius:0px;} +#module_409041457 .normal_ImgtextBox_content{border-bottom-left-radius:0px;} +#module_409041457 .normal_ImgtextBox_content{border-bottom-right-radius:0px;} +#module_409041457 .normal_ImgtextBox_content{border-top-color:rgba(0,0,0,0);} +#module_409041457 .normal_ImgtextBox_content{border-top-style:none;} +#module_409041457 .normal_ImgtextBox_content{border-top-width:0px;} +#module_409041457 .normal_ImgtextBox_content{border-right-color:rgba(0,0,0,0);} +#module_409041457 .normal_ImgtextBox_content{border-right-style:none;} +#module_409041457 .normal_ImgtextBox_content{border-right-width:0px;} +#module_409041457 .normal_ImgtextBox_content{border-bottom-color:rgba(0,0,0,0);} +#module_409041457 .normal_ImgtextBox_content{border-bottom-style:none;} +#module_409041457 .normal_ImgtextBox_content{border-bottom-width:0px;} +#module_409041457 .normal_ImgtextBox_content{border-left-color:rgba(0,0,0,0);} +#module_409041457 .normal_ImgtextBox_content{border-left-style:none;} +#module_409041457 .normal_ImgtextBox_content{border-left-width:0px;} +#module_409041457 .showHandle .btn{font-size:14px;} +#module_409041457 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_409041457 .showHandle .btn{color:#333;} +#module_409041457 .showHandle .btn{font-weight:400;} +#module_409041457 .showHandle .btn{text-decoration:none;} +#module_409041457 .showHandle .btn{font-style:normal;} +#module_409041457 .showHandle div{border-top-color:#ddd !important;} +#module_409041457 .showHandle div{border-top-style:solid !important;} +#module_409041457 .showHandle div{border-top-width:1px !important;} +#module_409041457 .showHandle{background-color:transparent;} +#module_409041457 .showHandle{background-image:none;} +#module_409041457 .showHandle{background-repeat:no-repeat;} +#module_409041457 .showHandle{} +#module_409041457 .showHandle{} +#module_409041457 .showHandle{} +#module_409041457 .normal_ImgtextBox_content:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +#module_409041457 .normal_ImgtextBox_content:hover{border-top-color:rgba(0,0,0,0);} +#module_409041457 .normal_ImgtextBox_content:hover{border-top-style:none;} +#module_409041457 .normal_ImgtextBox_content:hover{border-right-color:rgba(0,0,0,0);} +#module_409041457 .normal_ImgtextBox_content:hover{border-right-style:none;} +#module_409041457 .normal_ImgtextBox_content:hover{border-bottom-color:rgba(0,0,0,0);} +#module_409041457 .normal_ImgtextBox_content:hover{border-bottom-style:none;} +#module_409041457 .normal_ImgtextBox_content:hover{border-left-color:rgba(0,0,0,0);} +#module_409041457 .normal_ImgtextBox_content:hover{border-left-style:none;} +#module_409041457 a{font-size:unset;font-family:unset} +.module_409025678 .ModuleHead .HeadCenter{float:none;} +#module_409025678 { + padding:0px; +} +#module_409025678 { + position:static; + z-index:0; + top:4998px; + left:1678px; + width:100%; + height: auto; +} +#module_409025678 .ModuleHead409025678 { + display:none; +} +#module_409025678 .BodyCenter.BodyCenter409025678 { + background:none;background-color:rgba(0,0,0,0); +} +#module_409025678 >.module_409025678 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_409025678 >.module_409025678{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_409025678 .BodyCenter.BodyCenter409025678 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_409025678 .BodyCenter.BodyCenter409025678 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_409025678 >.module_409025678 { + margin-top:1.5690%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_409025678 >.module_409025678 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_409025678 >.module_409025678 {box-shadow: 0px 0px 0px 0px #ccc} +#module_409025678:hover { + border:none; +} +#module_409025678:hover >.module_409025678 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_409025678 .ModuleSubContainer{background-color:transparent;} +#module_409025678 .ModuleSubContainer{background-image:none;} +#module_409025678 .ModuleSubContainer{background-repeat:no-repeat;} +#module_409025678 .ModuleSubContainer{background-position:0% 0%;} +#module_409025678 .ModuleSubContainer{background-attachment:scroll;} +#module_409025678 .ModuleSubContainer{} +#module_409025678 {!bgVideo!}{bgVideoUrl:} +#module_409025678 .gridBgVideo .bgVideoMask{opacity:0.2} +#module_409025678 .ModuleSubContainer{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0); transition: box-shadow 0.5s ease;} +#module_409025678 .ModuleSubContainer:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +.ModuleGridContainer.ModuleGridContainer409025678 {} +.module_409031871 .ModuleHead .HeadCenter{float:none;} +#module_409031871 { + padding:0px; +} +#module_409031871 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_409031871 .ModuleHead409031871 { + display:none; +} +#module_409031871 .BodyCenter.BodyCenter409031871 { + background:none;background-color:rgba(0,0,0,0); +} +#module_409031871 >.module_409031871 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_409031871 >.module_409031871{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_409031871 .BodyCenter.BodyCenter409031871 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_409031871 .BodyCenter.BodyCenter409031871 { + padding-top:0.0000%; + padding-left:2.8818%; + padding-right:2.8818%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_409031871 >.module_409031871 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_409031871 >.module_409031871 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_409031871 >.module_409031871 {box-shadow: 0px 0px 0px 0px #ccc} +#module_409031871:hover { + border:none; +} +#module_409031871:hover >.module_409031871 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_409031871 .ModulePlainTextGiantContent{margin-top:0px;} +#module_409031871 .ModulePlainTextGiantContent{margin-bottom:0px;} +#module_409031871 .ModulePlainTextGiantContent{margin-left:0px;} +#module_409031871 .ModulePlainTextGiantContent{margin-right:10px;} +#module_409031871 .plainTextGiant-Container{padding-top:10px;} +#module_409031871 .plainTextGiant-Container{padding-bottom:10px;} +#module_409031871 .plainTextGiant-Container{padding-left:10px;} +#module_409031871 .plainTextGiant-Container{padding-right:10px;} +#module_409031871 a{font-size:unset;font-family:unset} +.module_414160034 .ModuleHead .HeadCenter{float:none;} +#module_414160034 { + padding:0px; +} +#module_414160034 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_414160034 .ModuleHead414160034 { + display:none; +} +#module_414160034 .BodyCenter.BodyCenter414160034 { + background:none;background-color:rgba(0,0,0,0); +} +#module_414160034 >.module_414160034 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_414160034 >.module_414160034{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_414160034 .BodyCenter.BodyCenter414160034 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_414160034 .BodyCenter.BodyCenter414160034 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_414160034 >.module_414160034 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_414160034 >.module_414160034 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_414160034 >.module_414160034 {box-shadow: 0px 0px 0px 0px #ccc} +#module_414160034:hover { + border:none; +} +#module_414160034:hover >.module_414160034 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_414160034 .ModulePlainTextGiantContent{margin-top:0px;} +#module_414160034 .ModulePlainTextGiantContent{margin-bottom:0px;} +#module_414160034 .ModulePlainTextGiantContent{margin-left:0px;} +#module_414160034 .ModulePlainTextGiantContent{margin-right:10px;} +#module_414160034 .plainTextGiant-Container{padding-top:10px;} +#module_414160034 .plainTextGiant-Container{padding-bottom:10px;} +#module_414160034 .plainTextGiant-Container{padding-left:10px;} +#module_414160034 .plainTextGiant-Container{padding-right:10px;} +#module_414160034 a{font-size:unset;font-family:unset} +.module_414161941 .ModuleHead .HeadCenter{float:none;} +#module_414161941 { + padding:0px; +} +#module_414161941 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_414161941 .ModuleHead414161941 { + display:none; +} +#module_414161941 .BodyCenter.BodyCenter414161941 { + background:none;background-color:rgba(0,0,0,0); +} +#module_414161941 >.module_414161941 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_414161941 >.module_414161941{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_414161941 .BodyCenter.BodyCenter414161941 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_414161941 .BodyCenter.BodyCenter414161941 { + padding-top:0.0000%; + padding-left:2.8818%; + padding-right:2.8818%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_414161941 >.module_414161941 { + margin-top:2.5000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:4.1667%; + } +} +@media screen and (max-width: 767px){ + #module_414161941 >.module_414161941 { + margin-top:0.0000%; + margin-left:2.8818%; + margin-right:2.8818%; + margin-bottom:5.7637%; + } +} +#module_414161941 >.module_414161941 {box-shadow: 0px 0px 0px 0px #ccc} +#module_414161941:hover { + border:none; +} +#module_414161941:hover >.module_414161941 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_414161941 img{border-top-color:transparent;} +#module_414161941 img{border-top-style:none;} +#module_414161941 img{border-top-width:0px;} +#module_414161941 img{border-right-color:transparent;} +#module_414161941 img{border-right-style:none;} +#module_414161941 img{border-right-width:0px;} +#module_414161941 img{border-bottom-color:transparent;} +#module_414161941 img{border-bottom-style:none;} +#module_414161941 img{border-bottom-width:0px;} +#module_414161941 img{border-left-color:transparent;} +#module_414161941 img{border-left-style:none;} +#module_414161941 img{border-left-width:0px;} +#module_414161941 img{border-top-left-radius:0px;} +#module_414161941 img{border-top-right-radius:0px;} +#module_414161941 img{border-bottom-left-radius:0px;} +#module_414161941 img{border-bottom-right-radius:0px;} +#module_414161941 .BodyCenter{text-align: center;} + +.module_408044066 .ModuleHead .HeadCenter{float:none;} +#module_408044066 { + padding:0px; +} +#module_408044066 { + position:static; + z-index:0; + top:5102px; + left:1855px; + width:100%; + height: auto; +} +#module_408044066 .ModuleHead408044066 { + display:none; +} +#module_408044066 .BodyCenter.BodyCenter408044066 { + background:none;background-color:rgb(247, 247, 247); +} +#module_408044066 >.module_408044066 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_408044066 >.module_408044066{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_408044066 .BodyCenter.BodyCenter408044066 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_408044066 .BodyCenter.BodyCenter408044066 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_408044066 >.module_408044066 { + margin-top:1.0460%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_408044066 >.module_408044066 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_408044066 >.module_408044066 {box-shadow: 0px 0px 0px 0px #ccc} +#module_408044066:hover { + border:none; +} +#module_408044066:hover >.module_408044066 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_408044066 .ModuleSubContainer{background-color:transparent;} +#module_408044066 .ModuleSubContainer{background-image:none;} +#module_408044066 .ModuleSubContainer{background-repeat:no-repeat;} +#module_408044066 .ModuleSubContainer{background-position:0% 0%;} +#module_408044066 .ModuleSubContainer{background-attachment:scroll;} +#module_408044066 .ModuleSubContainer{} +#module_408044066 {!bgVideo!}{bgVideoUrl:} +#module_408044066 .gridBgVideo .bgVideoMask{opacity:0.2} +#module_408044066 .ModuleSubContainer{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0); transition: box-shadow 0.5s ease;} +#module_408044066 .ModuleSubContainer:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +.ModuleGridContainer.ModuleGridContainer408044066 {} +.module_414165484 .ModuleHead .HeadCenter{float:none;} +#module_414165484 { + padding:0px; +} +#module_414165484 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_414165484 .ModuleHead414165484 { + display:none; +} +#module_414165484 .BodyCenter.BodyCenter414165484 { + background:none;background-color:rgba(0,0,0,0); +} +#module_414165484 >.module_414165484 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_414165484 >.module_414165484{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_414165484 .BodyCenter.BodyCenter414165484 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_414165484 .BodyCenter.BodyCenter414165484 { + padding-top:0.0000%; + padding-left:2.8818%; + padding-right:2.8818%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_414165484 >.module_414165484 { + margin-top:4.1667%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_414165484 >.module_414165484 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_414165484 >.module_414165484 {box-shadow: 0px 0px 0px 0px #ccc} +#module_414165484:hover { + border:none; +} +#module_414165484:hover >.module_414165484 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_414165484 .ModulePlainTextGiantContent{margin-top:0px;} +#module_414165484 .ModulePlainTextGiantContent{margin-bottom:0px;} +#module_414165484 .ModulePlainTextGiantContent{margin-left:0px;} +#module_414165484 .ModulePlainTextGiantContent{margin-right:10px;} +#module_414165484 .plainTextGiant-Container{padding-top:10px;} +#module_414165484 .plainTextGiant-Container{padding-bottom:10px;} +#module_414165484 .plainTextGiant-Container{padding-left:10px;} +#module_414165484 .plainTextGiant-Container{padding-right:10px;} +#module_414165484 a{font-size:unset;font-family:unset} +.module_414165505 .ModuleHead .HeadCenter{float:none;} +#module_414165505 { + padding:0px; +} +#module_414165505 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_414165505 .ModuleHead414165505 { + display:none; +} +#module_414165505 .BodyCenter.BodyCenter414165505 { + background:none;background-color:rgba(0,0,0,0); +} +#module_414165505 >.module_414165505 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_414165505 >.module_414165505{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_414165505 .BodyCenter.BodyCenter414165505 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_414165505 .BodyCenter.BodyCenter414165505 { + padding-top:0.0000%; + padding-left:2.8818%; + padding-right:2.8818%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_414165505 >.module_414165505 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_414165505 >.module_414165505 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_414165505 >.module_414165505 {box-shadow: 0px 0px 0px 0px #ccc} +#module_414165505:hover { + border:none; +} +#module_414165505:hover >.module_414165505 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_414165505 .ModulePlainTextGiantContent{margin-top:0px;} +#module_414165505 .ModulePlainTextGiantContent{margin-bottom:0px;} +#module_414165505 .ModulePlainTextGiantContent{margin-left:0px;} +#module_414165505 .ModulePlainTextGiantContent{margin-right:10px;} +#module_414165505 .plainTextGiant-Container{padding-top:10px;} +#module_414165505 .plainTextGiant-Container{padding-bottom:10px;} +#module_414165505 .plainTextGiant-Container{padding-left:10px;} +#module_414165505 .plainTextGiant-Container{padding-right:10px;} +#module_414165505 a{font-size:unset;font-family:unset} +.module_414166449 .ModuleHead .HeadCenter{float:none;} +#module_414166449 { + padding:0px; +} +#module_414166449 { + position:static; + z-index:0; + top:0px; + width:100%; + height: auto; +} +#module_414166449 .ModuleHead414166449 { + display:none; +} +#module_414166449 .BodyCenter.BodyCenter414166449 { + background:none;background-color:rgb(247, 247, 247); +} +#module_414166449 >.module_414166449 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_414166449 >.module_414166449{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_414166449 .BodyCenter.BodyCenter414166449 { + padding-top:1.5690%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:4.1841%; + } +} +@media screen and (max-width: 767px){ + #module_414166449 .BodyCenter.BodyCenter414166449 { + padding-top:5.7637%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:5.7637%; + } +} +@media screen and (min-width: 768px){ + #module_414166449 >.module_414166449 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_414166449 >.module_414166449 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_414166449 >.module_414166449 {box-shadow: 0px 0px 0px 0px #ccc} +#module_414166449:hover { + border:none; +} +#module_414166449:hover >.module_414166449 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_414166449 .ModuleSubContainer{background-color:transparent;} +#module_414166449 .ModuleSubContainer{background-image:none;} +#module_414166449 .ModuleSubContainer{background-repeat:no-repeat;} +#module_414166449 .ModuleSubContainer{background-position:0% 0%;} +#module_414166449 .ModuleSubContainer{background-attachment:scroll;} +#module_414166449 .ModuleSubContainer{} +#module_414166449 {!bgVideo!}{bgVideoUrl:} +#module_414166449 .gridBgVideo .bgVideoMask{opacity:0.2} +#module_414166449 .ModuleSubContainer{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0); transition: box-shadow 0.5s ease;} +#module_414166449 .ModuleSubContainer:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +.ModuleGridContainer.ModuleGridContainer414166449 {} +.ModuleImageGiant.layout-103 .BodyCenter{text-align:center;} +.ModuleImageGiant.layout-103 .imgBox{position: relative; width:100%; overflow: hidden;} +.ModuleImageGiant.layout-103 img{margin: auto; max-width: 100%; border: none;} +.ModuleImageGiant.layout-103 .imgNormalBox,.ModuleImageGiant.layout-103 .imgHoverBox{width: 100%; height: 100%} +.ModuleImageGiant.layout-103 .imgNormalBox{ + position: relative; + overflow: hidden; + opacity:1; + transition: all .5s; + -moz-transition:all .5s; + -webkit-transition: all .5s; + -o-transition: all .5s; +} +.ModuleImageGiant.layout-103 .imgHoverBox{ + position: absolute; + top: 0; + left: 0; + height: 0; + opacity: 0; + transition: all .5s; + -moz-transition:all .5s; + -webkit-transition: all .5s; + -o-transition: all .5s; +} +.ModuleImageGiant.layout-103 .imgBox:hover .imgNormalBox{opacity: 0;} +.ModuleImageGiant.layout-103 .imgBox:hover .imgHoverBox{opacity: 1; height: 100%;} +.module_414166463 .ModuleHead .HeadCenter{float:none;} +#module_414166463 { + padding:0px; +} +#module_414166463 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_414166463 .ModuleHead414166463 { + display:none; +} + +#module_414166463 img{border-top-color:transparent;} +#module_414166463 img{border-top-style:none;} +#module_414166463 img{border-top-width:0px;} +#module_414166463 img{border-right-color:transparent;} +#module_414166463 img{border-right-style:none;} +#module_414166463 img{border-right-width:0px;} +#module_414166463 img{border-bottom-color:transparent;} +#module_414166463 img{border-bottom-style:none;} +#module_414166463 img{border-bottom-width:0px;} +#module_414166463 img{border-left-color:transparent;} +#module_414166463 img{border-left-style:none;} +#module_414166463 img{border-left-width:0px;} +#module_414166463 img{border-top-left-radius:0px;} +#module_414166463 img{border-top-right-radius:0px;} +#module_414166463 img{border-bottom-left-radius:0px;} +#module_414166463 img{border-bottom-right-radius:0px;} +#module_414166463 .BodyCenter{text-align: center;} + +.module_414166495 .ModuleHead .HeadCenter{float:none;} +#module_414166495 { + padding:0px; +} +#module_414166495 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_414166495 .ModuleHead414166495 { + display:none; +} + +#module_414166495 img{border-top-color:transparent;} +#module_414166495 img{border-top-style:none;} +#module_414166495 img{border-top-width:0px;} +#module_414166495 img{border-right-color:transparent;} +#module_414166495 img{border-right-style:none;} +#module_414166495 img{border-right-width:0px;} +#module_414166495 img{border-bottom-color:transparent;} +#module_414166495 img{border-bottom-style:none;} +#module_414166495 img{border-bottom-width:0px;} +#module_414166495 img{border-left-color:transparent;} +#module_414166495 img{border-left-style:none;} +#module_414166495 img{border-left-width:0px;} +#module_414166495 img{border-top-left-radius:0px;} +#module_414166495 img{border-top-right-radius:0px;} +#module_414166495 img{border-bottom-left-radius:0px;} +#module_414166495 img{border-bottom-right-radius:0px;} +#module_414166495 .BodyCenter{text-align: center;} + +.module_414166500 .ModuleHead .HeadCenter{float:none;} +#module_414166500 { + padding:0px; +} +#module_414166500 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_414166500 .ModuleHead414166500 { + display:none; +} + +#module_414166500 img{border-top-color:transparent;} +#module_414166500 img{border-top-style:none;} +#module_414166500 img{border-top-width:0px;} +#module_414166500 img{border-right-color:transparent;} +#module_414166500 img{border-right-style:none;} +#module_414166500 img{border-right-width:0px;} +#module_414166500 img{border-bottom-color:transparent;} +#module_414166500 img{border-bottom-style:none;} +#module_414166500 img{border-bottom-width:0px;} +#module_414166500 img{border-left-color:transparent;} +#module_414166500 img{border-left-style:none;} +#module_414166500 img{border-left-width:0px;} +#module_414166500 img{border-top-left-radius:0px;} +#module_414166500 img{border-top-right-radius:0px;} +#module_414166500 img{border-bottom-left-radius:0px;} +#module_414166500 img{border-bottom-right-radius:0px;} +#module_414166500 .BodyCenter{text-align: center;} + +.module_414166509 .ModuleHead .HeadCenter{float:none;} +#module_414166509 { + padding:0px; +} +#module_414166509 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_414166509 .ModuleHead414166509 { + display:none; +} + +#module_414166509 img{border-top-color:transparent;} +#module_414166509 img{border-top-style:none;} +#module_414166509 img{border-top-width:0px;} +#module_414166509 img{border-right-color:transparent;} +#module_414166509 img{border-right-style:none;} +#module_414166509 img{border-right-width:0px;} +#module_414166509 img{border-bottom-color:transparent;} +#module_414166509 img{border-bottom-style:none;} +#module_414166509 img{border-bottom-width:0px;} +#module_414166509 img{border-left-color:transparent;} +#module_414166509 img{border-left-style:none;} +#module_414166509 img{border-left-width:0px;} +#module_414166509 img{border-top-left-radius:0px;} +#module_414166509 img{border-top-right-radius:0px;} +#module_414166509 img{border-bottom-left-radius:0px;} +#module_414166509 img{border-bottom-right-radius:0px;} +#module_414166509 .BodyCenter{text-align: center;} + +.module_409032966 .ModuleHead .HeadCenter{float:none;} +#module_409032966 { + padding:0px; +} +#module_409032966 { + position:static; + z-index:0; + top:0px; + width:100%; + height: auto; +} +#module_409032966 .ModuleHead409032966 { + display:none; +} +#module_409032966 .BodyCenter.BodyCenter409032966 { + background:none;background-color:rgba(0,0,0,0); +} +#module_409032966 >.module_409032966 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_409032966 >.module_409032966{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_409032966 .BodyCenter.BodyCenter409032966 { + padding-top:0.5230%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.5230%; + } +} +@media screen and (max-width: 767px){ + #module_409032966 .BodyCenter.BodyCenter409032966 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_409032966 >.module_409032966 { + margin-top:1.5690%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:1.0460%; + } +} +@media screen and (max-width: 767px){ + #module_409032966 >.module_409032966 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_409032966 >.module_409032966 {box-shadow: 0px 0px 0px 0px #ccc} +#module_409032966:hover { + border:none; +} +#module_409032966:hover >.module_409032966 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_409032966 .ModuleSubContainer{background-color:transparent;} +#module_409032966 .ModuleSubContainer{background-image:none;} +#module_409032966 .ModuleSubContainer{background-repeat:no-repeat;} +#module_409032966 .ModuleSubContainer{background-position:0% 0%;} +#module_409032966 .ModuleSubContainer{background-attachment:scroll;} +#module_409032966 .ModuleSubContainer{} +#module_409032966 {!bgVideo!}{bgVideoUrl:} +#module_409032966 .gridBgVideo .bgVideoMask{opacity:0.2} +#module_409032966 .ModuleSubContainer{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0); transition: box-shadow 0.5s ease;} +#module_409032966 .ModuleSubContainer:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +.ModuleGridContainer.ModuleGridContainer409032966 {} +.module_409032968 .ModuleHead .HeadCenter{float:none;} +#module_409032968 { + padding:0px; +} +#module_409032968 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_409032968 .ModuleHead409032968 { + display:none; +} + +#module_409032968 .ModulePlainTextGiantContent{margin-top:0px;} +#module_409032968 .ModulePlainTextGiantContent{margin-bottom:0px;} +#module_409032968 .ModulePlainTextGiantContent{margin-left:0px;} +#module_409032968 .ModulePlainTextGiantContent{margin-right:10px;} +#module_409032968 .plainTextGiant-Container{padding-top:10px;} +#module_409032968 .plainTextGiant-Container{padding-bottom:10px;} +#module_409032968 .plainTextGiant-Container{padding-left:10px;} +#module_409032968 .plainTextGiant-Container{padding-right:10px;} +#module_409032968 a{font-size:unset;font-family:unset} +.ModuleImageGiant.layout-108 .imgTitle { display: block;text-align: center;font-size: 0.875rem;padding: 5px;line-height: 24px;word-wrap: break-word; font-size: 16px;color:#000;} +.ModuleImageGiant.layout-108 .grid-cont:hover .demo-gallery-poster {background-color: rgba(0, 0, 0, 0.5);} +.ModuleImageGiant.layout-108 .ImgCenter{max-height: 100%;max-width: 100%;} +.ModuleImageGiant.layout-108 .ImgCenterbox2{width: 100%;display: block} +.ModuleImageGiant.layout-108 .ImgCenterbox{height: 146px;width: 100%;display: block} +.ModuleImageGiant.layout-108 .demo-gallery-poster { + bottom: 0; + left: 0; + position: absolute; + right: 0; + top: 0; + -webkit-transition: background-color 0.15s ease 0s; + -o-transition: background-color 0.15s ease 0s; + transition: background-color 0.15s ease 0s; +} +.ModuleImageGiant.layout-108 .grid-item:hover .demo-gallery-poster > img { + opacity: 1; +} +.ModuleImageGiant.layout-108 .demo-gallery-poster > img { + left: 50%; + margin: -10px 0 0 -10px; + opacity: 0; + position: absolute; + top: 50%; + -webkit-transition: opacity 0.3s ease 0s; + -o-transition: opacity 0.3s ease 0s; + transition: opacity 0.3s ease 0s; +} +.ModuleImageGiant.layout-108 .grid-item{ + padding:5px; +} +.lg-sub-html .SiteGalleryGiantTitle108{font-size: 14px;} +.lg-sub-html p.SiteGalleryGiantText108{color:#fff;} +.lg-sub-html .SiteGalleryGiantLink108{font-size: 12px;color:#fff;line-height: 16px} +.lg-sub-html .SiteGalleryGiantLink108 .icon-sousuo{font-size: 12px;margin-right: 5px;margin-top: 2px} +.ModuleImageGiant.layout-108 .lg-sub-html{font-size: 12px} +@media only screen and (max-width: 767px) { + .ModuleImageGiant.layout-108 .imgTitle{font-size:12px } + .ModuleImageGiant.layout-108 div.col-xs-2 {width: 50%; padding-right:0; padding-left:0;} + .ModuleImageGiant.layout-108 div.col-xs-3 {width: 33.33333%; padding-right:0; padding-left:0;} + .ModuleImageGiant.layout-108 div.col-xs-4 {width: 25%; padding-right:0; padding-left:0;} + .ModuleImageGiant.layout-108 div.col-xs-5 {width:20%; padding-right:0; padding-left:0;} + .ModuleImageGiant.layout-108 div.col-xs-6 {width:16.6666%; padding-right:0; padding-left:0;} + .ModuleImageGiant.layout-108 div.col-xs-1 {width: 100%; padding-right:0; padding-left:0;} +} +/*@media only screen and (min-width: 481px) and (max-width: 769px) {*/ +/*.ModuleImageGiant.layout-108 .imgTitle{font-size:12px }*/ +/*}*/ +/*@media only screen and (min-width: 770px) and (max-width: 992px) {*/ +/*.ModuleImageGiant.layout-108 .imgTitle{font-size:14px }*/ +/*}*/ +/*@media only screen and (min-width: 993px) and (max-width: 1199px) {*/ +/*.ModuleImageGiant.layout-108 .imgTitle{font-size:14px }*/ +/*}*/ + +/*@media only screen and (min-width: 481px) and (max-width: 991px){*/ +/*.ModuleImageGiant.layout-108 div.col-sm-2 {width: 50%; padding-right:0; padding-left:0;}*/ +/*.ModuleImageGiant.layout-108 div.col-sm-3 {width: 33.33333%; padding-right:0; padding-left:0;}*/ +/*.ModuleImageGiant.layout-108 div.col-sm-4 {width: 25%; padding-right:0; padding-left:0;}*/ +/*.ModuleImageGiant.layout-108 div.col-sm-5 {width:20%; padding-right:0; padding-left:0;}*/ +/*.ModuleImageGiant.layout-108 div.col-sm-6 {width:16.6666%; padding-right:0; padding-left:0;}*/ +/*.ModuleImageGiant.layout-108 div.col-sm-1 {width: 100%; padding-right:0; padding-left:0;}*/ +/*}*/ +/*@media only screen and (min-width: 992px) and (max-width: 1199px){*/ +/*.ModuleImageGiant.layout-108 div.col-md-2{width: 50%; padding-right:0; padding-left:0;}*/ +/*.ModuleImageGiant.layout-108 div.col-md-3 {width: 33.33333%; padding-right:0; padding-left:0;}*/ +/*.ModuleImageGiant.layout-108 div.col-md-4{width: 25%; padding-right:0; padding-left:0;}*/ +/*.ModuleImageGiant.layout-108 div.col-md-5 {width:20%; padding-right:0; padding-left:0;}*/ +/*.ModuleImageGiant.layout-108 div.col-md-6 {width:16.6666%; padding-right:0; padding-left:0;}*/ +/*.ModuleImageGiant.layout-108 div.col-md-1 {width: 100%; padding-right:0; padding-left:0;}*/ +/*}*/ + +@media only screen and (min-width: 768px) { + .ModuleImageGiant.layout-108 div.col-lg-2 {width: 50%; padding-right:0; padding-left:0;} + .ModuleImageGiant.layout-108 div.col-lg-3 {width: 33.33333%; padding-right:0; padding-left:0;} + .ModuleImageGiant.layout-108 div.col-lg-4 {width: 25%; padding-right:0; padding-left:0;} + .ModuleImageGiant.layout-108 div.col-lg-5 {width:20%; padding-right:0; padding-left:0;} + .ModuleImageGiant.layout-108 div.col-lg-6 {width:16.6666%; padding-right:0; padding-left:0;} + .ModuleImageGiant.layout-108 div.col-lg-1 {width: 100%; padding-right:0; padding-left:0;} +} + +.module_409033705 .ModuleHead .HeadCenter{float:none;} +#module_409033705 { + padding:0px; +} +#module_409033705 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_409033705 .ModuleHead409033705 { + display:none; +} +#module_409033705 .BodyCenter.BodyCenter409033705 { + background:none;background-color:rgba(0,0,0,0); +} +#module_409033705 >.module_409033705 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_409033705 >.module_409033705{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_409033705 .BodyCenter.BodyCenter409033705 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_409033705 .BodyCenter.BodyCenter409033705 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_409033705 >.module_409033705 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_409033705 >.module_409033705 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_409033705 >.module_409033705 {box-shadow: 0px 0px 0px 0px #ccc} +#module_409033705:hover { + border:none; +} +#module_409033705:hover >.module_409033705 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_409033705 .imgTitle{color:#333;} +#module_409033705 .grid-item{padding:calc(60px/2);} +#module_409033705 .grid-item{background-color:transparent;} +#module_409033705 .grid-item{background-image:none;} +#module_409033705 .grid-item{background-repeat:no-repeat;} +#module_409033705 .grid-item{} +#module_409033705 .grid-item{} +#module_409033705 .grid-item{} +#module_409033705 .grid-item{border-top-color:transparent;} +#module_409033705 .grid-item{border-top-style:none;} +#module_409033705 .grid-item{border-top-width:0px;} +#module_409033705 .grid-item{border-right-color:transparent;} +#module_409033705 .grid-item{border-right-style:none;} +#module_409033705 .grid-item{border-right-width:0px;} +#module_409033705 .grid-item{border-bottom-color:transparent;} +#module_409033705 .grid-item{border-bottom-style:none;} +#module_409033705 .grid-item{border-bottom-width:0px;} +#module_409033705 .grid-item{border-left-color:transparent;} +#module_409033705 .grid-item{border-left-style:none;} +#module_409033705 .grid-item{border-left-width:0px;} +#module_409033705 .grid-item:hover{background-color:transparent;} +#module_409033705 .grid-item:hover{background-image:none;} +#module_409033705 .grid-item:hover{background-repeat:no-repeat;} +#module_409033705 .grid-item:hover{} +#module_409033705 .grid-item:hover{} +#module_409033705 .grid-item:hover{} +#module_409033705 .grid-item:hover{border-top-color:transparent;} +#module_409033705 .grid-item:hover{border-top-style:none;} +#module_409033705 .grid-item:hover{border-top-width:0px;} +#module_409033705 .grid-item:hover{border-right-color:transparent;} +#module_409033705 .grid-item:hover{border-right-style:none;} +#module_409033705 .grid-item:hover{border-right-width:0px;} +#module_409033705 .grid-item:hover{border-bottom-color:transparent;} +#module_409033705 .grid-item:hover{border-bottom-style:none;} +#module_409033705 .grid-item:hover{border-bottom-width:0px;} +#module_409033705 .grid-item:hover{border-left-color:transparent;} +#module_409033705 .grid-item:hover{border-left-style:none;} +#module_409033705 .grid-item:hover{border-left-width:0px;} + +.ModuleCustomFormGiant.layout-102 .submitbtnbox{display: flex;} +/*ÐÂÑéÖ¤Â뿪ʼ*/ +.ModuleCustomFormGiant.layout-102 .vciline{ + height: 2px; + position: absolute; + left: 0; + bottom: 0; +} +.ModuleCustomFormGiant.layout-102 .VCClose:hover .VCLine1 { + display: none; +} +.ModuleCustomFormGiant.layout-102 .VCClose:hover .VCLine2 { + transform: rotate(180deg); + transition:all 0.5s; +} +.ModuleCustomFormGiant.layout-102 .VCClose{ + position: relative; + margin-right: 20px; + width: 30px; + float: right; + margin-top: 17px; + height: 30px; + cursor: pointer; +} +.ModuleCustomFormGiant.layout-102 .VCLine1{ + border-top:#ccc solid 2px; + width: 18px; + transform: rotate(45deg); + right: 0; + position: absolute; + top: 9px; + +} +.ModuleCustomFormGiant.layout-102 .VCLine2{ + border-top:#ccc solid 2px; + width: 18px; + transform: rotate(-45deg); + right: 0; + position: absolute; + top: 9px; + +} +.ModuleCustomFormGiant.layout-102 .VCTitle{ + color:#333; + font-size:20px; + font-weight: bold; + margin-top: 41px; + margin-bottom: 25px; + +} +.ModuleCustomFormGiant.layout-102 .VerificationCodediv .vcbtn{ + margin-top: 22px; + text-align: right; +} +.ModuleCustomFormGiant.layout-102 .VerificationCodediv .vcbtn1{ + + width: 80px; + height: 36px; + background: #1e88e5; + border-radius: 18px; + line-height: 36px; + text-align: center; + color: #fff; + display: inline-block; + margin-left: 10px; + cursor: pointer; + font-size: 16px; +} +.ModuleCustomFormGiant.layout-102 .VerificationCodediv .vcbtn2{ + + width: 80px; + height: 36px; + background: #fff; + border-radius: 18px; + line-height: 36px; + text-align: center; + color: #666666 ; + border: 1px #ccc solid; + display: inline-block; + cursor: pointer; + font-size: 16px; +} +.ModuleCustomFormGiant.layout-102 .VerificationCodediv .vcinput::placeholder{ + color:#999999 +} +.ModuleCustomFormGiant.layout-102 .VerificationCodediv .vcinput{ + border:none; + padding: 20px 0 ; + background: #fff !important; + border-bottom: solid #ccc 1px; + color: #666; + line-height: 1; +} +.ModuleCustomFormGiant.layout-102 .VerificationCodediv .changebtn{ + text-align: right; + display: block; + +} +.ModuleCustomFormGiant.layout-102 .VerificationCodediv .VerificationCode{ + width: 100%; + height: 100px; +} +.ModuleCustomFormGiant.layout-102 .VerificationCodecontext{ + padding:0 33px; +} +.ModuleCustomFormGiant.layout-102 .VerificationCodediv{ + + position: absolute;; + bottom: 0; + z-index: 12; + background: #fff; + transform: translate(-50%,-50%); + top:auto; + left: 50%; + max-width: 350px; + height: 380px; + border-radius: 6px; + box-shadow: 9.9px 9.9px 49px 0px rgba(0,0,0,0.11); + display: none; + width: 100%; +} +/*ÐÂÑéÖ¤Âë½áÊø*/ + + +.ModuleCustomFormGiant.layout-102 .title { + text-align: center; + line-height: 50px; + height: 50px; + color: #333; + font-size: 24px; + margin-bottom: 14px; + font-weight: normal; + min-height: 30px; +} +.ModuleCustomFormGiant.layout-102 .multi-row-text { + width: 90%; +} +.ModuleCustomFormGiant.layout-102 input[type=text] { + font-size: 14px; + border: none; + background: #fff; + padding: 0 0 0 10px; + /* flex-shrink: 0; + -webkit-flex-shrink: 0; + -ms-flex-shrink: 0; + -moz-flex-shrink: 0; + flex-grow: 0; + -webkit-flex-grow: 0; + -ms-flex-grow: 1; + -moz-flex-grow: 1; */ + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + width: 100%; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.ModuleCustomFormGiant.layout-102 .customFormicon { + width: 20px; + height: 20px; + margin-top: -5px; + margin-right: 5px; + display: inline-block !important +} + +/* .ModuleCustomFormGiant.layout-102 .Select_Simulate li:hover { + color: #fff +} */ + +.ModuleCustomFormGiant.layout-102 .content-title { + font-size: 14px; + line-height: 44px; + height: 44px; + flex-shrink: 0; + -webkit-flex-shrink: 0; + -ms-flex-shrink: 0; + -moz-flex-shrink: 0; + /* max-width: 30%; */ + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.ModuleCustomFormGiant.layout-102 .in-formList { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: inline-flex; + /* -webkit-box-pack: justify; */ + /* -webkit-justify-content: space-between; */ + -ms-flex-pack: justify; + /* justify-content: space-between; */ + -webkit-box-align: center; + -webkit-align-items: center; + -ms-flex-align: center; + align-items: center; + width: 100%; +} + +.ModuleCustomFormGiant.layout-102 .formList-content { + box-sizing: border-box; + border-radius: 5px; + margin-bottom: 16px; + width: 100%; +} + +.ModuleCustomFormGiant.layout-102 .pcCitybox { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + height: 44px; + -webkit-box-align: center; + -webkit-align-items: center; + -ms-flex-align: center; + align-items: center; +} +.ModuleCustomFormGiant.layout-102 .areabox .area ul{ + top:55px +} +.ModuleCustomFormGiant.layout-102 .pcCitybox .City-select,.ModuleCustomFormGiant.layout-102 .pcCitybox .Couty-select { + flex-grow: 1; + flex: 1; + -webkit-flex-grow: 1; + -ms-flex-grow: 1; + -moz-flex-grow: 1; + margin-right: 10px; + height: 44px; + line-height: 44px; + appearance: none; + -moz-appearance: none; + -webkit-appearance: none; + /* padding: 0 10px; */ + cursor: pointer; + font-size: 14px; + border-radius: 5px; + border: 1px solid #ccc; + /* background: url(/skinp/modules/ModuleCustomFormGiant/images/arrow1.png) no-repeat center right; */ +} + +.ModuleCustomFormGiant.layout-102 .pcCitybox .frist-city-select select { + border: 0; + border-radius: 0; + margin-right: 0; +} + +.ModuleCustomFormGiant.layout-102 .pcCitybox .frist-city-select .frist-city-title { + font-size: 14px; + margin-left: 16px; + white-space: nowrap; +} +.ModuleCustomFormGiant.layout-102 .Browse-file{ + line-height: 44px; + height: 44px; +} +.ModuleCustomFormGiant.layout-102 .Browse-img{ + + height: 80px; +} +.ModuleCustomFormGiant.layout-102 .pcCitybox .frist-city-select { + border-radius: 5px; + border: 1px solid #ccc; + flex-grow: 1; + -webkit-flex-grow: 1; + -ms-flex-grow: 1; + -moz-flex-grow: 1; + margin-right: 10px; + /* background: url(/skinp/modules/ModuleCustomFormGiant/images/arrow1.png) no-repeat center right; */ + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-box-align: center; + -webkit-align-items: center; + -ms-flex-align: center; + align-items: center; +} + +.ModuleCustomFormGiant.layout-102 .choose-time-mobile { + font-size: 14px; +} + +.ModuleCustomFormGiant.layout-102 .pcCitybox .Couty-select { + margin-right: 0; +} + +.ModuleCustomFormGiant.layout-102 .pcCitybox .Province-select { + height: 40px; + margin-top: 1px; + width:100% +} + +.ModuleCustomFormGiant.layout-102 .areabox .frist_item{ + height: 100%; +} +.ModuleCustomFormGiant.layout-102 input.VerificationCodeinput { + width: 188px; + line-height: 34px; + margin-right: 10px; + float: left; +} + +.ModuleCustomFormGiant.layout-102 .VerificationCode { + width: 90px; + height: 50px; + display: inline-block; +} + +.ModuleCustomFormGiant.layout-102 .file-box .Browse-file-input { + flex-grow: 1; + -webkit-flex-grow: 1; + -ms-flex-grow: 1; + -moz-flex-grow: 1; + margin-right: 10px; + border-radius: 5px; +} + +.ModuleCustomFormGiant.layout-102 .file-box { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + -ms-flex-pack: justify; + justify-content: space-between; + -webkit-box-align: center; + -webkit-align-items: center; + -ms-flex-align: center; + align-items: center; +} + +.ModuleCustomFormGiant.layout-102 .Browse-file { + border: 1px solid #eee; + border-radius:5px; +} + +.ModuleCustomFormGiant.layout-102 .Browse-file:hover { + color: #666; + background: #eee; + border: 1px solid #ccc; +} + +.ModuleCustomFormGiant.layout-102 .input-text-color { + color: #999; + display: flex; + align-items: center; + line-height: 1.5; +} +.ModuleCustomFormGiant.layout-102 .smsvaldatebox { + height: 44px; + line-height: 44px; +} +.ModuleCustomFormGiant.layout-102 .smsvcode,.ModuleCustomFormGiant.layout-102 .smsbtn{ + border-radius: 5px; +} + +.ModuleCustomFormGiant.layout-102 .Describ-text-color { + color: #333; +} + +.ModuleCustomFormGiant.layout-102 .submibtn-color { + color: #fff; + background: #1e88e5; + border-radius: 5px; + cursor: pointer; +} +.ModuleCustomFormGiant.layout-102 .areabox .frist_item{ + padding-right: 4px; +} +.ModuleCustomFormGiant.layout-102 .Select_Simulate .Select_sanjiao { + border: 0; + height: 44px; + width: 30px; + background: url(/skinp/modules/ModuleCustomFormGiant/images/arrow2.png) no-repeat center right; + line-height: 44px; + margin: 0; + margin-right: 16px; +} + +.ModuleCustomFormGiant.layout-102 .formList-content.mgb0 { + margin-bottom: 0 +} + +.ModuleCustomFormGiant.layout-102 .in-formList-content.pdLf0 { + padding-left: 0 +} + +.ModuleCustomFormGiant.layout-102 .Select_Simulate.layout2 li { + padding: 0 16px; +} + +.ModuleCustomFormGiant.layout-102 .Select_Simulate .frist_item { + padding-right: 0; +} + +.ModuleCustomFormGiant.layout-102 .submitbtn { + line-height: 50px; + height: 50px; + text-align: center; + margin-top: 16px; +} + +.ModuleCustomFormGiant.layout-102 .submibtn-color:hover { + color: #fff; + background: #1976d2; +} + +.ModuleCustomFormGiant.layout-102 .pd-0 { + padding: 0; +} + +.ModuleCustomFormGiant.layout-102 .formList-content-no-style .in-formList { + align-items: flex-start; +} + +.ModuleCustomFormGiant.layout-102 .multi-row-text { + margin-top: 3px; + border: 0; + padding-left: 10px; +} + +.ModuleCustomFormGiant.layout-102 .formList-content-no-border { + border: none; + padding-left: 0; +} +.ModuleCustomFormGiant.layout-102 .in-formList-checkbox { + white-space: normal; + display: flex; + align-items: center; + flex-wrap: wrap; +} +.ModuleCustomFormGiant.layout-102 .vertical{ + width: auto; + display: initial; +} +.ModuleCustomFormGiant.layout-102 input[type=radio],.ModuleCustomFormGiant.layout-102 input[type=checkbox]{ + top:0; + margin-top:0 +} + +.ModuleCustomFormGiant.layout-102 .formList-content-no-border .in-formList { + /* align-items: flex-start; */ +} + +.ModuleCustomFormGiant.layout-102 .content-title-checkbox { + margin-right: 16px; +} + +.ModuleCustomFormGiant .in-formList-checkbox label { + font-weight: normal; + font-size: 14px; + color: #666; +} + +.ModuleCustomFormGiant.layout-102 .choose-time { + border: none; + line-height: 44px; + height: 44px; + padding: 0; + display: flex; + justify-content: space-between; + align-items: center; +} + +.ModuleCustomFormGiant.layout-102 .chooseTimeicon { + margin-top: 0; + margin-right: 10px; +} + +.ModuleCustomFormGiant.layout-102 .VerificationCodeinputWb { + border: 1px solid #ccc; + border-radius: 5px; + width: auto; + margin-right: 8px; + padding-left: 16px; + display: inline-block; + height: 50px; + width: auto; + display: flex; + flex-wrap: wrap; + align-items: center; +} +.ModuleCustomFormGiant.layout-102 .verifica{ + display: flex; + flex-wrap: wrap; + align-items: center; +} + +.ModuleCustomFormGiant.layout-102 .VerificationCodeinputWb .input-text-checking { + width: 66.5%; + vertical-align: top; + margin-top: 1px; +} + +.ModuleCustomFormGiant.layout-102 .changebtn { + line-height: 50px +} + +.ModuleCustomFormGiant.layout-102 .cityPickerBox { + border: 0; +} + +.ModuleCustomFormGiant.layout-102 .cityval { + line-height: 48px; + height: 48px; + display: none; + width: 100%; +} + +.ModuleCustomFormGiant.layout-102 .choose-city-content { + font-size: 14px; + line-height: 44px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + width: 97%; + display: block; +} + +.ModuleCustomFormGiant.layout-102 .cityPickerBoxwb { + height: 44px; +} + +.ModuleCustomFormGiant.layout-102 .padL16 { + padding-left: 16px; + line-height: 1; + height: auto; + margin-top: 0; + margin-right: 16px; +} + +.ModuleCustomFormGiant.layout-102 .padL16.radioBox { + margin-top: 8px +} + +.ModuleCustomFormGiant.layout-102 .formList-content.mg0 { + margin-bottom: 0 +} + +.ModuleCustomFormGiant.layout-102 .Select_Simulate.layout2 .frist_item { + padding-left: 0; +} + +.ModuleCustomFormGiant.layout-102 .in-formList-content { + border: 1px solid #ccc; + padding-left: 16px; + border-radius: 5px; +} + +.ModuleCustomFormGiant.layout-102 .title { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.ModuleCustomFormGiant.layout-102 .select_box { + display: none; +} + +.ModuleCustomFormGiant.layout-102 .in-formList-img { + min-height: 60px; + height: auto; +} +.ModuleCustomFormGiant.layout-102 .file-operation{ + display: flex; +} +.ModuleCustomFormGiant.layout-102 .file-operation .content-title { + max-width: 100%; +} +.ModuleCustomFormGiant.layout-102 .UploadFileSpan { + line-height: 30px; + font-size: 12px; + /* border: 1px solid #e5e5e5; + background: #fbfbfb; */ + padding: 0 10px; + box-sizing: border-box; + min-height: 30px; + width: 316px; + display: none; + padding-left: 0px; +} + +.ModuleCustomFormGiant.layout-102 .textbox { + display: flex; + justify-content: space-between; + align-items: center; + flex-wrap: wrap; +} +.ModuleCustomFormGiant.layout-102 .w-100{ + width: 100%; + flex-wrap: wrap; +} + +.ModuleCustomFormGiant.layout-102 .desctxt{ + max-width: 100%; + overflow: inherit; + white-space: normal; + line-height: 1.5; + height: 100%; +} +.ModuleCustomFormGiant.layout-102 .customform-upload-img-preview { border-radius: 5px;} +.ModuleCustomFormGiant.layout-102 .in-formList-checkbox label span { + min-width: 36px; + display: initial; + word-break: break-all; +} +.ModuleCustomFormGiant.layout-102 .customFormTextarea::placeholder{ white-space: nowrap; width:100%; text-overflow: ellipsis; overflow: hidden;} +@media screen and (max-width: 767px) { + + + .ModuleCustomFormGiant.layout-102 .vertical{ + margin-left:16px ; + } + .ModuleCustomFormGiant.layout-102 .textbox{ + flex-wrap: wrap; + } + .ModuleCustomFormGiant.layout-102 .multi-row-text{ + padding: 5px 10px 10px 10px; + } +} +.ModuleCustomFormGiant.layout-102 .content-title{ + max-width: 75%; +} +.ModuleCustomFormGiant.layout-102 .desctxt{ + max-width: 100%; +} +.ModuleCustomFormGiant.layout-102 .choose-time-mobile{ + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + max-width: calc(100% - 30px); + display: block; + +} +.ModuleCustomFormGiant.layout-102 .VerificationCodeinputWb .input-text-checking { + width: 120px; +} +.ModuleCustomFormGiant.layout-102 .dq{ + margin-bottom: 0; +} +.ModuleCustomFormGiant.layout-102 .VerificationCode { + width: 90px; + height: 50px; +} +.ModuleCustomFormGiant.layout-102 .formList-content.mg0 { + margin-bottom: 16px; +} +.ModuleCustomFormGiant.layout-102 .InsidePage-title-text { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + width: calc(100% - 76px); + display: inline-block; +} +} + + +@media screen and (max-width: 768px) { + .ModuleCustomFormGiant.layout-102 .vertical{ + display: flex; + } + .ModuleCustomFormGiant.layout-102 .Pc-formList-content{ + flex-wrap: wrap; + } + .ModuleCustomFormGiant.layout-102 .in-formList-checkbox{ + flex-wrap: wrap; + } + .ModuleCustomFormGiant.layout-102 .VerificationCodeinputWb .input-text-checking { + width: 65%; + padding: 0; + } + .ModuleCustomFormGiant.layout-102 .textbox{ + flex-wrap: wrap; + } + .ModuleCustomFormGiant.layout-102 .VerificationCodeinputWb .Describ-text-color { + padding-left:13px; + + + } + .ModuleCustomFormGiant.layout-102 .VerificationCodeinputWb { + width: 100%; + padding-left: 5px; + } + .ModuleCustomFormGiant.layout-102 .VerificationCode { + width: 90px; + height: 50px; + } + .ModuleCustomFormGiant.layout-102 .formList-content.mg0 { + margin-bottom: 16px; + } + .ModuleCustomFormGiant.layout-102 input[type=text] { + line-height: 48px; + } +} + +.module_436755030 .ModuleHead .HeadCenter{float:none;} +#module_436755030 { + padding:0px; +} +#module_436755030 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_436755030 .ModuleHead436755030 { + display:none; +} +#module_436755030 .BodyCenter.BodyCenter436755030 { + background:none;background-color:rgba(255,255,255,1); +} +#module_436755030 >.module_436755030 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_436755030 >.module_436755030{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_436755030 .BodyCenter.BodyCenter436755030 { + padding-top:0.7845%; + padding-left:0.7845%; + padding-right:0.7845%; + padding-bottom:0.7845%; + } +} +@media screen and (max-width: 767px){ + #module_436755030 .BodyCenter.BodyCenter436755030 { + padding-top:15px; + padding-left:15px; + padding-right:15px; + padding-bottom:15px; + } +} +@media screen and (min-width: 768px){ + #module_436755030 >.module_436755030 { + margin-top:0.0000%; + margin-left:30.6485%; + margin-right:31.0146%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_436755030 >.module_436755030 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_436755030 >.module_436755030 {box-shadow: 0px 0px 0px 0px #ccc} +#module_436755030:hover { + border:none; +} +#module_436755030:hover >.module_436755030 { + border-color:#ccc; +} +#module_436755030:hover >.module_436755030 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_436755030 .vcbtn1{background-color:#1e88e5;} +#module_436755030 .vcbtn1{color:#fff;} +#module_436755030 .title{font-size:24px;} +#module_436755030 .title{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_436755030 .title{color:#333;} +#module_436755030 .title{font-weight:normal;} +#module_436755030 .title{text-decoration:none;} +#module_436755030 .title{font-style:normal;} +#module_436755030 .title{background-color:transparent;} +#module_436755030 .title{background-image:none;} +#module_436755030 .title{background-repeat:no-repeat;} +#module_436755030 .title{background-position:50% 50%;} +#module_436755030 .title{background-attachment:scroll;} +#module_436755030 .title{} +#module_436755030 .title{height:50px;line-height:50px;} +#module_436755030 .title{text-align:center;} +#module_436755030 .Describ-text-color{font-size:14px;} +#module_436755030 .Describ-text-color{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_436755030 .Describ-text-color{color:#666;} +#module_436755030 .Describ-text-color{font-weight:normal;} +#module_436755030 .Describ-text-color{text-decoration:none;} +#module_436755030 .Describ-text-color{font-style:normal;} +#module_436755030 .submitbtn{font-size:16px;} +#module_436755030 .submitbtn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_436755030 .submitbtn{color:#fff;} +#module_436755030 .submitbtn{font-weight:normal;} +#module_436755030 .submitbtn{text-decoration:none;} +#module_436755030 .submitbtn{font-style:normal;} +#module_436755030 .submitbtn{width:100%;} +#module_436755030 .submitbtn{height:50px;line-height:50px;} +#module_436755030 .submitbtnbox{justify-content:flex-start;} +#module_436755030 .submitbtn{background-color:rgb(30, 136, 229);} #module_436755030 input[type=radio]:checked, #module_436755030 input[type=checkbox]:checked{background:rgb(30, 136, 229);border:1px solid rgb(30, 136, 229)} +#module_436755030 .submitbtn{background-image:none;} +#module_436755030 .submitbtn{background-repeat:no-repeat;} +#module_436755030 .submitbtn{background-position:50% 50%;} +#module_436755030 .submitbtn{background-attachment:scroll;} +#module_436755030 .submitbtn{} +#module_436755030 .smsvcode,#module_436755030 .VerificationCodeinput,#module_436755030 .Browse-file,#module_436755030 .customFormCheckbox,#module_436755030 input[type=radio],#module_436755030 .formList-content-no-style,#module_436755030 .customFormTextarea,#module_436755030 .in-formList-content,#module_436755030 .frist_item,#module_436755030 .Browse-file-input,#module_436755030 input[type=text],#module_436755030 .VerificationCodeinputWb,#module_436755030 .frist-city-select,#module_436755030 .pcCitybox select{background-color:#fff;} +#module_436755030 .smsvcode,#module_436755030 .Pc-formList-content .in-formList-content,#module_436755030 .Browse-file,#module_436755030 .VerificationCodeinput,#module_436755030 .customFormCheckbox,#module_436755030 input[type=radio],#module_436755030 .in-formList-content,#module_436755030 .frist-city-select,#module_436755030 .Couty-select,#module_436755030 .City-select,#module_436755030 .VerificationCodeinputWb{border-top-color:#ccc;} +#module_436755030 .smsvcode,#module_436755030 .Pc-formList-content .in-formList-content,#module_436755030 .Browse-file,#module_436755030 .VerificationCodeinput,#module_436755030 .customFormCheckbox,#module_436755030 input[type=radio],#module_436755030 .in-formList-content,#module_436755030 .frist-city-select,#module_436755030 .Couty-select,#module_436755030 .City-select,#module_436755030 .VerificationCodeinputWb{border-top-style:solid;} +#module_436755030 .smsvcode,#module_436755030 .Pc-formList-content .in-formList-content,#module_436755030 .Browse-file,#module_436755030 .VerificationCodeinput,#module_436755030 .customFormCheckbox,#module_436755030 input[type=radio],#module_436755030 .in-formList-content,#module_436755030 .frist-city-select,#module_436755030 .Couty-select,#module_436755030 .City-select,#module_436755030 .VerificationCodeinputWb{border-top-width:1px;} +#module_436755030 .smsvcode,#module_436755030 .Pc-formList-content .in-formList-content,#module_436755030 .Browse-file,#module_436755030 .VerificationCodeinput,#module_436755030 .customFormCheckbox,#module_436755030 input[type=radio],#module_436755030 .in-formList-content,#module_436755030 .frist-city-select,#module_436755030 .Couty-select,#module_436755030 .City-select,#module_436755030 .VerificationCodeinputWb{border-right-color:#ccc;} +#module_436755030 .smsvcode,#module_436755030 .Pc-formList-content .in-formList-content,#module_436755030 .Browse-file,#module_436755030 .VerificationCodeinput,#module_436755030 .customFormCheckbox,#module_436755030 input[type=radio],#module_436755030 .in-formList-content,#module_436755030 .frist-city-select,#module_436755030 .Couty-select,#module_436755030 .City-select,#module_436755030 .VerificationCodeinputWb{border-right-style:solid;} +#module_436755030 .smsvcode,#module_436755030 .Pc-formList-content .in-formList-content,#module_436755030 .Browse-file,#module_436755030 .VerificationCodeinput,#module_436755030 .customFormCheckbox,#module_436755030 input[type=radio],#module_436755030 .in-formList-content,#module_436755030 .frist-city-select,#module_436755030 .Couty-select,#module_436755030 .City-select,#module_436755030 .VerificationCodeinputWb{border-right-width:1px;} +#module_436755030 .smsvcode,#module_436755030 .Pc-formList-content .in-formList-content,#module_436755030 .Browse-file,#module_436755030 .VerificationCodeinput,#module_436755030 .customFormCheckbox,#module_436755030 input[type=radio],#module_436755030 .in-formList-content,#module_436755030 .frist-city-select,#module_436755030 .Couty-select,#module_436755030 .City-select,#module_436755030 .VerificationCodeinputWb{border-bottom-color:#ccc;} +#module_436755030 .smsvcode,#module_436755030 .Pc-formList-content .in-formList-content,#module_436755030 .Browse-file,#module_436755030 .VerificationCodeinput,#module_436755030 .customFormCheckbox,#module_436755030 input[type=radio],#module_436755030 .in-formList-content,#module_436755030 .frist-city-select,#module_436755030 .Couty-select,#module_436755030 .City-select,#module_436755030 .VerificationCodeinputWb{border-bottom-style:solid;} +#module_436755030 .smsvcode,#module_436755030 .Pc-formList-content .in-formList-content,#module_436755030 .Browse-file,#module_436755030 .VerificationCodeinput,#module_436755030 .customFormCheckbox,#module_436755030 input[type=radio],#module_436755030 .in-formList-content,#module_436755030 .frist-city-select,#module_436755030 .Couty-select,#module_436755030 .City-select,#module_436755030 .VerificationCodeinputWb{border-bottom-width:1px;} +#module_436755030 .smsvcode,#module_436755030 .Pc-formList-content .in-formList-content,#module_436755030 .Browse-file,#module_436755030 .VerificationCodeinput,#module_436755030 .customFormCheckbox,#module_436755030 input[type=radio],#module_436755030 .in-formList-content,#module_436755030 .frist-city-select,#module_436755030 .Couty-select,#module_436755030 .City-select,#module_436755030 .VerificationCodeinputWb{border-left-color:#ccc;} +#module_436755030 .smsvcode,#module_436755030 .Pc-formList-content .in-formList-content,#module_436755030 .Browse-file,#module_436755030 .VerificationCodeinput,#module_436755030 .customFormCheckbox,#module_436755030 input[type=radio],#module_436755030 .in-formList-content,#module_436755030 .frist-city-select,#module_436755030 .Couty-select,#module_436755030 .City-select,#module_436755030 .VerificationCodeinputWb{border-left-style:solid;} +#module_436755030 .smsvcode,#module_436755030 .Pc-formList-content .in-formList-content,#module_436755030 .Browse-file,#module_436755030 .VerificationCodeinput,#module_436755030 .customFormCheckbox,#module_436755030 input[type=radio],#module_436755030 .in-formList-content,#module_436755030 .frist-city-select,#module_436755030 .Couty-select,#module_436755030 .City-select,#module_436755030 .VerificationCodeinputWb{border-left-width:1px;} +#module_436755030 .smsvcode,#module_436755030 .formList-content-no-style,#module_436755030 .frist_item,#module_436755030 .Pc-formList-content .in-formList-content,#module_436755030 .Browse-file,#module_436755030 .VerificationCodeinput,#module_436755030 .in-formList-content,#module_436755030 .frist-city-select,#module_436755030 .Couty-select,#module_436755030 .City-select,#module_436755030 .VerificationCodeinputWb{border-top-left-radius:5px;} +#module_436755030 .smsvcode,#module_436755030 .formList-content-no-style,#module_436755030 .frist_item,#module_436755030 .Pc-formList-content .in-formList-content,#module_436755030 .Browse-file,#module_436755030 .VerificationCodeinput,#module_436755030 .in-formList-content,#module_436755030 .frist-city-select,#module_436755030 .Couty-select,#module_436755030 .City-select,#module_436755030 .VerificationCodeinputWb{border-top-right-radius:5px;} +#module_436755030 .smsvcode,#module_436755030 .formList-content-no-style,#module_436755030 .frist_item,#module_436755030 .Pc-formList-content .in-formList-content,#module_436755030 .Browse-file,#module_436755030 .VerificationCodeinput,#module_436755030 .in-formList-content,#module_436755030 .frist-city-select,#module_436755030 .Couty-select,#module_436755030 .City-select,#module_436755030 .VerificationCodeinputWb{border-bottom-left-radius:5px;} +#module_436755030 .smsvcode,#module_436755030 .formList-content-no-style, #module_436755030 .frist_item,#module_436755030 .Pc-formList-content .in-formList-content,#module_436755030 .Browse-file,#module_436755030 .VerificationCodeinput,#module_436755030 .in-formList-content,#module_436755030 .frist-city-select,#module_436755030 .Couty-select,#module_436755030 .City-select,#module_436755030 .VerificationCodeinputWb{border-bottom-right-radius:5px;} +#module_436755030 .smsbtn,#module_436755030 .smsvcode,#module_436755030 .input-text-color{font-size:14px;} +#module_436755030 .smsbtn,#module_436755030 .smsvcode,#module_436755030 .input-text-color{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_436755030 .smsvcode,#module_436755030 .input-text-color{color:#999;} #module_436755030 .input-text-color::-ms-input-placeholder{color:#999;} #module_436755030 .input-text-color::-moz-placeholder{color:#999;} #module_436755030 .input-text-color::-webkit-input-placeholder{color:#999;} +#module_436755030 .smsbtn,#module_436755030 .smsvcode,#module_436755030 .input-text-color{font-weight:normal;} +#module_436755030 .smsbtn,#module_436755030 .smsvcode,#module_436755030 .input-text-color{text-decoration:none;} #module_436755030 .input-text-color::-ms-input-placeholder{text-decoration:none;} #module_436755030 .input-text-color::-moz-placeholder{text-decoration:none;} #module_436755030 .input-text-color::-webkit-input-placeholder{text-decoration:none;} +#module_436755030 .smsbtn,#module_436755030 .smsvcode,#module_436755030 .input-text-color{font-style:normal;} +#module_436755030 .submitbtn{border-top-left-radius:5px;} +#module_436755030 .submitbtn{border-top-right-radius:5px;} +#module_436755030 .submitbtn{border-bottom-left-radius:5px;} +#module_436755030 .submitbtn{border-bottom-right-radius:5px;} +#module_436755030 .smsvcode:hover,#module_436755030 .Pc-formList-content .in-formList-content:hover,#module_436755030 .Browse-file:hover,#module_436755030 .VerificationCodeinput:hover,#module_436755030 .customFormCheckbox:hover,#module_436755030 input[type=radio]:hover,#module_436755030 .in-formList-content:hover,#module_436755030 .frist-city-select:hover,#module_436755030 .Couty-select:hover,#module_436755030 .City-select:hover,#module_436755030 .VerificationCodeinputWb:hover{border-top-color:#1976d2;} +#module_436755030 .smsvcode:hover,#module_436755030 .Pc-formList-content .in-formList-content:hover,#module_436755030 .Browse-file:hover,#module_436755030 .VerificationCodeinput:hover,#module_436755030 .customFormCheckbox:hover,#module_436755030 input[type=radio]:hover,#module_436755030 .in-formList-content:hover,#module_436755030 .frist-city-select:hover,#module_436755030 .Couty-select:hover,#module_436755030 .City-select:hover,#module_436755030 .VerificationCodeinputWb:hover{border-top-style:solid;} +#module_436755030 .smsvcode:hover,#module_436755030 .Pc-formList-content .in-formList-content:hover,#module_436755030 .Browse-file:hover,#module_436755030 .VerificationCodeinput:hover,#module_436755030 .customFormCheckbox:hover,#module_436755030 input[type=radio]:hover,#module_436755030 .in-formList-content:hover,#module_436755030 .frist-city-select:hover,#module_436755030 .Couty-select:hover,#module_436755030 .City-select:hover,#module_436755030 .VerificationCodeinputWb:hover{border-right-color:#1976d2;} +#module_436755030 .smsvcode:hover,#module_436755030 .Pc-formList-content .in-formList-content:hover,#module_436755030 .Browse-file:hover,#module_436755030 .VerificationCodeinput:hover,#module_436755030 .customFormCheckbox:hover,#module_436755030 input[type=radio]:hover,#module_436755030 .in-formList-content:hover,#module_436755030 .frist-city-select:hover,#module_436755030 .Couty-select:hover,#module_436755030 .City-select:hover,#module_436755030 .VerificationCodeinputWb{border-right-style:solid;} +#module_436755030 .smsvcode:hover,#module_436755030 .Pc-formList-content .in-formList-content:hover,#module_436755030 .Browse-file:hover,#module_436755030 .VerificationCodeinput:hover,#module_436755030 .customFormCheckbox:hover,#module_436755030 input[type=radio]:hover,#module_436755030 .in-formList-content:hover,#module_436755030 .frist-city-select:hover,#module_436755030 .Couty-select:hover,#module_436755030 .City-select:hover,#module_436755030 .VerificationCodeinputWb:hover{border-bottom-color:#1976d2;} +#module_436755030 .smsvcode:hover,#module_436755030 .Pc-formList-content .in-formList-content:hover,#module_436755030 .Browse-file:hover,#module_436755030 .VerificationCodeinput:hover,#module_436755030 .customFormCheckbox:hover,#module_436755030 input[type=radio]:hover,#module_436755030 .in-formList-content:hover,#module_436755030 .frist-city-select:hover,#module_436755030 .Couty-select:hover,#module_436755030 .City-select:hover,#module_436755030 .VerificationCodeinputWb:hover{border-bottom-style:solid;} +#module_436755030 .smsvcode:hover,#module_436755030 .Pc-formList-content .in-formList-content:hover,#module_436755030 .Browse-file:hover,#module_436755030 .VerificationCodeinput:hover,#module_436755030 .customFormCheckbox:hover,#module_436755030 input[type=radio]:hover,#module_436755030 .in-formList-content:hover,#module_436755030 .frist-city-select:hover,#module_436755030 .Couty-select:hover,#module_436755030 .City-select:hover,#module_436755030 .VerificationCodeinputWb:hover{border-left-color:#1976d2;} +#module_436755030 .smsvcode:hover,#module_436755030 .Pc-formList-content .in-formList-content:hover,#module_436755030 .Browse-file:hover,#module_436755030 .VerificationCodeinput:hover,#module_436755030 .customFormCheckbox:hover,#module_436755030 input[type=radio]:hover,#module_436755030 .in-formList-content:hover,#module_436755030 .frist-city-select:hover,#module_436755030 .Couty-select:hover,#module_436755030 .City-select:hover,#module_436755030 .VerificationCodeinputWb:hover{border-left-style:solid;} +#module_436755030 .submitbtn:hover{font-size:16px;} +#module_436755030 .submitbtn:hover{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_436755030 .submitbtn:hover{color:#fff;} +#module_436755030 .submitbtn:hover{font-weight:normal;} +#module_436755030 .submitbtn:hover{text-decoration:none;} +#module_436755030 .submitbtn:hover{font-style:normal;} +#module_436755030 .submitbtn:hover{background-color:#1976d2;} +#module_436755030 .submitbtn:hover{background-image:none;} +#module_436755030 .submitbtn:hover{background-repeat:no-repeat;} +#module_436755030 .submitbtn:hover{background-position:50% 50%;} +#module_436755030 .submitbtn:hover{background-attachment:scroll;} +#module_436755030 .submitbtn:hover{} +.module_384381632 .ModuleHead .HeadCenter{float:none;} +#module_384381632 { + padding:0px; +} +#module_384381632 { + position:static; + z-index:0; + top:2389px; + left:223px; + width:100%; + height: auto; +} +#module_384381632 .ModuleHead384381632 { + display:none; +} +#module_384381632 .BodyCenter.BodyCenter384381632 { + background:none;background-color:rgb(25, 118, 210); +} +#module_384381632 >.module_384381632 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_384381632 >.module_384381632{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_384381632 .BodyCenter.BodyCenter384381632 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_384381632 .BodyCenter.BodyCenter384381632 { + padding-top:8.6455%; + padding-left:4.3228%; + padding-right:4.3228%; + padding-bottom:1.4409%; + } +} +@media screen and (min-width: 768px){ + #module_384381632 >.module_384381632 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_384381632 >.module_384381632 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_384381632 >.module_384381632 {box-shadow: 0px 0px 0px 0px #ccc} +#module_384381632:hover { + border:none; +} +#module_384381632:hover >.module_384381632 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_384381632 .ModuleSubContainer{background-color:transparent;} +#module_384381632 .ModuleSubContainer{background-image:none;} +#module_384381632 .ModuleSubContainer{background-repeat:no-repeat;} +#module_384381632 .ModuleSubContainer{background-position:0% 0%;} +#module_384381632 .ModuleSubContainer{background-attachment:scroll;} +#module_384381632 .ModuleSubContainer{} +#module_384381632 {!bgVideo!}{bgVideoUrl:} +#module_384381632 .gridBgVideo .bgVideoMask{opacity:0.2} +#module_384381632 .ModuleSubContainer{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0); transition: box-shadow 0.5s ease;} +#module_384381632 .ModuleSubContainer:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +.ModuleGridContainer.ModuleGridContainer384381632 {} +.module_384381633 .ModuleHead .HeadCenter{float:none;} +#module_384381633 { + padding:0px; +} +#module_384381633 { + position:static; + z-index:0; + top:2467px; + left:266px; + width:100%; + height: auto; +} +#module_384381633 .ModuleHead384381633 { + display:none; +} +#module_384381633 { + border:none; +} +@media screen and (min-width: 768px){ + #module_384381633 >.module_384381633 { + } +} +@media screen and (max-width: 767px){ + #module_384381633 >.module_384381633 { + margin-top:3.1546%; + margin-left:0.0000%; + margin-right:50.4732%; + margin-bottom:0.0000%; + } +} + +#module_384381633 img{border-top-color:transparent;} +#module_384381633 img{border-top-style:none;} +#module_384381633 img{border-top-width:0px;} +#module_384381633 img{border-right-color:transparent;} +#module_384381633 img{border-right-style:none;} +#module_384381633 img{border-right-width:0px;} +#module_384381633 img{border-bottom-color:transparent;} +#module_384381633 img{border-bottom-style:none;} +#module_384381633 img{border-bottom-width:0px;} +#module_384381633 img{border-left-color:transparent;} +#module_384381633 img{border-left-style:none;} +#module_384381633 img{border-left-width:0px;} +#module_384381633 img{border-top-left-radius:0px;} +#module_384381633 img{border-top-right-radius:0px;} +#module_384381633 img{border-bottom-left-radius:0px;} +#module_384381633 img{border-bottom-right-radius:0px;} +#module_384381633 .BodyCenter{text-align: center;} + +/*È«¾ÖËÑË÷ layout102*/ +.ModuleSearchGiant.layout-102 .ModuleSearchFormStyle{padding: 0;} +.ModuleSearchGiant.layout-102 .btn-group.open .dropdown-toggle{box-shadow: none} +.ModuleSearchGiant.layout-102 .ModuleSearchFormStyle .content{display:table;width: 100%;height:auto;border: 0;border-radius: 0px;overflow: hidden;} +.ModuleSearchGiant.layout-102 .ModuleSearchFormStyle .group{display:table;width: 100%;height:auto;border:0;border-radius: 0px;overflow: hidden;} +.ModuleSearchGiant.layout-102 .ModuleSearchFormStyle .searchInputPanel, +.ModuleSearchGiant.layout-102 .ModuleSearchFormStyle .searchTypePanel{position: relative;display:table-cell;height:auto;border:0px;vertical-align: middle;} +.ModuleSearchGiant.layout-102 .ModuleSearchFormStyle .searchTypePanel{width: 1%;} +.ModuleSearchGiant.layout-102 .ModuleSearchFormStyle .searchBtnPanel{position: relative;display:block;height:36px;border:0px;} +.ModuleSearchGiant.layout-102 .ModuleSearchFormStyle .searchIcon{position: absolute;margin-top:-10px;top: 50%;left: 10px;width: 20px;height: 20px;} +.ModuleSearchGiant.layout-102 .ModuleSearchFormStyle .ModuleSearchInput{float: none;display:block;width: 100%;height: 36px;border: 1px solid #ccc;border-right:0px !important;border-radius: 0;text-indent: 40px;font-size:14px;outline: none;} +.ModuleSearchGiant.layout-102 .ModuleSearchFormStyle .searchTypePanel select{height: 100%;} +.ModuleSearchGiant.layout-102 .ModuleSearchFormStyle .bootstrap-select{float: left;height: auto;border: 0;border-radius: 0;} +.ModuleSearchGiant.layout-102 .ModuleSearchFormStyle .bootstrap-select .btn{padding-top: 0;padding-bottom: 0;height: 36px;border: 1px solid #ccc;border-left-width: 1px;border-radius: 0;line-height: 34px;} +.ModuleSearchGiant.layout-102 .ModuleSearchFormStyle .bootstrap-select .btn span{font-size: 12px;} +.ModuleSearchGiant.layout-102 .ModuleSearchFormStyle .ModuleSearchButton{float: left;display: block;min-width: 65px;width: 100%;height: 100% !important;border: 0;border-radius: 0;font-family: ΢ÈíÑźÚ,Microsoft YaHei;font-size: 12px;color:#fff;font-weight:normal;}.module_384381653 .ModuleHead .HeadCenter{float:none;} +#module_384381653 { + padding:0px; +} +#module_384381653 { + position:static; + z-index:0; + top:4202px; + left:266px; + width:100%; + height: auto; +} +#module_384381653 .ModuleHead384381653 { + display:none; +} +#module_384381653 .BodyCenter.BodyCenter384381653 { + background:none;background-color:rgba(0,0,0,0); +} +#module_384381653 >.module_384381653 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_384381653 >.module_384381653{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_384381653 .BodyCenter.BodyCenter384381653 { + padding-top:0.0000%; + padding-left:1.4577%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_384381653 .BodyCenter.BodyCenter384381653 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_384381653 >.module_384381653 { + margin-top:0.0000%; + margin-left:20.5539%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_384381653 >.module_384381653 { + margin-top:3.1546%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_384381653 >.module_384381653 {box-shadow: 0px 0px 0px 0px #ccc} +#module_384381653:hover { + border:none; +} +#module_384381653:hover >.module_384381653 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_384381653 .search-item .bootstrap-select .btn,#module_384381653 .search-item .searchBtnPanel,#module_384381653 .search-item .ModuleSearchInput{height:45px;line-height:45px} +#module_384381653 .search-item{} +#module_384381653 .search-item{background-repeat:no-repeat;} +#module_384381653 .search-item{} +#module_384381653 .search-item{} +#module_384381653 .search-item .bootstrap-select .btn,#module_384381653 .search-item .ModuleSearchInput{border-top-color:rgb(129, 140, 151);} +#module_384381653 .search-item .bootstrap-select .btn,#module_384381653 .search-item .ModuleSearchInput{border-top-style:solid;} +#module_384381653 .search-item .bootstrap-select .btn,#module_384381653 .search-item .ModuleSearchInput{border-top-width:1px;} +#module_384381653 .search-item .ModuleSearchInput{border-right-color:rgb(129, 140, 151);} +#module_384381653 .search-item .ModuleSearchInput{border-right-style:solid;} +#module_384381653 .search-item .ModuleSearchInput{border-right-width:1px;} +#module_384381653 .search-item .bootstrap-select .btn,#module_384381653 .search-item .ModuleSearchInput{border-bottom-color:rgb(129, 140, 151);} +#module_384381653 .search-item .bootstrap-select .btn,#module_384381653 .search-item .ModuleSearchInput{border-bottom-style:solid;} +#module_384381653 .search-item .bootstrap-select .btn,#module_384381653 .search-item .ModuleSearchInput{border-bottom-width:1px;} +#module_384381653 .search-item .bootstrap-select .btn,#module_384381653 .search-item .ModuleSearchInput{border-left-color:rgb(129, 140, 151);} +#module_384381653 #module_384381653 .search-item .bootstrap-select .btn,#module_384381653 .search-item .ModuleSearchInput{border-left-style:solid;} +#module_384381653 .search-item .bootstrap-select .btn,#module_384381653 .search-item .ModuleSearchInput{border-left-width:1px;} +#module_384381653 .search-item .bootstrap-select .btn ,#module_384381653 .search-item .ModuleSearchInput {background-color:rgba(0,0,0,0);} +#module_384381653 .search-item .bootstrap-select .btn ,#module_384381653 .search-item .ModuleSearchInput{} +#module_384381653 .search-item .ModuleSearchInput::placeholder,#module_384381653 .search-item .ModuleSearchInput{font-size:12px;} +#module_384381653 .search-item .bootstrap-select .btn ,#module_384381653 .search-item .ModuleSearchInput::placeholder,#module_384381653 .search-item .ModuleSearchInput{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_384381653 .search-item .bootstrap-select .btn , #module_384381653 .search-item .searchIcon,#module_384381653 .search-item .ModuleSearchInput::placeholder,#module_384381653 .search-item .ModuleSearchInput{color:rgb(129, 140, 151);} +#module_384381653 .search-item .bootstrap-select .btn ,#module_384381653 .search-item .ModuleSearchInput::placeholder,#module_384381653 .search-item .ModuleSearchInput{font-weight:normal;} +#module_384381653 .search-item .bootstrap-select .btn ,#module_384381653 .search-item .ModuleSearchInput::placeholder,#module_384381653 .search-item .ModuleSearchInput{text-decoration:none;} +#module_384381653 .search-item .bootstrap-select .btn ,#module_384381653 .search-item .ModuleSearchInput::placeholder,#module_384381653 .search-item .ModuleSearchInput{font-style:normal;} +#module_384381653 .search-item .ModuleSearchButton{font-size:12px;} +#module_384381653 .search-item .ModuleSearchButton{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_384381653 .search-item .ModuleSearchButton{color:rgb(255, 255, 255);} +#module_384381653 .search-item .ModuleSearchButton{font-weight:normal;} +#module_384381653 .search-item .ModuleSearchButton{text-decoration:none;} +#module_384381653 .search-item .ModuleSearchButton{font-style:normal;} +#module_384381653 .search-item .ModuleSearchButton{background-color:rgb(129, 140, 151);} +#module_384381653 .search-item .ModuleSearchButton{background-image:none;} +#module_384381653 .search-item .ModuleSearchButton{background-repeat:no-repeat;} +#module_384381653 .search-item .ModuleSearchButton{} +#module_384381653 .search-item .ModuleSearchButton{} +#module_384381653 .search-item .ModuleSearchButton{} +#module_384381653 .search-hot ul li{border-top-color:#e3e3e3;} +#module_384381653 .search-hot ul li{border-top-style:solid;} +#module_384381653 .search-hot ul li{border-top-width:0px;} +#module_384381653 .search-hot ul li{border-right-color:#e3e3e3;} +#module_384381653 .search-hot ul li{border-right-style:solid;} +#module_384381653 .search-hot ul li{border-right-width:1px;} +#module_384381653 .search-hot ul li{border-bottom-color:#e3e3e3;} +#module_384381653 .search-hot ul li{border-bottom-style:solid;} +#module_384381653 .search-hot ul li{border-bottom-width:0px;} +#module_384381653 .search-hot ul li{border-left-color:#e3e3e3;} +#module_384381653 .search-hot ul li{border-left-style:solid;} +#module_384381653 .search-hot ul li{border-left-width:0px;} +#module_384381653 .search-hot ul li a{font-size:12px;} +#module_384381653 .search-hot ul li a{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_384381653 .search-hot ul li a{color:#666;} +#module_384381653 .search-hot ul li a{font-weight:normal;} +#module_384381653 .search-hot ul li a{text-decoration:none;} +#module_384381653 .search-hot ul li a{font-style:normal;} +#module_384381653 .search-item .ModuleSearchButton:hover{background-color:rgb(101, 164, 201);} +#module_384381653 .search-item .ModuleSearchButton:hover{background-image:none;} +#module_384381653 .search-item .ModuleSearchButton:hover{background-repeat:no-repeat;} +#module_384381653 .search-item .ModuleSearchButton:hover{} +#module_384381653 .search-item .ModuleSearchButton:hover{} +#module_384381653 .search-item .ModuleSearchButton:hover{} +#module_384381653 .search-item .ModuleSearchButton:hover{font-size:12px;} +#module_384381653 .search-item .ModuleSearchButton:hover{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_384381653 .search-item .ModuleSearchButton:hover{color:#fff;} +#module_384381653 .search-item .ModuleSearchButton:hover{font-weight:normal;} +#module_384381653 .search-item .ModuleSearchButton:hover{text-decoration:none;} +#module_384381653 .search-item .ModuleSearchButton:hover{font-style:normal;} +#module_384381653 .search-hot ul li:hover a{font-size:12px;} +#module_384381653 .search-hot ul li:hover a{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_384381653 .search-hot ul li:hover a{color:#333;} +#module_384381653 .search-hot ul li:hover a{font-weight:normal;} +#module_384381653 .search-hot ul li:hover a{text-decoration:none;} +#module_384381653 .search-hot ul li:hover a{font-style:normal;} + +.ModuleShareGiant.layout-101 .social-share a { text-decoration: none;} +.ModuleShareGiant.layout-101 .social-share,.ModuleShareGiant.layout-101 .tips{ display: inline-block; } +.ModuleShareGiant.layout-101 .mvertical { + margin-left: 0 !important; + margin-right: 0 !important; +} + +.ModuleShareGiant.layout-101 .social-share .social-share-icon { + position: relative; + display: inline-block; + width: 36px; + height: 36px; + font-size: 20px; + border-radius: 50%; + line-height: 36px; + border: 1px solid #ccc; + color: #999; + text-align: center; + vertical-align: middle; + transition: background 0.6s ease-out 0s; + margin-right: 5px; + margin-left: 5px; + margin-top: 8px; + margin-bottom: 8px; +} +/* .ModuleShareGiant.layout-101 .social-share .icon-default-WeChat:hover{ color: #3dbe5b !important; border-color: #3dbe5b !important;} +.ModuleShareGiant.layout-101 .social-share .type-weibo:hover{ color: #ff5757 !important; border-color: #ff5757 !important;} +.ModuleShareGiant.layout-101 .social-share .icon-kefulei_huabanfuben11:hover{ color: #21b3f7 !important; border-color: #21b3f7 !important;} +.ModuleShareGiant.layout-101 .social-share .icon-kongjian:hover{ color: #f8c514 !important; border-color: #f8c514 !important;} +.ModuleShareGiant.layout-101 .social-share .icon-Facebook2:hover{ color: #3D5A98 !important; border-color: #3D5A98 !important;} +.ModuleShareGiant.layout-101 .social-share .icon-Twitter1:hover{ color: #1DA1F3 !important; border-color: #1DA1F3 !important;} */ +.ModuleShareGiant.layout-101 .social-share .icon-wechat .mwechat-qrcode { + display: none; + border: 1px solid #eee; + position: absolute; + z-index: 9; + top: -205px; + left: -84px; + width: 200px; + height: 192px; + color: #666; + font-size: 12px; + text-align: center; + background-color: #fff; + box-shadow: 0 2px 10px #aaa; + transition: all 200ms; +} +.ModuleShareGiant.layout-101 .social-share .icon-wechat:hover .mwechat-qrcode { + display: block; +} +.ModuleShareGiant.layout-101 .social-share .icon-wechat .mwechat-qrcode .qrcode { + width: 105px; + margin: 10px auto; +} +.ModuleShareGiant.layout-101 .social-share .icon-wechat .mwechat-qrcode .help p { + font-weight: normal; + line-height: 16px; + padding: 0; + margin: 0; +} +.ModuleShareGiant.layout-101 .social-share .icon-wechat .mwechat-qrcode:after { + content: ''; + position: absolute; + left: 50%; + margin-left: -6px; + bottom: -13px; + width: 0; + height: 0; + border-width: 8px 6px 6px 6px; + border-style: solid; + border-color: #fff transparent transparent transparent; +} +.ModuleShareGiant.layout-101 .social-share .icon-wechat .mwechat-qrcode h4 { + font-weight: normal; + height: 26px; + line-height: 26px; + font-size: 12px; + background-color: #f3f3f3; + margin: 0; + padding: 0; + color: #777; +} +.ModuleShareGiant.layout-101 .mshareMask{ top: 0; + left: 0; position: fixed; z-index: 999; height: 100%; width: 100%; background: #000; opacity: 0.6; display: none;} + +.ModuleShareGiant.layout-101 .share-wx-qrcode-img .help p{ width: 40%; margin: 0 auto; color:#999; display: block; line-height: 20px; height: auto; } +.ModuleShareGiant.layout-101 .share-wx-qrcode-img,.mwechat-qrcode { border-radius: 5px; top:0px; position: fixed;z-index:9999; top: 50%; + left: 50%;box-shadow: 0px 0px 9px 5px rgba(0,0,0,0.09); + transform: translate(-50%,-50%);text-align: center; width: 270px; background: #fff; visibility: hidden;} +.ModuleShareGiant.layout-101 #mwx-qrcode{ width: 224px; height: 224px; margin: 0 auto;} +.ModuleShareGiant.layout-101 .share-wx-qrcode-img h4{border-top-right-radius: 5px; + border-top-left-radius: 5px;background: #F7F8FA; height: 40px; line-height: 40px; font-size: 16px; color: #666; font-weight: bold; margin-bottom: 13px;} +.ModuleShareGiant.layout-101 .share-wx-qrcode-img .help{ margin-top: 12px; margin-bottom: 19px; color: #999;font-size: 14px; line-height: 20px;} +.ModuleShareGiant.layout-101 .share-wx-tips{ display: none; z-index: 99999; + position: fixed; + top: 10px; + right: 35px; color: #fff; font-size: 24px; text-align: center;}.module_384381640 .ModuleHead .HeadCenter{float:none;} +#module_384381640 { + padding:0px; +} +#module_384381640 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_384381640 .ModuleHead384381640 { + display:none; +} +#module_384381640 .BodyCenter.BodyCenter384381640 { + background:none;background-color:rgba(0,0,0,0); +} +#module_384381640 >.module_384381640 { + border-top-style:solid; + border-top-color:rgb(58, 67, 76); + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_384381640 >.module_384381640{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_384381640 .BodyCenter.BodyCenter384381640 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_384381640 .BodyCenter.BodyCenter384381640 { + padding-top:1.5773%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_384381640 >.module_384381640 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_384381640 >.module_384381640 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_384381640 >.module_384381640 {box-shadow: 0px 0px 0px 0px #ccc} +#module_384381640:hover { + border:none; +} +#module_384381640:hover >.module_384381640 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_384381640 .ModuleSharediv{text-align: left;} +#module_384381640 .social-share-icon{color:rgb(255, 255, 255);} +#module_384381640 .social-share-icon{font-size:18px;} +#module_384381640 .social-share-icon{ margin-right:0px;margin-left:0px;} #module_384381640 .mvertical{margin-top:0px;margin-bottom:0px;} +#module_384381640 .social-share-icon{height:36px; width:36px;line-height:36px} +#module_384381640 .social-share-icon{border-top-color:#ccc;} +#module_384381640 .social-share-icon{border-top-style:solid;} +#module_384381640 .social-share-icon{border-top-width:0px;} +#module_384381640 .social-share-icon{border-right-color:#ccc;} +#module_384381640 .social-share-icon{border-right-style:solid;} +#module_384381640 .social-share-icon{border-right-width:0px;} +#module_384381640 .social-share-icon{border-bottom-color:#ccc;} +#module_384381640 .social-share-icon{border-bottom-style:solid;} +#module_384381640 .social-share-icon{border-bottom-width:0px;} +#module_384381640 .social-share-icon{border-left-color:#ccc;} +#module_384381640 .social-share-icon{border-left-style:solid;} +#module_384381640 .social-share-icon{border-left-width:0px;} +#module_384381640 .social-share-icon{background-color:transparent;} +#module_384381640 .social-share-icon{} +#module_384381640 .social-share-icon:hover{background-color:transparent;} +#module_384381640 .social-share-icon:hover{} +#module_384381640 .social-share-icon:hover{color:rgb(101, 164, 201);} +#module_384381640 .social-share-icon:hover{font-size:20px;} +#module_384381640 .social-share-icon:hover{border-top-color:#ccc;} +#module_384381640 .social-share-icon:hover{border-top-style:solid;} +#module_384381640 .social-share-icon:hover{border-top-width:0px;} +#module_384381640 .social-share-icon:hover{border-right-color:#ccc;} +#module_384381640 .social-share-icon:hover{border-right-style:solid;} +#module_384381640 .social-share-icon:hover{border-right-width:0px;} +#module_384381640 .social-share-icon:hover{border-bottom-color:#ccc;} +#module_384381640 .social-share-icon:hover{border-bottom-style:solid;} +#module_384381640 .social-share-icon:hover{border-bottom-width:0px;} +#module_384381640 .social-share-icon:hover{border-left-color:#ccc;} +#module_384381640 .social-share-icon:hover{border-left-style:solid;} +#module_384381640 .social-share-icon:hover{border-left-width:0px;} + +.module_384381635 .ModuleHead .HeadCenter{float:none;} +#module_384381635 { + padding:0px; +} +#module_384381635 { + position:static; + z-index:0; + top:2543px; + left:253px; + width:100%; + height: auto; +} +#module_384381635 .ModuleHead384381635 { + display:none; +} +#module_384381635 .BodyCenter.BodyCenter384381635 { + background:none;background-color:rgb(25, 118, 210); +} +#module_384381635 >.module_384381635 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_384381635 >.module_384381635{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_384381635 .BodyCenter.BodyCenter384381635 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_384381635 .BodyCenter.BodyCenter384381635 { + padding-top:0.0000%; + padding-left:4.3228%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_384381635 >.module_384381635 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_384381635 >.module_384381635 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_384381635 >.module_384381635 {box-shadow: 0px 0px 0px 0px #ccc} +#module_384381635:hover { + border:none; +} +#module_384381635:hover >.module_384381635 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_384381635 .ModuleSubContainer{background-color:transparent;} +#module_384381635 .ModuleSubContainer{background-image:none;} +#module_384381635 .ModuleSubContainer{background-repeat:no-repeat;} +#module_384381635 .ModuleSubContainer{background-position:0% 0%;} +#module_384381635 .ModuleSubContainer{background-attachment:scroll;} +#module_384381635 .ModuleSubContainer{} +#module_384381635 {!bgVideo!}{bgVideoUrl:} +#module_384381635 .gridBgVideo .bgVideoMask{opacity:0.2} +#module_384381635 .ModuleSubContainer{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0); transition: box-shadow 0.5s ease;} +#module_384381635 .ModuleSubContainer:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +.ModuleGridContainer.ModuleGridContainer384381635 {} +.module_384381636 .ModuleHead .HeadCenter{float:none;} +#module_384381636 { + padding:0px; +} +#module_384381636 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_384381636 .ModuleHead384381636 { + display:none; +} +#module_384381636 .BodyCenter.BodyCenter384381636 { + background:none;background-color:rgba(0,0,0,0); +} +#module_384381636 >.module_384381636 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_384381636 >.module_384381636{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_384381636 .BodyCenter.BodyCenter384381636 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_384381636 .BodyCenter.BodyCenter384381636 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_384381636 >.module_384381636 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_384381636 >.module_384381636 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_384381636 >.module_384381636 {box-shadow: 0px 0px 0px 0px #ccc} +#module_384381636:hover { + border:none; +} +#module_384381636:hover >.module_384381636 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_384381636 .ModuleImageTextGiantContent{margin-top:0px;} +#module_384381636 .ModuleImageTextGiantContent{margin-bottom:0px;} +#module_384381636 .ModuleImageTextGiantContent{margin-left:0px;} +#module_384381636 .ModuleImageTextGiantContent{margin-right:0px;} +#module_384381636 .imageTextGiant-Container{padding-top:10px;} +#module_384381636 .imageTextGiant-Container{padding-bottom:10px;} +#module_384381636 .imageTextGiant-Container{padding-left:0px;} +#module_384381636 .imageTextGiant-Container{padding-right:10px;} +#module_384381636 .showHandle .btn{font-size:14px;} +#module_384381636 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_384381636 .showHandle .btn{color:#333;} +#module_384381636 .showHandle .btn{font-weight:400;} +#module_384381636 .showHandle .btn{text-decoration:none;} +#module_384381636 .showHandle .btn{font-style:normal;} +#module_384381636 .showHandle div{border-top-color:#ddd !important;} +#module_384381636 .showHandle div{border-top-style:solid !important;} +#module_384381636 .showHandle div{border-top-width:1px !important;} +#module_384381636 .showHandle{background-color:transparent;} +#module_384381636 .showHandle{background-image:none;} +#module_384381636 .showHandle{background-repeat:no-repeat;} +#module_384381636 .showHandle{} +#module_384381636 .showHandle{} +#module_384381636 .showHandle{} +#module_384381636 a{font-size:unset;font-family:unset} +.module_386836776 .ModuleHead .HeadCenter{float:none;} +#module_386836776 { + padding:0px; +} +#module_386836776 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_386836776 .ModuleHead386836776 { + display:none; +} +#module_386836776 .BodyCenter.BodyCenter386836776 { + background-color:transparent; + background-image:url(/comdata/92915/202111/20211108165301c8ce04.jpg); + background-size:auto; + background-repeat:no-repeat; + background-position:50% 0%; + background-Attachment:scroll; +} +#module_386836776 >.module_386836776 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_386836776 >.module_386836776{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_386836776 .BodyCenter.BodyCenter386836776 { + padding-top:1.0460%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:1.0460%; + } +} +@media screen and (max-width: 767px){ + #module_386836776 .BodyCenter.BodyCenter386836776 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_386836776 >.module_386836776 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_386836776 >.module_386836776 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_386836776 >.module_386836776 {box-shadow: 0px 0px 0px 0px #ccc} +#module_386836776:hover { + border:none; +} +#module_386836776:hover >.module_386836776 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_386836776 .ModuleSubContainer{background-color:transparent;} +#module_386836776 .ModuleSubContainer{background-image:none;} +#module_386836776 .ModuleSubContainer{background-repeat:no-repeat;} +#module_386836776 .ModuleSubContainer{background-position:0% 0%;} +#module_386836776 .ModuleSubContainer{background-attachment:scroll;} +#module_386836776 .ModuleSubContainer{} +#module_386836776 {!bgVideo!}{bgVideoUrl:} +#module_386836776 .gridBgVideo .bgVideoMask{opacity:0.2} +#module_386836776 .ModuleSubContainer{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0); transition: box-shadow 0.5s ease;} +#module_386836776 .ModuleSubContainer:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +.ModuleGridContainer.ModuleGridContainer386836776 {max-width:1400px;width:auto;} +.module_386839883 .ModuleHead .HeadCenter{float:none;} +#module_386839883 { + padding:0px; +} +#module_386839883 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_386839883 .ModuleHead386839883 { + display:none; +} +#module_386839883 .BodyCenter.BodyCenter386839883 { + background:none;background-color:rgba(0,0,0,0); +} +#module_386839883 >.module_386839883 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_386839883 >.module_386839883{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_386839883 .BodyCenter.BodyCenter386839883 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_386839883 .BodyCenter.BodyCenter386839883 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_386839883 >.module_386839883 { + margin-top:21.4133%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_386839883 >.module_386839883 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_386839883 >.module_386839883 {box-shadow: 0px 0px 0px 0px #ccc} +#module_386839883:hover { + border:none; +} +#module_386839883:hover >.module_386839883 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_386839883 .ModuleImageTextGiantContent{margin-top:0px;} +#module_386839883 .ModuleImageTextGiantContent{margin-bottom:0px;} +#module_386839883 .ModuleImageTextGiantContent{margin-left:0px;} +#module_386839883 .ModuleImageTextGiantContent{margin-right:0px;} +#module_386839883 .imageTextGiant-Container{padding-top:10px;} +#module_386839883 .imageTextGiant-Container{padding-bottom:10px;} +#module_386839883 .imageTextGiant-Container{padding-left:10px;} +#module_386839883 .imageTextGiant-Container{padding-right:10px;} +#module_386839883 .showHandle .btn{font-size:14px;} +#module_386839883 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_386839883 .showHandle .btn{color:#333;} +#module_386839883 .showHandle .btn{font-weight:400;} +#module_386839883 .showHandle .btn{text-decoration:none;} +#module_386839883 .showHandle .btn{font-style:normal;} +#module_386839883 .showHandle div{border-top-color:#ddd !important;} +#module_386839883 .showHandle div{border-top-style:solid !important;} +#module_386839883 .showHandle div{border-top-width:1px !important;} +#module_386839883 .showHandle{background-color:transparent;} +#module_386839883 .showHandle{background-image:none;} +#module_386839883 .showHandle{background-repeat:no-repeat;} +#module_386839883 .showHandle{} +#module_386839883 .showHandle{} +#module_386839883 .showHandle{} +#module_386839883 a{font-size:unset;font-family:unset} +.module_386840217 .ModuleHead .HeadCenter{float:none;} +#module_386840217 { + padding:0px; +} +#module_386840217 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_386840217 .ModuleHead386840217 { + display:none; +} +#module_386840217 .BodyCenter.BodyCenter386840217 { + background:none;background-color:rgba(0,0,0,0); +} +#module_386840217 >.module_386840217 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_386840217 >.module_386840217{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_386840217 .BodyCenter.BodyCenter386840217 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_386840217 .BodyCenter.BodyCenter386840217 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_386840217 >.module_386840217 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:21.4133%; + } +} +@media screen and (max-width: 767px){ + #module_386840217 >.module_386840217 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_386840217 >.module_386840217 {box-shadow: 0px 0px 0px 0px #ccc} +#module_386840217:hover { + border:none; +} +#module_386840217:hover >.module_386840217 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_386840217 .ModuleImageTextGiantContent{margin-top:0px;} +#module_386840217 .ModuleImageTextGiantContent{margin-bottom:0px;} +#module_386840217 .ModuleImageTextGiantContent{margin-left:0px;} +#module_386840217 .ModuleImageTextGiantContent{margin-right:0px;} +#module_386840217 .imageTextGiant-Container{padding-top:10px;} +#module_386840217 .imageTextGiant-Container{padding-bottom:10px;} +#module_386840217 .imageTextGiant-Container{padding-left:10px;} +#module_386840217 .imageTextGiant-Container{padding-right:10px;} +#module_386840217 .showHandle .btn{font-size:14px;} +#module_386840217 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_386840217 .showHandle .btn{color:#333;} +#module_386840217 .showHandle .btn{font-weight:400;} +#module_386840217 .showHandle .btn{text-decoration:none;} +#module_386840217 .showHandle .btn{font-style:normal;} +#module_386840217 .showHandle div{border-top-color:#ddd !important;} +#module_386840217 .showHandle div{border-top-style:solid !important;} +#module_386840217 .showHandle div{border-top-width:1px !important;} +#module_386840217 .showHandle{background-color:transparent;} +#module_386840217 .showHandle{background-image:none;} +#module_386840217 .showHandle{background-repeat:no-repeat;} +#module_386840217 .showHandle{} +#module_386840217 .showHandle{} +#module_386840217 .showHandle{} +#module_386840217 a{font-size:unset;font-family:unset} +.module_386840269 .ModuleHead .HeadCenter{float:none;} +#module_386840269 { + padding:0px; +} +#module_386840269 { + position:static; + z-index:0; + top:0px; + width:100%; + height: auto; +} +#module_386840269 .ModuleHead386840269 { + display:none; +} +#module_386840269 .BodyCenter.BodyCenter386840269 { + background:none;background-color:rgba(0,0,0,0); +} +#module_386840269 >.module_386840269 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:rgb(166, 182, 208); + border-bottom-width:1px; +} +#module_386840269 >.module_386840269{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_386840269 .BodyCenter.BodyCenter386840269 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:1.4286%; + } +} +@media screen and (max-width: 767px){ + #module_386840269 .BodyCenter.BodyCenter386840269 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_386840269 >.module_386840269 { + margin-top:40.0000%; + margin-left:5.7143%; + margin-right:5.7143%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_386840269 >.module_386840269 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_386840269 >.module_386840269 {box-shadow: 0px 0px 0px 0px #ccc} +#module_386840269:hover { + border:none; +} +#module_386840269:hover >.module_386840269 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_386840269 .ModuleImageTextGiantContent{margin-top:0px;} +#module_386840269 .ModuleImageTextGiantContent{margin-bottom:0px;} +#module_386840269 .ModuleImageTextGiantContent{margin-left:0px;} +#module_386840269 .ModuleImageTextGiantContent{margin-right:0px;} +#module_386840269 .imageTextGiant-Container{padding-top:10px;} +#module_386840269 .imageTextGiant-Container{padding-bottom:10px;} +#module_386840269 .imageTextGiant-Container{padding-left:10px;} +#module_386840269 .imageTextGiant-Container{padding-right:10px;} +#module_386840269 .showHandle .btn{font-size:14px;} +#module_386840269 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_386840269 .showHandle .btn{color:#333;} +#module_386840269 .showHandle .btn{font-weight:400;} +#module_386840269 .showHandle .btn{text-decoration:none;} +#module_386840269 .showHandle .btn{font-style:normal;} +#module_386840269 .showHandle div{border-top-color:#ddd !important;} +#module_386840269 .showHandle div{border-top-style:solid !important;} +#module_386840269 .showHandle div{border-top-width:1px !important;} +#module_386840269 .showHandle{background-color:transparent;} +#module_386840269 .showHandle{background-image:none;} +#module_386840269 .showHandle{background-repeat:no-repeat;} +#module_386840269 .showHandle{} +#module_386840269 .showHandle{} +#module_386840269 .showHandle{} +#module_386840269 a{font-size:unset;font-family:unset} +/*ͼÎÄÄ£¿é layout 103*/ +.ModuleImageTextGiant.layout-110 .imageTextGiant-Container{max-height: 100%; max-width: 100%; padding: 10px;} + +@media only screen and (max-width: 767px) { + .ModuleImageTextGiant.layout-110 .imageTextGiant-Container .row{width:auto;} + .ModuleImageTextGiant.layout-110 .imageTextGiant-Container .row .col-sm-4{padding: 0px 15px} + .ModuleImageTextGiant.layout-110 .imageTextGiant-Container .row .col-xs-12{margin-bottom: 40px} + +} +/*@media only screen and (max-width: 1000px) {*/ +/*.ModuleImageTextGiant.layout-110 .imageTextGiant-Container .row{width: auto;}*/ +/*}*/ +/*@media only screen and (min-width: 769px) and (max-width: 991px) {*/ +/*.ModuleImageTextGiant.layout-110 .imageTextGiant-Container .row{width:auto;}*/ +/*.ModuleImageTextGiant.layout-110 .imageTextGiant-Container .row .col-xs-12{width: 33.33333%;padding:0;}*/ +/*.ModuleImageTextGiant.layout-110 .imageTextGiant-Container{padding-left: 20px}*/ + +/*}*/ +@media only screen and (min-width: 768px) { + .ModuleImageTextGiant.layout-110 .imageTextGiant-Container .GraphicUpper{margin-bottom: 10px;text-align: center;} + .ModuleImageTextGiant.layout-110 .imageTextGiant-Container .row .col-md-4{padding:15px 36px;} +}.module_386840548 .ModuleHead .HeadCenter{float:none;} +#module_386840548 { + padding:0px; +} +#module_386840548 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_386840548 .ModuleHead386840548 { + display:none; +} +#module_386840548 .BodyCenter.BodyCenter386840548 { + background:none;background-color:rgba(0,0,0,0); +} +#module_386840548 >.module_386840548 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_386840548 >.module_386840548{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_386840548 .BodyCenter.BodyCenter386840548 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_386840548 .BodyCenter.BodyCenter386840548 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_386840548 >.module_386840548 { + margin-top:2.8571%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_386840548 >.module_386840548 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_386840548 >.module_386840548 {box-shadow: 0px 0px 0px 0px #ccc} +#module_386840548:hover { + border:none; +} +#module_386840548:hover >.module_386840548 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_386840548 .GraphicUpper .TextImage{border-top-left-radius:0px;} +#module_386840548 .GraphicUpper .TextImage{border-top-right-radius:0px;} +#module_386840548 .GraphicUpper .TextImage{border-bottom-left-radius:0px;} +#module_386840548 .GraphicUpper .TextImage{border-bottom-right-radius:0px;} +#module_386840548 .GraphicUpper .TextImage{margin-top:0px;} +#module_386840548 .GraphicUpper .TextImage{margin-bottom:0px;} +#module_386840548 .GraphicUpper .TextImage{margin-left:0px;} +#module_386840548 .GraphicUpper .TextImage{margin-right:0px;} +#module_386840548 .ModuleImageTextGiantContent{margin-top:0px;} +#module_386840548 .ModuleImageTextGiantContent{margin-bottom:0px;} +#module_386840548 .ModuleImageTextGiantContent{margin-left:0px;} +#module_386840548 .ModuleImageTextGiantContent{margin-right:0px;} +#module_386840548 .showHandle .btn{font-size:14px;} +#module_386840548 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_386840548 .showHandle .btn{color:#333;} +#module_386840548 .showHandle .btn{font-weight:400;} +#module_386840548 .showHandle .btn{text-decoration:none;} +#module_386840548 .showHandle .btn{font-style:normal;} +#module_386840548 .showHandle div{border-top-color:#ddd !important;} +#module_386840548 .showHandle div{border-top-style:solid !important;} +#module_386840548 .showHandle div{border-top-width:1px !important;} +#module_386840548 .showHandle{background-color:transparent;} +#module_386840548 .showHandle{background-image:none;} +#module_386840548 .showHandle{background-repeat:no-repeat;} +#module_386840548 .showHandle{} +#module_386840548 .showHandle{} +#module_386840548 .showHandle{} +#module_386840548 a{font-size:unset;font-family:unset} +.module_386840751 .ModuleHead .HeadCenter{float:none;} +#module_386840751 { + padding:0px; +} +#module_386840751 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_386840751 .ModuleHead386840751 { + display:none; +} +#module_386840751 .BodyCenter.BodyCenter386840751 { + background:none;background-color:rgba(0,0,0,0); +} +#module_386840751 >.module_386840751 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:rgb(166, 182, 208); + border-bottom-width:1px; +} +#module_386840751 >.module_386840751{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_386840751 .BodyCenter.BodyCenter386840751 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:1.4286%; + } +} +@media screen and (max-width: 767px){ + #module_386840751 .BodyCenter.BodyCenter386840751 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_386840751 >.module_386840751 { + margin-top:40.0000%; + margin-left:5.7143%; + margin-right:5.7143%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_386840751 >.module_386840751 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_386840751 >.module_386840751 {box-shadow: 0px 0px 0px 0px #ccc} +#module_386840751:hover { + border:none; +} +#module_386840751:hover >.module_386840751 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_386840751 .ModuleImageTextGiantContent{margin-top:0px;} +#module_386840751 .ModuleImageTextGiantContent{margin-bottom:0px;} +#module_386840751 .ModuleImageTextGiantContent{margin-left:0px;} +#module_386840751 .ModuleImageTextGiantContent{margin-right:0px;} +#module_386840751 .imageTextGiant-Container{padding-top:10px;} +#module_386840751 .imageTextGiant-Container{padding-bottom:10px;} +#module_386840751 .imageTextGiant-Container{padding-left:10px;} +#module_386840751 .imageTextGiant-Container{padding-right:10px;} +#module_386840751 .showHandle .btn{font-size:14px;} +#module_386840751 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_386840751 .showHandle .btn{color:#333;} +#module_386840751 .showHandle .btn{font-weight:400;} +#module_386840751 .showHandle .btn{text-decoration:none;} +#module_386840751 .showHandle .btn{font-style:normal;} +#module_386840751 .showHandle div{border-top-color:#ddd !important;} +#module_386840751 .showHandle div{border-top-style:solid !important;} +#module_386840751 .showHandle div{border-top-width:1px !important;} +#module_386840751 .showHandle{background-color:transparent;} +#module_386840751 .showHandle{background-image:none;} +#module_386840751 .showHandle{background-repeat:no-repeat;} +#module_386840751 .showHandle{} +#module_386840751 .showHandle{} +#module_386840751 .showHandle{} +#module_386840751 a{font-size:unset;font-family:unset} +.module_386841572 .ModuleHead .HeadCenter{float:none;} +#module_386841572 { + padding:0px; +} +#module_386841572 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_386841572 .ModuleHead386841572 { + display:none; +} +#module_386841572 .BodyCenter.BodyCenter386841572 { + background:none;background-color:rgba(0,0,0,0); +} +#module_386841572 >.module_386841572 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_386841572 >.module_386841572{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_386841572 .BodyCenter.BodyCenter386841572 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_386841572 .BodyCenter.BodyCenter386841572 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_386841572 >.module_386841572 { + margin-top:2.8571%; + margin-left:5.7143%; + margin-right:5.7143%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_386841572 >.module_386841572 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_386841572 >.module_386841572 {box-shadow: 0px 0px 0px 0px #ccc} +#module_386841572:hover { + border:none; +} +#module_386841572:hover >.module_386841572 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_386841572 .ModuleImageTextGiantContent{margin-top:0px;} +#module_386841572 .ModuleImageTextGiantContent{margin-bottom:0px;} +#module_386841572 .ModuleImageTextGiantContent{margin-left:0px;} +#module_386841572 .ModuleImageTextGiantContent{margin-right:0px;} +#module_386841572 .imageTextGiant-Container{padding-top:10px;} +#module_386841572 .imageTextGiant-Container{padding-bottom:10px;} +#module_386841572 .imageTextGiant-Container{padding-left:10px;} +#module_386841572 .imageTextGiant-Container{padding-right:10px;} +#module_386841572 .showHandle .btn{font-size:14px;} +#module_386841572 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_386841572 .showHandle .btn{color:#333;} +#module_386841572 .showHandle .btn{font-weight:400;} +#module_386841572 .showHandle .btn{text-decoration:none;} +#module_386841572 .showHandle .btn{font-style:normal;} +#module_386841572 .showHandle div{border-top-color:#ddd !important;} +#module_386841572 .showHandle div{border-top-style:solid !important;} +#module_386841572 .showHandle div{border-top-width:1px !important;} +#module_386841572 .showHandle{background-color:transparent;} +#module_386841572 .showHandle{background-image:none;} +#module_386841572 .showHandle{background-repeat:no-repeat;} +#module_386841572 .showHandle{} +#module_386841572 .showHandle{} +#module_386841572 .showHandle{} +#module_386841572 a{font-size:unset;font-family:unset} +.module_386840770 .ModuleHead .HeadCenter{float:none;} +#module_386840770 { + padding:0px; +} +#module_386840770 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_386840770 .ModuleHead386840770 { + display:none; +} +#module_386840770 .BodyCenter.BodyCenter386840770 { + background:none;background-color:rgba(0,0,0,0); +} +#module_386840770 >.module_386840770 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:rgb(166, 182, 208); + border-bottom-width:1px; +} +#module_386840770 >.module_386840770{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_386840770 .BodyCenter.BodyCenter386840770 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:2.1459%; + } +} +@media screen and (max-width: 767px){ + #module_386840770 .BodyCenter.BodyCenter386840770 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_386840770 >.module_386840770 { + margin-top:60.0858%; + margin-left:8.5837%; + margin-right:8.5837%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_386840770 >.module_386840770 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_386840770 >.module_386840770 {box-shadow: 0px 0px 0px 0px #ccc} +#module_386840770:hover { + border:none; +} +#module_386840770:hover >.module_386840770 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_386840770 .ModuleImageTextGiantContent{margin-top:0px;} +#module_386840770 .ModuleImageTextGiantContent{margin-bottom:0px;} +#module_386840770 .ModuleImageTextGiantContent{margin-left:0px;} +#module_386840770 .ModuleImageTextGiantContent{margin-right:0px;} +#module_386840770 .imageTextGiant-Container{padding-top:10px;} +#module_386840770 .imageTextGiant-Container{padding-bottom:10px;} +#module_386840770 .imageTextGiant-Container{padding-left:10px;} +#module_386840770 .imageTextGiant-Container{padding-right:10px;} +#module_386840770 .showHandle .btn{font-size:14px;} +#module_386840770 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_386840770 .showHandle .btn{color:#333;} +#module_386840770 .showHandle .btn{font-weight:400;} +#module_386840770 .showHandle .btn{text-decoration:none;} +#module_386840770 .showHandle .btn{font-style:normal;} +#module_386840770 .showHandle div{border-top-color:#ddd !important;} +#module_386840770 .showHandle div{border-top-style:solid !important;} +#module_386840770 .showHandle div{border-top-width:1px !important;} +#module_386840770 .showHandle{background-color:transparent;} +#module_386840770 .showHandle{background-image:none;} +#module_386840770 .showHandle{background-repeat:no-repeat;} +#module_386840770 .showHandle{} +#module_386840770 .showHandle{} +#module_386840770 .showHandle{} +#module_386840770 a{font-size:unset;font-family:unset} +.module_386842019 .ModuleHead .HeadCenter{float:none;} +#module_386842019 { + padding:0px; +} +#module_386842019 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_386842019 .ModuleHead386842019 { + display:none; +} +#module_386842019 .BodyCenter.BodyCenter386842019 { + background:none;background-color:rgba(0,0,0,0); +} +#module_386842019 >.module_386842019 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_386842019 >.module_386842019{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_386842019 .BodyCenter.BodyCenter386842019 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_386842019 .BodyCenter.BodyCenter386842019 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_386842019 >.module_386842019 { + margin-top:4.2918%; + margin-left:8.5837%; + margin-right:8.5837%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_386842019 >.module_386842019 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_386842019 >.module_386842019 {box-shadow: 0px 0px 0px 0px #ccc} +#module_386842019:hover { + border:none; +} +#module_386842019:hover >.module_386842019 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_386842019 .ModuleImageTextGiantContent{margin-top:0px;} +#module_386842019 .ModuleImageTextGiantContent{margin-bottom:0px;} +#module_386842019 .ModuleImageTextGiantContent{margin-left:0px;} +#module_386842019 .ModuleImageTextGiantContent{margin-right:0px;} +#module_386842019 .imageTextGiant-Container{padding-top:10px;} +#module_386842019 .imageTextGiant-Container{padding-bottom:10px;} +#module_386842019 .imageTextGiant-Container{padding-left:10px;} +#module_386842019 .imageTextGiant-Container{padding-right:10px;} +#module_386842019 .showHandle .btn{font-size:14px;} +#module_386842019 .showHandle .btn{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_386842019 .showHandle .btn{color:#333;} +#module_386842019 .showHandle .btn{font-weight:400;} +#module_386842019 .showHandle .btn{text-decoration:none;} +#module_386842019 .showHandle .btn{font-style:normal;} +#module_386842019 .showHandle div{border-top-color:#ddd !important;} +#module_386842019 .showHandle div{border-top-style:solid !important;} +#module_386842019 .showHandle div{border-top-width:1px !important;} +#module_386842019 .showHandle{background-color:transparent;} +#module_386842019 .showHandle{background-image:none;} +#module_386842019 .showHandle{background-repeat:no-repeat;} +#module_386842019 .showHandle{} +#module_386842019 .showHandle{} +#module_386842019 .showHandle{} +#module_386842019 a{font-size:unset;font-family:unset} +.module_415539018 .ModuleHead .HeadCenter{float:none;} +#module_415539018 { + padding:0px; +} +#module_415539018 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_415539018 .ModuleHead415539018 { + display:none; +} +#module_415539018 .BodyCenter.BodyCenter415539018 { + background:none;background-color:rgba(0,0,0,0); +} +#module_415539018 >.module_415539018 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_415539018 >.module_415539018{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_415539018 .BodyCenter.BodyCenter415539018 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_415539018 .BodyCenter.BodyCenter415539018 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (min-width: 768px){ + #module_415539018 >.module_415539018 { + margin-top:-2.6151%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +@media screen and (max-width: 767px){ + #module_415539018 >.module_415539018 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +#module_415539018 >.module_415539018 {box-shadow: 0px 0px 0px 0px #ccc} +#module_415539018:hover { + border:none; +} +#module_415539018:hover >.module_415539018 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_415539018 .ModuleSubContainer{background-color:transparent;} +#module_415539018 .ModuleSubContainer{background-image:none;} +#module_415539018 .ModuleSubContainer{background-repeat:no-repeat;} +#module_415539018 .ModuleSubContainer{background-position:0% 0%;} +#module_415539018 .ModuleSubContainer{background-attachment:scroll;} +#module_415539018 .ModuleSubContainer{} +#module_415539018 {!bgVideo!}{bgVideoUrl:} +#module_415539018 .gridBgVideo .bgVideoMask{opacity:0.2} +#module_415539018 .ModuleSubContainer{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0); transition: box-shadow 0.5s ease;} +#module_415539018 .ModuleSubContainer:hover{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0);} +.ModuleGridContainer.ModuleGridContainer415539018 {} +.module_415539020 .ModuleHead .HeadCenter{float:none;} +#module_415539020 { + padding:0px; +} +#module_415539020 { + position:static; + z-index:0; + width:100%; + height: auto; +} +#module_415539020 .ModuleHead415539020 { + display:none; +} + +#module_415539020 .ModuleImageTextGiantContent{margin-top:0px;} +#module_415539020 .ModuleImageTextGiantContent{margin-bottom:0px;} +#module_415539020 .ModuleImageTextGiantContent{margin-left:0px;} +#module_415539020 .ModuleImageTextGiantContent{margin-right:0px;} +#module_415539020 .imageTextGiant-Container{padding-top:10px;} +#module_415539020 .imageTextGiant-Container{padding-bottom:10px;} +#module_415539020 .imageTextGiant-Container{padding-left:10px;} +#module_415539020 .imageTextGiant-Container{padding-right:10px;} +#module_415539020 .showHandle .btn{font-size:14px;} +#module_415539020 .showHandle .btn{font-family:;} +#module_415539020 .showHandle .btn{color:#333;} +#module_415539020 .showHandle .btn{font-weight:400;} +#module_415539020 .showHandle .btn{text-decoration:none;} +#module_415539020 .showHandle .btn{font-style:normal;} +#module_415539020 .showHandle div{border-top-color:#ddd !important;} +#module_415539020 .showHandle div{border-top-style:solid !important;} +#module_415539020 .showHandle div{border-top-width:1px !important;} +#module_415539020 .showHandle{background-color:transparent;} +#module_415539020 .showHandle{} +#module_415539020 .showHandle{background-repeat:no-repeat;} +#module_415539020 .showHandle{} +#module_415539020 .showHandle{} +#module_415539020 .showHandle{} +#module_415539020 a{font-size:unset;font-family:unset} +.ModuleMobileNavGiant.layout-104 p{ color: #fff;} +.mobileNav { width: 100%; height: 3rem; line-height: 3rem; text-align: center; position: fixed; z-index: 950; top:0; } +.pagebody_nav_1.showFloatNav{ -ms-transform: translateX(50%) !important; + -khtml-transform: translateX(50%) !important; + -webkit-transform: translateX(50%) !important; + -o-transform: translateX(50%) !important; + -moz-transform: translateX(50%) !important; + transform: translateX(50%) !important; + -ms-transition: 0.5s; + -webkit-transition: 0.5s; + -khtml-transition: 0.5; + -o-transition: 0.5s; + -moz-transition: 0.5s; + transition: 0.5s;} +.ModuleMobileNavGiant.layout-104 .header-model{width: 100%; height: 3rem;} +.mobileFootNav_1.showFloatNav{-ms-transform: translateX(50%) !important; -khtml-transform: translateX(50%) !important; -webkit-transform: translateX(50%) !important; -o-transform: translateX(50%) !important; -moz-transform: translateX(50%) !important; transform: translateX(50%) !important;-ms-transition: 0.5s; -webkit-transition: 0.5s; -khtml-transition: 0.5; -o-transition: 0.5s; -moz-transition: 0.5s; transition: 0.5s;} +.mobileNavRenderElem { + width: 100%; + height: 3rem; +} + +.mobileNav_1.showFloatNav {-ms-transform: translateX(50%);-khtml-transform: translateX(50%);-webkit-transform: translateX(50%);-o-transform: translateX(50%);-moz-transform: translateX(50%);transform: translateX(50%);} +.mobileNavFloatLayer_1 { z-index: 9999;display: block; visibility: hidden; width: 50%; height: 100%; -ms-transform: translateX(-100%); -khtml-transform: translateX(-100%); -webkit-transform: translateX(-100%); -o-transform: translateX(-100%); -moz-transform: translateX(-100%); transform: translateX(-100%); -ms-transition: 0.5s; -webkit-transition: 0.5s; -khtml-transition: 0.5; -o-transition: 0.5s; -moz-transition: 0.5s; transition: 0.5s; -webkit-box-shadow: inset -0.3rem 0rem 0.5rem rgba(0,0,0,.3); -ms-box-shadow: inset -0.3rem 0rem .5rem rgba(0,0,0,.3); -moz-box-shadow: inset -0.3rem 0rem .5rem rgba(0,0,0,.3); -o-box-shadow: inset -0.3rem 0rem .5rem rgba(0,0,0,.3); box-shadow: inset -0.3rem 0rem 0.5rem rgba(0,0,0,.3); } +.ModuleMobileNavGiant.layout-104 .micro-nav-item{ background:#e50b1c;height: calc(100vh);} +.ModuleMobileNavGiant.layout-104 .micro-nav-item ul{ padding-top: 4rem;} +.ModuleMobileNavGiant.layout-104 .micro-nav-item ul li{ height: 2.98rem; border-bottom: 1px solid #fff; color: #fff; margin-left: 1.333rem; margin-right: 2.46rem; display: flex; align-items: center;} +.ModuleMobileNavGiant.layout-104 .micro-nav-item ul li a{ color: #fff;width: 100%;display: flex;align-items: center;} +.ModuleMobileNavGiant.layout-104 .micro-nav-item ul li i{ width:1.12rem; height: 1.3rem; display: inline-block; margin-right: 1.06rem;} +.ModuleMobileNavGiant.layout-104 .micro-nav-item ul li p{ font-size: .81rem; color: #fff;width: 100%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;} + +.ModuleMobileNavGiant.layout-104 #header p{ + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + margin-left: 0; + width: 100%; + /* max-width: 80%; */ +} +.ModuleMobileNavGiant.layout-104 .icon-dianhua-moren{ font-weight: normal;} +.ModuleMobileNavGiant.layout-104 .icon-sousuo{ font-weight: 750;} +.ModuleMobileNavGiant.layout-104 .container{ width: 100%; height: 100%; max-width: 100%; overflow: hidden; position: relative; } +.ModuleMobileNavGiant.layout-104 .view { will-change: transform; position: absolute; width: 100%; left: 0; top: 0; transition: transform 0.3s cubic-bezier(0.465, 0.183, 0.153, 0.946);} +.ModuleMobileNavGiant.layout-104 .list-view { height:100%; width: 100%; position: relative; overflow: scroll; -webkit-overflow-scrolling: touch; z-index: 9999; } +.ModuleMobileNavGiant.layout-104 .view-change .list-view { transform: translateX(50%);} +.ModuleMobileNavGiant.layout-104 .view-change .details-view { transform: translateX(0); width: 50%; } +.ModuleMobileNavGiant.layout-104 .details-view { transform: translateX(-100%); box-sizing: border-box; width: 50%;} +.ModuleMobileNavGiant.layout-104 header { display: flex; height:3rem; background: #f10315; font-size: 16px; font-weight: 700; color: #fff; line-height: 3rem; -moz-box-sizing: border-box; box-sizing: border-box; width: 100%; padding: 0 0 } +.ModuleMobileNavGiant.layout-104 header.fixed { position: fixed; top: 0; left: 0 } +.ModuleMobileNavGiant.layout-104 header { box-sizing: border-box; width: 100% } +.ModuleMobileNavGiant.layout-104 header { top: 0; text-align: center; position: fixed; z-index: 3; max-width: 980px; margin: 0 auto } +.ModuleMobileNavGiant.layout-104 .micro-nav-item ul li{ -webkit-animation-duration: 0.8s; animation-duration: 0.8s; -webkit-animation-fill-mode: both; animation-fill-mode: both; -webkit-animation-name: bounceInLeft; animation-name: bounceInLeft; } + +.ModuleMobileNavGiant.layout-104 #mobileDesignerContainer #pagebody { + margin-top:3rem; +} +.ModuleMobileNavGiant.layout-104 .navcontent{ display:flex; width:calc(100% - 60px); margin-left: 50px; margin-right: 8pt;} +.ModuleMobileNavGiant.layout-104 .icons { + font-size: 16pt; + color: #fff; +} + +.ModuleMobileNavGiant.layout-104 .svgdiv { + height: 100%; + width: 100%; + display: flex; + justify-content: center; + align-items: center; + position: relative; + z-index: 999; +} + +.ModuleMobileNavGiant.layout-104 .svgdiv svg { + width: 16pt; + height: 16pt; + position: relative; + z-index: -1; + fill: #fff; +} +.ModuleMobileNavGiant.layout-104 .navcontent a{ width: 56px; text-align: center; display: block;} + +.ModuleMobileNavGiant.layout-104 #header p img{max-height: 40px; padding-right: 8pt; + padding-left: 8pt;/*padding-left:40px;margin-right: 8px; margin-left: 15px;*/} +@media only screen and (min-width: 768px){ + .ModuleMobileNavGiant.layout-104 #mobileDesignerContainer #pagebody { + margin-top:0px; + } + .ModuleMobileNavGiant.layout-104 .header-model{ display: none;} + .pagebody_nav_1.showFloatNav { + -ms-transform: translateX(0) !important; + -khtml-transform: translateX(0) !important; + -webkit-transform: translateX(0) !important; + -o-transform: translateX(0) !important; + -moz-transform: translateX(0) !important; + -ms-transition: 0.5s; + -webkit-transition: 0.5s; + -khtml-transition: 0.5; + -o-transition: 0.5s; + -moz-transition: 0.5s; + transition: 0.5s; + } + + +} + +@-webkit-keyframes bounceInLeft { + from, 60%, 75%, 90%, to { + -webkit-animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000); + animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000); + } + + from { + opacity: 0; + -webkit-transform: translate3d(-3000px, 0, 0); + transform: translate3d(-3000px, 0, 0); + } + + 60% { + opacity: 1; + -webkit-transform: translate3d(25px, 0, 0); + transform: translate3d(25px, 0, 0); + } + + 75% { + -webkit-transform: translate3d(-10px, 0, 0); + transform: translate3d(-10px, 0, 0); + } + + 90% { + -webkit-transform: translate3d(5px, 0, 0); + transform: translate3d(5px, 0, 0); + } + + to { + -webkit-transform: none; + transform: none; + } +} + +@keyframes bounceInLeft { + from, 60%, 75%, 90%, to { + -webkit-animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000); + animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000); + } + + from { + opacity: 0; + -webkit-transform: translate3d(-3000px, 0, 0); + transform: translate3d(-3000px, 0, 0); + } + + 60% { + opacity: 1; + -webkit-transform: translate3d(25px, 0, 0); + transform: translate3d(25px, 0, 0); + } + + 75% { + -webkit-transform: translate3d(-10px, 0, 0); + transform: translate3d(-10px, 0, 0); + } + + 90% { + -webkit-transform: translate3d(5px, 0, 0); + transform: translate3d(5px, 0, 0); + } + + to { + -webkit-transform: none; + transform: none; + } +} + +.mobileNavFloatLayer_r { right:0; -ms-transform: translateX(11rem); + -khtml-transform: translateX(11rem); + -webkit-transform: translateX(11rem); + -o-transform: translateX(11rem); + -moz-transform: translateX(11rem); + transform: translateX(11rem); } + +.mobileNav_1.showFloatNavright,.mobileFootNav_1.showFloatNavright{ + -ms-transform: translateX(-49%) !important; + -khtml-transform: translateX(-49%) !important; + -webkit-transform: translateX(-49%) !important; + -o-transform: translateX(-49%) !important; + -moz-transform: translateX(-49%) !important; +} +.ModuleMobileNavGiant.layout-104 .MobileNavClickLayer{ + top: 0; + z-index: 9998; + opacity: 0; + height: 100%; + width: 100%; + position: fixed; + display: none; +}.module_384381466 .ModuleHead .HeadCenter{float:none;} +#module_384381466 { + padding:0px; +} +#module_384381466 { +} +#module_384381466 .ModuleHead384381466 { + display:none; +} +#module_384381466 .BodyCenter.BodyCenter384381466 { + background:none;background-color:rgba(0,0,0,0); +} +#module_384381466 >.module_384381466 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_384381466 >.module_384381466{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_384381466 .BodyCenter.BodyCenter384381466 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_384381466 .BodyCenter.BodyCenter384381466 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_384381466 >.module_384381466 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_384381466 >.module_384381466 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_384381466 >.module_384381466 {box-shadow: 0px 0px 0px 0px #ccc} +#module_384381466:hover { + border:none; +} +#module_384381466:hover >.module_384381466 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_384381466 .langlistbox{background-color:#fff} #module_384381466 .langlistbox .jt{border-bottom-color:#fff} +#module_384381466 .langlistbox .langinfo{color:#333333} +#module_384381466 .langlistbox .langinfo{background-color:#fff} +#module_384381466 .langlistbox .langinfo{border-color:#333333} +#module_384381466 .langlistbox .langtxt{ font-size:16px } +#module_384381466 .langlistbox .langtxt{ color:#333333 } +#module_384381466 {}##module_384381466.layout-104 #header{border-bottom-color:transparent;} +#module_384381466 {}#module_384381466.layout-104 #header{border-bottom-style:none;} +#module_384381466 {}#module_384381466.layout-104 #header{border-bottom-width:0px;} +#module_384381466 {}#module_384381466.layout-104 #header{box-shadow:0px 0px 0px 0px rgba(0, 0, 0, 0.1);} +#module_384381466 {}#module_384381466.layout-104 #MobileNav{background-color: transparent;} #module_384381466.layout-104 #header{background-color:rgb(15, 90, 166);} +#module_384381466 {}#module_384381466.layout-104 #header{} +#module_384381466 {}#module_384381466.layout-104 #header p{color:#fff;} +#module_384381466 {}#module_384381466.layout-104 .lcitem .rect{background:#fff;} #module_384381466.layout-104 .icons{color:#fff;} #module_384381466.layout-104 .svgdiv svg>*{fill:#fff;} +#module_384381466 {}#module_384381466.layout-104 .micro-nav-item ul li{border-bottom-color:rgb(126, 178, 209);} +#module_384381466 {}#module_384381466.layout-104 .micro-nav-item,#module_384381466.layout-104 #MobileNavFloatLayer{background-color:rgb(101, 164, 201);} +#module_384381466 {}#module_384381466.layout-104 .micro-nav-item,#module_384381466.layout-104 #MobileNavFloatLayer{} +#module_384381466 {}#module_384381466.layout-104 .micro-nav-item>ul>li>a,#module_384381466.layout-104 .micro-nav-item>ul>li>a p{color:rgb(242, 242, 242);} +#module_384381466 {}#module_384381466.layout-104 #header p{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_384381466 {}#module_384381466.layout-104 #header p{font-weight:normal;} +#module_384381466 {}#module_384381466.layout-104 #header p{text-decoration:none;} +#module_384381466 {}#module_384381466.layout-104 #header p{font-size:16px;} +#module_384381466 {}#module_384381466.layout-104 #header p{font-style:normal;} +#module_384381466 {}#module_384381466.layout-104 .micro-nav-item>ul>li>a,#module_384381466.layout-104 .micro-nav-item>ul>li>a p{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_384381466 {}#module_384381466.layout-104 .micro-nav-item>ul>li>a,#module_384381466.layout-104 .micro-nav-item>ul>li>a p{font-size:15px;} +#module_384381466 .langlistbox li:hover .langinfo,#module_384381466 .langactive .langinfo {color:#fff} +#module_384381466 .langlistbox li:hover .langinfo,#module_384381466 .langactive .langinfo{background-color:#333333} +#module_384381466 .langlistbox li:hover .langinfo,#module_384381466 .langactive .langinfo{border-color:#333333} +#module_384381466 .langlistbox li:hover .langtxt,#module_384381466 .langactive .langtxt{ color:#333333 } +#module_384381466 {}#module_384381466.layout-104 .micro-nav-item>ul>li>a:hover,#module_384381466.layout-104 .micro-nav-item>ul>li>a:hover p{color:rgb(255, 255, 255);} +.ModuleMobileFloatNavGiant {position: fixed; + z-index: 4998;} +.ModuleMobileFloatNavGiant .defaultbtn{ position: relative; box-shadow: 0pt 1.5pt 3pt 0pt rgba(0,0,0,0.16); background-color: #fff; + width:50px; height: 50px; border-radius: 50%;} +.ModuleMobileFloatNavGiant .spotgroup,.ModuleMobileFloatNavGiant .itemicon{ position: absolute;color: green; + top: 50%; + left: 50%; + transform: translate(-50%,-45%); + font-size: 16px; +} +.ModuleMobileFloatNavGiant svg { + width: 22px; + height: 22px; + margin-top: 5px; +} + + +.ModuleMobileFloatNavGiant .itemicon{ color: black;} +.ModuleMobileFloatNavGiant .itembtn{ display: block; position: relative; box-shadow: 0pt 1.5pt 3pt 0pt rgba(0,0,0,0.16); background-color: #fff; + width:45px; height: 45px; border-radius: 50%; margin-bottom: 15px;} +.ModuleMobileFloatNavGiant .itemtext{ + position: relative; + left: -60px; + background: #fff; + padding: 5px 14px; + border-radius: 4px; + top: 50%; + transform: translateY(-50%); + font-size: 12px; + box-shadow: 0px 1.5px 10px 0px rgba(0,0,0,0.16); + color: #666; + box-sizing: content-box; + /* min-width: 80px; */ +} +.ModuleMobileFloatNavGiant .defaultbtnbghover{ + transform: rotate(180deg); + transition: all 0.5s; +} +.ModuleMobileFloatNavGiant .itemtextright{ + text-align: right; +} +.ModuleMobileFloatNavGiant .itemtextleft{ + text-align: left; +} +.ModuleMobileFloatNavGiant .itemtextright::before{ + border-left: 8px solid #fff; + border-top: 8px solid transparent; + border-bottom: 8px solid transparent; + top: 50%; + right: -8px; + position: absolute; + transform: translateY(-50%); + content: ''; +} +.ModuleMobileFloatNavGiant .itemtextleft::before{ + border-right: 8px solid #fff; + border-top: 8px solid transparent; + border-bottom: 8px solid transparent; + top: 50%; + left: -7px; + position: absolute; + transform: translateY(-50%); + content: ''; +} +.ModuleMobileFloatNavGiant .FloatNavitemlist{ height: 0; display: none; transition:all} +.itemimg{ + max-height: 25px; + max-width: 25px; + background-repeat: no-repeat !important; + background-position: center !important; + background-size: cover !important; + width: 100%; + height: 100% +} +.FloatNavMask { + position: absolute; + top: 0; + width: 100%; + height: 100%; + filter: alpha(opacity=50); + opacity: 0.50; + background: #000; + z-index: 15; +} +.FloatNavQRCode span img { + border: solid 0.625rem #fff; +} +.FloatNavQRCode span { + display: block; + overflow: hidden; + bottom: 3.750rem; + right: 0.625rem; + position: fixed; + z-index: 20; +} +.FloatNavQRCode { + display: none; + position: fixed; + top: 0; + overflow: hidden; + width: 100%; + height: 100%; + z-index: 10; + text-align: center; +}.module_384381467 .ModuleHead .HeadCenter{float:none;} +#module_384381467 { + padding:0px; +} +#module_384381467 { +} +#module_384381467 .ModuleHead0 { + display:none; +} + +#module_384381467 .defaultbtn{background-color:#fff} +#module_384381467 .defaultbtn{} +#module_384381467 .spotgroup{color:#000} +#module_384381467 .itembtn{background-color:#fff} +#module_384381467 .itembtn{} +#module_384381467 .itemicon{color:#666} #module_384381467 svg>*{fill:#666} +#module_384381467 .itemtext{background-color:#fff} #module_384381467 .itemtextright::before{border-left-color:#fff} #module_384381467 .itemtextleft::before{border-right-color:#fff} +#module_384381467 .itemtext{} +#module_384381467 .itemtext{font-size:12px;} +#module_384381467 .itemtext{font-family:;} +#module_384381467 .itemtext{color:#666 !important;} +#module_384381467 .itemtext{font-weight:normal;} +#module_384381467 .itemtext{text-decoration:none;} +#module_384381467 .itemtext{font-style:normal;} +#module_384381467 .defaultbtnbghover{background-color:#000000} +#module_384381467 .defaultbtnbghover{} +#module_384381467 .defaultbtniconbghover{color:#fff} +.module_384381468 .ModuleHead .HeadCenter{float:none;} +#module_384381468 { + padding:0px; +} +#module_384381468 { +} +#module_384381468 .ModuleHead384381468 { + display:none; +} +#module_384381468 .BodyCenter.BodyCenter384381468 { + background:none;background-color:rgba(0,0,0,0); +} +#module_384381468 >.module_384381468 { + border-top-style:solid; + border-top-color:#000; + border-top-width:0px; + border-left-style:solid; + border-left-color:#000; + border-left-width:0px; + border-right-style:solid; + border-right-color:#000; + border-right-width:0px; + border-bottom-style:solid; + border-bottom-color:#000; + border-bottom-width:0px; +} +#module_384381468 >.module_384381468{ + overflow: hidden; + -webkit-backface-visibility:hidden; + border-top-left-radius:0px; + border-top-right-radius:0px; + border-bottom-left-radius:0px; + border-bottom-right-radius:0px; +} +@media screen and (min-width: 768px){ + #module_384381468 .BodyCenter.BodyCenter384381468 { + padding-top:0px; + padding-left:0px; + padding-right:0px; + padding-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_384381468 .BodyCenter.BodyCenter384381468 { + padding-top:0.0000%; + padding-left:0.0000%; + padding-right:0.0000%; + padding-bottom:0.0000%; + } +} +@media screen and (min-width: 768px){ + #module_384381468 >.module_384381468 { + margin-top:0px; + margin-left:0px; + margin-right:0px; + margin-bottom:0px; + } +} +@media screen and (max-width: 767px){ + #module_384381468 >.module_384381468 { + margin-top:0.0000%; + margin-left:0.0000%; + margin-right:0.0000%; + margin-bottom:0.0000%; + } +} +#module_384381468 >.module_384381468 {box-shadow: 0px 0px 0px 0px #ccc} +#module_384381468:hover { + border:none; +} +#module_384381468:hover >.module_384381468 {box-shadow: 0px 0px 0px 0px #ccc;transition: box-shadow 0.5s ease 0s;} + +#module_384381468 .foot-nav-list{background-color:rgb(255, 255, 255) !important;} +#module_384381468 .foot-nav-list{border-top-color:rgb(242, 242, 242);} +#module_384381468 .foot-nav-list{border-top-style:solid;} +#module_384381468 .foot-nav-list{border-top-width:1px;} +#module_384381468 #MobileFootNav{box-shadow:-4px 0px 0px 0px rgba(0, 0, 0, 0.1);} +#module_384381468 .icon{color:rgb(101, 164, 201) !important;} #module_384381468 .icon svg >*{fill:rgb(101, 164, 201)} +#module_384381468 .itemText{font-size:12px;} +#module_384381468 .itemText{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_384381468 .itemText{color:rgb(101, 164, 201) !important;} +#module_384381468 .itemText{font-weight:normal;} +#module_384381468 .itemText{text-decoration:none;} +#module_384381468 .itemText{font-style:normal;} +#module_384381468 .iconh{color:rgb(101, 164, 201) !important;} #module_384381468 .iconh svg >*{fill:rgb(101, 164, 201)} +#module_384381468 .itemTexth{font-size:12px;} +#module_384381468 .itemTexth{font-family:΢ÈíÑźÚ,Microsoft YaHei;} +#module_384381468 .itemTexth{color:rgb(101, 164, 201) !important;} +#module_384381468 .itemTexth{font-weight:normal;} +#module_384381468 .itemTexth{text-decoration:none;} +#module_384381468 .itemTexth{font-style:normal;} diff --git a/projects/fangjia-static/src/main/webapp/style/fangjia/v5/user01.css b/projects/fangjia-static/src/main/webapp/style/fangjia/v5/user01.css index 4bf9bdb56..e643baf96 100644 --- a/projects/fangjia-static/src/main/webapp/style/fangjia/v5/user01.css +++ b/projects/fangjia-static/src/main/webapp/style/fangjia/v5/user01.css @@ -36,7 +36,7 @@ .option > div.agreement span a:hover{color:#f08300;} .option > div.agreement .error{left:0;} -.user_btn{width:420px;height:40px;background:#f08300;text-align:center;line-height:40px;color:#fff;display:block;cursor:pointer;} +.user_btn{width:420px;height:40px;background:#f08300;text-align:center;line-height:40px;color:#fff;display:block;cursor:pointer;margin-top: 70px;} .user_btn:hover{background:#df7900;} .line{width:420px;height:1px;background:#e5e5e5;margin-top:40px;position:relative;} .line span{position:absolute;top:-8px;left:50%;margin-left:-31px;display:block;background:#fff;padding:0 25px;font-size:12px;color:#999;}