diff --git a/deliverables/geluke/pom.xml b/deliverables/geluke/pom.xml index 8d4554eac..6e3fc3c85 100644 --- a/deliverables/geluke/pom.xml +++ b/deliverables/geluke/pom.xml @@ -19,6 +19,7 @@ ../../projects/fangjia-core ../../projects/fangjia-dal + ../../projects/chafangtong-dal ../../projects/fangjia-service ../../projects/geluke-dal ../../projects/geluke-service diff --git a/deliverables/script/test/src/Test.java b/deliverables/script/test/src/Test.java deleted file mode 100644 index 9d88b45cf..000000000 --- a/deliverables/script/test/src/Test.java +++ /dev/null @@ -1,63 +0,0 @@ -/** - * Created by Administrator on 2017/5/9. - */ -import com.sun.org.apache.xerces.internal.impl.io.UTF8Reader; -import com.sun.xml.internal.txw2.Document; -import sun.nio.cs.ext.GB18030; - -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.net.URL; -import java.net.URLConnection; -public class Test { - String fixture_Date = null; - String area = null; - String unit_Price = null; - String transaction_Price = null; - static String sendGet(String url) { - String result = ""; - // 定义一个缓冲字符输入流 - BufferedReader in = null; - try { - // 将string转成url对象 - URL realUrl = new URL(url); - // 初始化一个链接到那个url的连接 - URLConnection connection = realUrl.openConnection(); - // 开始实际的连接 - connection.connect(); - // 初始化 BufferedReader输入流来读取URL的响应 - in = new BufferedReader(new InputStreamReader(connection.getInputStream(),"gbk")); - // 用来临时存储抓取到的每一行的数据 - String line; - while ((line = in.readLine()) != null) - { // 遍历抓取到的每一行并将其存储到result里面 - result += line; - } - Document document = Jsoup.parse(result, url); - - parseListPage(document); - - - } catch (Exception e) { - System.out.println("发送GET请求出现异常!" + e); - e.printStackTrace(); } - // 使用finally来关闭输入流 - finally { - try { - if (in != null) { - in.close(); } - } catch (Exception e2) { - e2.printStackTrace(); - } - } - return result; - } - public static void main(String[] args) { - // 定义即将访问的链接 - String url = "http://dl.goufang.com/xq/1062/6"; - // 访问链接并获取页面内容 - String result = sendGet(url); - System.out.println(result); - } -} - diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LogStat.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LogStat.groovy index 6305d35b9..239d7ca4d 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LogStat.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/LogStat.groovy @@ -15,19 +15,19 @@ class LogStat { } def run(){ - ExcelUtils.multiThreadingModify("D:\\data\\建行匹配小区2(1).xlsx",{ d -> - def calDate = DateUtil.parseDate(d['M'], "yyyy-MM-dd") - def weekend = DateUtils.getFirstDayOfWeek(calDate) - def dbo = CommonDatautils.queryDistrictPrice(d['N'], d['O'], d['P'], weekend) - if(dbo){ - d['E'] = dbo.avg_price - } + ExcelUtils.multiThreadingModify("C:\\Users\\wenyan\\Desktop\\建行匹配小区4.xlsx",{ d -> +// def calDate = DateUtil.parseDate(d['M'], "yyyy-MM-dd") +// def weekend = DateUtils.getFirstDayOfWeek(calDate) +// def dbo = CommonDatautils.queryDistrictPrice(d['N'], d['O'], d['P'], weekend) +// if(dbo){ +// d['E'] = dbo.avg_price +// } def district = CommonDatautils.findDistrict(d['N'], d['O'], d['P'], "district") if(district){ def startDate = DateUtil.addMonth(new Date(), -6) def start = startDate.replace("-","").toInteger() - def end = DateUtil.formatByPattern(calDate,"yyyyMMdd").toInteger() +// def end = DateUtil.formatByPattern(calDate,"yyyyMMdd").toInteger() def alias = [] if(district.alias){ if(!district.alias.contains(district.name)){ @@ -37,8 +37,8 @@ class LogStat { }else{ alias << district.name } - def count = findHouses(d['N'], d['O'], d['P'], alias, start, end) - d['G'] = count + def count = findHouses(d['N'], d['O'], d['P'], alias, start, null) + d['S'] = count println(d) } },0) diff --git a/projects/fangjia-static/pom.xml b/projects/fangjia-static/pom.xml index 6a048340d..7be7f7dae 100644 --- a/projects/fangjia-static/pom.xml +++ b/projects/fangjia-static/pom.xml @@ -29,7 +29,7 @@ org.sothis sothis-core - 0.2.0-SNAPSHOT + 0.2.0 com.fangjia diff --git a/projects/geluke/pom.xml b/projects/geluke/pom.xml index c168bf1c6..62875968c 100644 --- a/projects/geluke/pom.xml +++ b/projects/geluke/pom.xml @@ -51,7 +51,7 @@ org.sothis sothis-web - 0.2.0-SNAPSHOT + 0.2.0 org.springframework