Browse Source

删除svn文件

fenghanchao 2 years ago
parent
commit
39e8c90399
77 changed files with 51 additions and 1143673 deletions
  1. 0 5
      .svn/dir-prop-base
  2. 0 1227
      .svn/entries
  3. 0 36
      .svn/text-base/.classpath.svn-base
  4. 0 23
      .svn/text-base/.project.svn-base
  5. 0 161
      .svn/text-base/buildinglist.csv.svn-base
  6. 0 167
      .svn/text-base/buildinglist.json.svn-base
  7. 0 161
      .svn/text-base/buildinglist2.csv.svn-base
  8. 0 5
      .svn/text-base/buildinglistgld.json.svn-base
  9. 0 33
      .svn/text-base/config.json.svn-base
  10. 0 27
      .svn/text-base/def_buildingcomputetime.json.svn-base
  11. 0 45
      .svn/text-base/def_computedetail.json.svn-base
  12. 0 50
      .svn/text-base/def_computedetail1.json.svn-base
  13. 0 62
      .svn/text-base/def_computedetail2.json.svn-base
  14. 0 38
      .svn/text-base/def_computelog.json.svn-base
  15. 0 48
      .svn/text-base/def_computelog1.json.svn-base
  16. 0 43
      .svn/text-base/def_computelog2.json.svn-base
  17. 0 44
      .svn/text-base/def_metercomputetime.json.svn-base
  18. 0 51
      .svn/text-base/def_near.json.svn-base
  19. 0 51
      .svn/text-base/def_near1.json.svn-base
  20. 0 51
      .svn/text-base/def_near2.json.svn-base
  21. 0 39
      .svn/text-base/def_pointlist.json.svn-base
  22. 0 57
      .svn/text-base/def_rate.json.svn-base
  23. 0 51
      .svn/text-base/def_service.json.svn-base
  24. 0 50
      .svn/text-base/def_servicecomputedetail.json.svn-base
  25. 0 54
      .svn/text-base/def_servicecomputelog.json.svn-base
  26. 0 76
      .svn/text-base/def_static.json.svn-base
  27. 0 34
      .svn/text-base/hbase-site.xml.svn-base
  28. 0 17
      .svn/text-base/log4j.properties.svn-base
  29. 0 3571
      .svn/text-base/pointlist.csv.svn-base
  30. 0 10
      .svn/text-base/pointlist.json.svn-base
  31. 0 557182
      .svn/text-base/pointlist2.csv.svn-base
  32. 0 5176
      .svn/text-base/pointlist2.json.svn-base
  33. 0 557182
      .svn/text-base/pointlist3.csv.svn-base
  34. 0 10
      .svn/text-base/pointlist3.json.svn-base
  35. 0 5173
      .svn/text-base/pointlistgld.csv.svn-base
  36. 0 5177
      .svn/text-base/pointlistgld.json.svn-base
  37. 0 169
      .svn/text-base/pom.xml.svn-base
  38. 51 0
      META-INF/MANIFEST.MF
  39. BIN
      config.xls
  40. 0 5
      src/.svn/dir-prop-base
  41. 0 34
      src/.svn/entries
  42. 0 5
      src/main/.svn/dir-prop-base
  43. 0 34
      src/main/.svn/entries
  44. 0 5
      src/main/java/.svn/dir-prop-base
  45. 0 235
      src/main/java/.svn/entries
  46. 0 37
      src/main/java/.svn/text-base/SS.java.svn-base
  47. 0 20
      src/main/java/.svn/text-base/TDD.java.svn-base
  48. 0 43
      src/main/java/.svn/text-base/TestCSV.java.svn-base
  49. 0 56
      src/main/java/.svn/text-base/TestInsert.java.svn-base
  50. 0 116
      src/main/java/.svn/text-base/TestPointList.java.svn-base
  51. 0 63
      src/main/java/.svn/text-base/TestResetCompute.java.svn-base
  52. 0 5
      src/main/resources/.svn/dir-prop-base
  53. 0 640
      src/main/resources/.svn/entries
  54. 0 27
      src/main/resources/.svn/text-base/def_buildingcomputetime.json.svn-base
  55. 0 47
      src/main/resources/.svn/text-base/def_computedetail.json.svn-base
  56. 0 51
      src/main/resources/.svn/text-base/def_computedetail1.json.svn-base
  57. 0 56
      src/main/resources/.svn/text-base/def_computedetail2.json.svn-base
  58. 0 38
      src/main/resources/.svn/text-base/def_computelog.json.svn-base
  59. 0 48
      src/main/resources/.svn/text-base/def_computelog1.json.svn-base
  60. 0 45
      src/main/resources/.svn/text-base/def_computelog2.json.svn-base
  61. 0 39
      src/main/resources/.svn/text-base/def_metercomputetime.json.svn-base
  62. 0 51
      src/main/resources/.svn/text-base/def_near.json.svn-base
  63. 0 51
      src/main/resources/.svn/text-base/def_near1.json.svn-base
  64. 0 51
      src/main/resources/.svn/text-base/def_near2.json.svn-base
  65. 0 39
      src/main/resources/.svn/text-base/def_pointlist.json.svn-base
  66. 0 57
      src/main/resources/.svn/text-base/def_rate.json.svn-base
  67. 0 76
      src/main/resources/.svn/text-base/def_static.json.svn-base
  68. 0 34
      src/main/resources/.svn/text-base/hbase-site.xml.svn-base
  69. 0 17
      src/main/resources/.svn/text-base/log4j.properties.svn-base
  70. 0 5177
      src/main/resources/.svn/text-base/pointlist.json.svn-base
  71. 0 10
      src/main/resources/.svn/text-base/pointlistxx.json.svn-base
  72. 0 5
      src/test/.svn/dir-prop-base
  73. 0 34
      src/test/.svn/entries
  74. 0 5
      src/test/java/.svn/dir-prop-base
  75. 0 28
      src/test/java/.svn/entries
  76. 0 5
      src/test/resources/.svn/dir-prop-base
  77. 0 28
      src/test/resources/.svn/entries

+ 0 - 5
.svn/dir-prop-base

@@ -1,5 +0,0 @@
-K 14
-bugtraq:number
-V 4
-true
-END

File diff suppressed because it is too large
+ 0 - 1227
.svn/entries


+ 0 - 36
.svn/text-base/.classpath.svn-base

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

+ 0 - 23
.svn/text-base/.project.svn-base

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>compute-fjd</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>

+ 0 - 161
.svn/text-base/buildinglist.csv.svn-base

@@ -1,161 +0,0 @@
-2301030001,2016-05-01 00:00:00
-2306020001,2012-08-01 00:00:00
-2308010001,2015-10-01 00:00:00
-2303000001,2016-08-01 00:00:00
-2310000001,2016-08-01 00:00:00
-2101020001,2016-09-01 00:00:00
-2101060002,2015-12-01 00:00:00
-2101060001,2013-05-01 00:00:00
-2101120001,2014-01-01 00:00:00
-2108040001,2017-03-01 00:00:00
-2106030001,2013-12-01 00:00:00
-2111030001,2016-12-01 00:00:00
-2113020001,2017-03-01 00:00:00
-2102110001,2014-01-01 00:00:00
-2102130001,2015-09-01 00:00:00
-2201030001,2014-03-01 00:00:00
-2203030001,2016-08-01 00:00:00
-2224010001,2017-12-01 00:00:00
-1502040001,2015-08-01 00:00:00
-1504020001,2017-01-01 00:00:00
-1507810001,2017-02-01 00:00:00
-1600000001,2016-08-01 00:00:00
-1505020001,2016-09-01 00:00:00
-1101050001,2015-08-01 00:00:00
-1101070037,2011-01-01 00:00:00
-1101060002,2017-02-01 00:00:00
-1101060001,2017-02-01 00:00:00
-1310030001,2012-05-01 00:00:00
-1301080001,2012-08-01 00:00:00
-1201020001,2015-01-01 00:00:00
-1302020001,2012-08-01 00:00:00
-1401070001,2015-09-01 00:00:00
-3701030002,2016-07-01 00:00:00
-3701020001,2016-11-01 00:00:00
-2710000009,2015-08-01 00:00:00
-3714020001,2015-12-01 00:00:00
-3723010000,2017-03-01 00:00:00
-3708011001,2014-10-01 00:00:00
-3702030001,2011-01-01 00:00:00
-3702130001,2013-06-01 00:00:00
-3706020001,2015-02-01 00:00:00
-3706020002,2017-01-01 00:00:00
-3707010001,2015-02-01 00:00:00
-4101020001,2012-08-01 00:00:00
-4101030001,2013-06-01 00:00:00
-4101080001,2017-03-01 00:00:00
-4101040001,2017-03-01 00:00:00
-4201030001,2012-08-01 00:00:00
-4201050001,2012-08-01 00:00:00
-4201060001,2014-01-01 00:00:00
-4201060002,2014-01-01 00:00:00
-4202020001,2015-07-01 00:00:00
-4205000001,2017-04-01 00:00:00
-4208040001,2016-06-01 00:00:00
-4203000001,2016-08-01 00:00:00
-3401110000,2016-02-01 00:00:00
-3401040001,2013-06-01 00:00:00
-3401020001,2016-11-01 00:00:00
-3415000001,2017-04-01 00:00:00
-2360000001,2016-11-01 00:00:00
-3402020001,2013-06-01 00:00:00
-3403020001,2014-05-01 00:00:00
-3405040001,2014-10-01 00:00:00
-3413020001,2017-03-01 00:00:00
-3601060001,2013-06-01 00:00:00
-3609020001,2017-01-01 00:00:00
-3611000001,2017-03-01 00:00:00
-4301050001,2017-01-01 00:00:00
-4303040001,2016-09-01 00:00:00
-4307020001,2016-10-01 00:00:00
-6401060001,2012-08-01 00:00:00
-6401050001,2014-10-01 00:00:00
-6201020001,2014-10-01 00:00:00
-6301000001,2016-12-01 00:00:00
-6501000001,2016-12-01 00:00:00
-5101060001,2013-06-01 00:00:00
-6100660001,2016-07-01 00:00:00
-5101050001,2017-03-01 00:00:00
-5101220001,2017-04-01 00:00:00
-5107030001,2013-07-01 00:00:00
-5108020001,2015-07-01 00:00:00
-5106030001,2016-12-01 00:00:00
-5110110001,2015-08-01 00:00:00
-5120000001,2016-12-01 00:00:00
-5109030001,2016-12-01 00:00:00
-5111020001,2016-12-01 00:00:00
-6101121001,2014-11-01 00:00:00
-6101122001,2015-01-01 00:00:00
-6101120001,2014-04-01 00:00:00
-7140000001,2015-08-01 00:00:00
-4000600001,2011-02-01 00:00:00
-5001010001,2014-04-01 00:00:00
-5001130001,2015-12-01 00:00:00
-5001180001,2016-10-01 00:00:00
-6500000001,2015-04-01 00:00:00
-6661000001,2015-11-01 00:00:00
-4501030001,2015-01-01 00:00:00
-4503050001,2015-12-01 00:00:00
-4502040001,2017-01-01 00:00:00
-3501030001,2016-12-01 00:00:00
-3501040001,2012-07-01 00:00:00
-3501810001,2014-12-01 00:00:00
-3505030001,2013-05-01 00:00:00
-3503020001,2013-04-01 00:00:00
-3509010001,2013-06-01 00:00:00
-3650000001,2017-02-01 00:00:00
-3505820001,2013-06-01 00:00:00
-3502060001,2012-06-01 00:00:00
-3502110001,2013-10-01 00:00:00
-3506020001,2013-05-01 00:00:00
-3506810001,2017-02-01 00:00:00
-4401110001,2012-04-01 00:00:00
-4401830001,2014-06-01 00:00:00
-4401130001,2017-04-01 00:00:00
-4401120001,2015-07-01 00:00:00
-4401150001,2015-12-01 00:00:00
-4418020001,2017-05-01 00:00:00
-4406820001,2015-01-01 00:00:00
-4406070001,2017-01-01 00:00:00
-4407030001,2014-12-01 00:00:00
-5240000001,2016-08-01 00:00:00
-4601060001,2017-03-01 00:00:00
-4419000001,2014-02-01 00:00:00
-4419010002,2015-12-01 00:00:00
-4419010003,2017-01-01 00:00:00
-4414000001,2016-09-01 00:00:00
-3201050001,2011-01-01 00:00:00
-3201150001,2014-06-01 00:00:00
-3211020001,2012-08-01 00:00:00
-3208020001,2016-10-01 00:00:00
-3212020001,2012-08-01 00:00:00
-3203040001,2014-07-01 00:00:00
-3203120001,2017-04-01 00:00:00
-3207000001,2017-03-01 00:00:00
-2140000005,2015-07-01 00:00:00
-3202060001,2014-06-01 00:00:00
-3204110001,2012-08-01 00:00:00
-3204120001,2017-02-01 00:00:00
-3202810001,2013-06-01 00:00:00
-3202820001,2014-07-01 00:00:00
-3205850001,2013-06-01 00:00:00
-2016060001,2014-10-01 00:00:00
-3101140001,2012-08-01 00:00:00
-3101130001,2012-08-01 00:00:00
-3101170001,2014-08-01 00:00:00
-3101160001,2015-07-01 00:00:00
-3302120001,2014-12-01 00:00:00
-3302050001,2015-12-02 00:00:00
-3302810001,2014-03-01 00:00:00
-3307020001,2014-07-01 00:00:00
-3307820001,2016-12-01 00:00:00
-3303030001,2013-06-01 00:00:00
-3254010001,2014-12-01 00:00:00
-3310000001,2016-10-01 00:00:00
-3301050001,2015-02-01 00:00:00
-3306210001,2016-07-01 00:00:00
-3306820001,2017-01-01 00:00:00
-3305020001,2017-01-01 00:00:00
-4505030001,2017-06-01 00:00:00
-3205060001,2016-05-01 00:00:00
-1130000002,2016-01-04 00:00:00

+ 0 - 167
.svn/text-base/buildinglist.json.svn-base

@@ -1,167 +0,0 @@
-{
-"Buildings":[
-{"building":"2301030001","time":"2016-05-01 00:00:00"},
-{"building":"2306020001","time":"2012-08-01 00:00:00"},
-{"building":"2308010001","time":"2015-10-01 00:00:00"},
-{"building":"2303000001","time":"2016-08-01 00:00:00"},
-{"building":"2310000001","time":"2016-08-01 00:00:00"},
-{"building":"2101020001","time":"2016-09-01 00:00:00"},
-{"building":"2101060002","time":"2015-12-01 00:00:00"},
-{"building":"2101060001","time":"2013-05-01 00:00:00"},
-{"building":"2101120001","time":"2014-01-01 00:00:00"},
-{"building":"2108040001","time":"2017-03-01 00:00:00"},
-{"building":"2106030001","time":"2013-12-01 00:00:00"},
-{"building":"2111030001","time":"2016-12-01 00:00:00"},
-{"building":"2113020001","time":"2017-03-01 00:00:00"},
-{"building":"2102110001","time":"2014-01-01 00:00:00"},
-{"building":"2102130001","time":"2015-09-01 00:00:00"},
-{"building":"2201030001","time":"2014-03-01 00:00:00"},
-{"building":"2203030001","time":"2016-08-01 00:00:00"},
-{"building":"2224010001","time":"2017-12-01 00:00:00"},
-{"building":"1502040001","time":"2015-08-01 00:00:00"},
-{"building":"1504020001","time":"2017-01-01 00:00:00"},
-{"building":"1507810001","time":"2017-02-01 00:00:00"},
-{"building":"1600000001","time":"2016-08-01 00:00:00"},
-{"building":"1505020001","time":"2016-09-01 00:00:00"},
-{"building":"1101050001","time":"2015-08-01 00:00:00"},
-{"building":"1101070037","time":"2011-01-01 00:00:00"},
-{"building":"1101060002","time":"2017-02-01 00:00:00"},
-{"building":"1101060001","time":"2017-02-01 00:00:00"},
-{"building":"1310030001","time":"2012-05-01 00:00:00"},
-{"building":"1301080001","time":"2012-08-01 00:00:00"},
-{"building":"1201020001","time":"2015-01-01 00:00:00"},
-{"building":"1302020001","time":"2012-08-01 00:00:00"},
-{"building":"1401070001","time":"2015-09-01 00:00:00"},
-{"building":"3701030002","time":"2016-07-01 00:00:00"},
-{"building":"3701020001","time":"2016-11-01 00:00:00"},
-{"building":"2710000009","time":"2015-08-01 00:00:00"},
-{"building":"3714020001","time":"2015-12-01 00:00:00"},
-{"building":"3723010000","time":"2017-03-01 00:00:00"},
-{"building":"3708011001","time":"2014-10-01 00:00:00"},
-{"building":"3702030001","time":"2011-01-01 00:00:00"},
-{"building":"3702130001","time":"2013-06-01 00:00:00"},
-{"building":"3706020001","time":"2015-02-01 00:00:00"},
-{"building":"3706020002","time":"2017-01-01 00:00:00"},
-{"building":"3707010001","time":"2015-02-01 00:00:00"},
-{"building":"4101020001","time":"2012-08-01 00:00:00"},
-{"building":"4101030001","time":"2013-06-01 00:00:00"},
-{"building":"4101080001","time":"2017-03-01 00:00:00"},
-{"building":"4101040001","time":"2017-03-01 00:00:00"},
-{"building":"4201030001","time":"2012-08-01 00:00:00"},
-{"building":"4201050001","time":"2012-08-01 00:00:00"},
-{"building":"4201060001","time":"2014-01-01 00:00:00"},
-{"building":"4201060002","time":"2014-01-01 00:00:00"},
-{"building":"4202020001","time":"2015-07-01 00:00:00"},
-{"building":"4205000001","time":"2017-04-01 00:00:00"},
-{"building":"4208040001","time":"2016-06-01 00:00:00"},
-{"building":"4203000001","time":"2016-08-01 00:00:00"},
-{"building":"3401110000","time":"2016-02-01 00:00:00"},
-{"building":"3401040001","time":"2013-06-01 00:00:00"},
-{"building":"3401020001","time":"2016-11-01 00:00:00"},
-{"building":"3415000001","time":"2017-04-01 00:00:00"},
-{"building":"2360000001","time":"2016-11-01 00:00:00"},
-{"building":"3402020001","time":"2013-06-01 00:00:00"},
-{"building":"3403020001","time":"2014-05-01 00:00:00"},
-{"building":"3405040001","time":"2014-10-01 00:00:00"},
-{"building":"3413020001","time":"2017-03-01 00:00:00"},
-{"building":"3601060001","time":"2013-06-01 00:00:00"},
-{"building":"3609020001","time":"2017-01-01 00:00:00"},
-{"building":"3611000001","time":"2017-03-01 00:00:00"},
-
-{"building":"4301050001","time":"2017-01-01 00:00:00"},
-
-{"building":"4303040001","time":"2016-09-01 00:00:00"},
-{"building":"4307020001","time":"2016-10-01 00:00:00"},
-{"building":"6401060001","time":"2012-08-01 00:00:00"},
-{"building":"6401050001","time":"2014-10-01 00:00:00"},
-{"building":"6201020001","time":"2014-10-01 00:00:00"},
-{"building":"6301000001","time":"2016-12-01 00:00:00"},
-{"building":"6501000001","time":"2016-12-01 00:00:00"},
-{"building":"5101060001","time":"2013-06-01 00:00:00"},
-{"building":"6100660001","time":"2016-07-01 00:00:00"},
-{"building":"5101050001","time":"2017-03-01 00:00:00"},
-{"building":"5101220001","time":"2017-04-01 00:00:00"},
-{"building":"5107030001","time":"2013-07-01 00:00:00"},
-{"building":"5108020001","time":"2015-07-01 00:00:00"},
-{"building":"5106030001","time":"2016-12-01 00:00:00"},
-{"building":"5110110001","time":"2015-08-01 00:00:00"},
-{"building":"5120000001","time":"2016-12-01 00:00:00"},
-{"building":"5109030001","time":"2016-12-01 00:00:00"},
-{"building":"5111020001","time":"2016-12-01 00:00:00"},
-{"building":"6101121001","time":"2014-11-01 00:00:00"},
-{"building":"6101122001","time":"2015-01-01 00:00:00"},
-{"building":"6101120001","time":"2014-04-01 00:00:00"},
-{"building":"7140000001","time":"2015-08-01 00:00:00"},
-{"building":"4000600001","time":"2011-02-01 00:00:00"},
-{"building":"5001010001","time":"2014-04-01 00:00:00"},
-{"building":"5001130001","time":"2015-12-01 00:00:00"},
-{"building":"5001180001","time":"2016-10-01 00:00:00"},
-{"building":"6500000001","time":"2015-04-01 00:00:00"},
-{"building":"6661000001","time":"2015-11-01 00:00:00"},
-{"building":"4501030001","time":"2015-01-01 00:00:00"},
-{"building":"4503050001","time":"2015-12-01 00:00:00"},
-{"building":"4502040001","time":"2017-01-01 00:00:00"},
-{"building":"3501030001","time":"2016-12-01 00:00:00"},
-{"building":"3501040001","time":"2012-07-01 00:00:00"},
-{"building":"3501810001","time":"2014-12-01 00:00:00"},
-{"building":"3505030001","time":"2013-05-01 00:00:00"},
-{"building":"3503020001","time":"2013-04-01 00:00:00"},
-{"building":"3509010001","time":"2013-06-01 00:00:00"},
-{"building":"3650000001","time":"2017-02-01 00:00:00"},
-{"building":"3505820001","time":"2013-06-01 00:00:00"},
-{"building":"3502060001","time":"2012-06-01 00:00:00"},
-{"building":"3502110001","time":"2013-10-01 00:00:00"},
-{"building":"3506020001","time":"2013-05-01 00:00:00"},
-{"building":"3506810001","time":"2017-02-01 00:00:00"},
-{"building":"4401110001","time":"2012-04-01 00:00:00"},
-{"building":"4401830001","time":"2014-06-01 00:00:00"},
-{"building":"4401130001","time":"2017-04-01 00:00:00"},
-{"building":"4401120001","time":"2015-07-01 00:00:00"},
-{"building":"4401150001","time":"2015-12-01 00:00:00"},
-{"building":"4418020001","time":"2017-05-01 00:00:00"},
-{"building":"4406820001","time":"2015-01-01 00:00:00"},
-{"building":"4406070001","time":"2017-01-01 00:00:00"},
-{"building":"4407030001","time":"2014-12-01 00:00:00"},
-{"building":"5240000001","time":"2016-08-01 00:00:00"},
-{"building":"4601060001","time":"2017-03-01 00:00:00"},
-{"building":"4419000001","time":"2014-02-01 00:00:00"},
-{"building":"4419010002","time":"2015-12-01 00:00:00"},
-{"building":"4419010003","time":"2017-01-01 00:00:00"},
-{"building":"4414000001","time":"2016-09-01 00:00:00"},
-{"building":"3201050001","time":"2011-01-01 00:00:00"},
-{"building":"3201150001","time":"2014-06-01 00:00:00"},
-{"building":"3211020001","time":"2012-08-01 00:00:00"},
-{"building":"3208020001","time":"2016-10-01 00:00:00"},
-{"building":"3212020001","time":"2012-08-01 00:00:00"},
-{"building":"3203040001","time":"2014-07-01 00:00:00"},
-{"building":"3203120001","time":"2017-04-01 00:00:00"},
-{"building":"3207000001","time":"2017-03-01 00:00:00"},
-{"building":"2140000005","time":"2015-07-01 00:00:00"},
-{"building":"3202060001","time":"2014-06-01 00:00:00"},
-{"building":"3204110001","time":"2012-08-01 00:00:00"},
-{"building":"3204120001","time":"2017-02-01 00:00:00"},
-{"building":"3202810001","time":"2013-06-01 00:00:00"},
-{"building":"3202820001","time":"2014-07-01 00:00:00"},
-{"building":"3205850001","time":"2013-06-01 00:00:00"},
-{"building":"2016060001","time":"2014-10-01 00:00:00"},
-{"building":"3101140001","time":"2012-08-01 00:00:00"},
-{"building":"3101130001","time":"2012-08-01 00:00:00"},
-{"building":"3101170001","time":"2014-08-01 00:00:00"},
-{"building":"3101160001","time":"2015-07-01 00:00:00"},
-{"building":"3302120001","time":"2014-12-01 00:00:00"},
-{"building":"3302050001","time":"2015-12-02 00:00:00"},
-{"building":"3302810001","time":"2014-03-01 00:00:00"},
-{"building":"3307020001","time":"2014-07-01 00:00:00"},
-{"building":"3307820001","time":"2016-12-01 00:00:00"},
-{"building":"3303030001","time":"2013-06-01 00:00:00"},
-{"building":"3254010001","time":"2014-12-01 00:00:00"},
-{"building":"3310000001","time":"2016-10-01 00:00:00"},
-{"building":"3301050001","time":"2015-02-01 00:00:00"},
-{"building":"3306210001","time":"2016-07-01 00:00:00"},
-{"building":"3306820001","time":"2017-01-01 00:00:00"},
-{"building":"3305020001","time":"2017-01-01 00:00:00"},
-{"building":"4505030001","time":"2017-06-01 00:00:00"},
-{"building":"3205060001","time":"2016-05-01 00:00:00"},
-{"building":"1130000002","time":"2016-01-04 00:00:00"}
-]	
-}

+ 0 - 161
.svn/text-base/buildinglist2.csv.svn-base

@@ -1,161 +0,0 @@
-2301030001,2016-05-01 00:00:00
-2306020001,2012-08-01 00:00:00
-2308010001,2015-10-01 00:00:00
-2303000001,2016-08-01 00:00:00
-2310000001,2016-08-01 00:00:00
-2101020001,2016-09-01 00:00:00
-2101060002,2015-12-01 00:00:00
-2101060001,2013-05-01 00:00:00
-2101120001,2014-01-01 00:00:00
-2108040001,2017-03-01 00:00:00
-2106030001,2013-12-01 00:00:00
-2111030001,2016-12-01 00:00:00
-2113020001,2017-03-01 00:00:00
-2102110001,2014-01-01 00:00:00
-2102130001,2015-09-01 00:00:00
-2201030001,2014-03-01 00:00:00
-2203030001,2016-08-01 00:00:00
-2224010001,2017-12-01 00:00:00
-1502040001,2015-08-01 00:00:00
-1504020001,2017-01-01 00:00:00
-1507810001,2017-02-01 00:00:00
-1600000001,2016-08-01 00:00:00
-1505020001,2016-09-01 00:00:00
-1101050001,2015-08-01 00:00:00
-1101070037,2011-01-01 00:00:00
-1101060002,2017-02-01 00:00:00
-1101060001,2017-02-01 00:00:00
-1310030001,2012-05-01 00:00:00
-1301080001,2012-08-01 00:00:00
-1201020001,2015-01-01 00:00:00
-1302020001,2012-08-01 00:00:00
-1401070001,2015-09-01 00:00:00
-3701030002,2016-07-01 00:00:00
-3701020001,2016-11-01 00:00:00
-2710000009,2015-08-01 00:00:00
-3714020001,2015-12-01 00:00:00
-3723010000,2017-03-01 00:00:00
-3708011001,2014-10-01 00:00:00
-3702030001,2011-01-01 00:00:00
-3702130001,2013-06-01 00:00:00
-3706020001,2015-02-01 00:00:00
-3706020002,2017-01-01 00:00:00
-3707010001,2015-02-01 00:00:00
-4101020001,2012-08-01 00:00:00
-4101030001,2013-06-01 00:00:00
-4101080001,2017-03-01 00:00:00
-4101040001,2017-03-01 00:00:00
-4201030001,2012-08-01 00:00:00
-4201050001,2012-08-01 00:00:00
-4201060001,2014-01-01 00:00:00
-4201060002,2014-01-01 00:00:00
-4202020001,2015-07-01 00:00:00
-4205000001,2017-04-01 00:00:00
-4208040001,2016-06-01 00:00:00
-4203000001,2016-08-01 00:00:00
-3401110000,2016-02-01 00:00:00
-3401040001,2013-06-01 00:00:00
-3401020001,2016-11-01 00:00:00
-3415000001,2017-04-01 00:00:00
-2360000001,2016-11-01 00:00:00
-3402020001,2013-06-01 00:00:00
-3403020001,2014-05-01 00:00:00
-3405040001,2014-10-01 00:00:00
-3413020001,2017-03-01 00:00:00
-3601060001,2013-06-01 00:00:00
-3609020001,2017-01-01 00:00:00
-3611000001,2017-03-01 00:00:00
-4301050001,2014-03-01 00:00:00
-4303040001,2016-09-01 00:00:00
-4307020001,2016-10-01 00:00:00
-6401060001,2012-08-01 00:00:00
-6401050001,2014-10-01 00:00:00
-6201020001,2014-10-01 00:00:00
-6301000001,2016-12-01 00:00:00
-6501000001,2016-12-01 00:00:00
-5101060001,2013-06-01 00:00:00
-6100660001,2016-07-01 00:00:00
-5101050001,2017-03-01 00:00:00
-5101220001,2017-04-01 00:00:00
-5107030001,2013-07-01 00:00:00
-5108020001,2015-07-01 00:00:00
-5106030001,2016-12-01 00:00:00
-5110110001,2015-08-01 00:00:00
-5120000001,2016-12-01 00:00:00
-5109030001,2016-12-01 00:00:00
-5111020001,2016-12-01 00:00:00
-6101121001,2014-11-01 00:00:00
-6101122001,2015-01-01 00:00:00
-6101120001,2014-04-01 00:00:00
-7140000001,2015-08-01 00:00:00
-4000600001,2011-02-01 00:00:00
-5001010001,2014-04-01 00:00:00
-5001130001,2015-12-01 00:00:00
-5001180001,2016-10-01 00:00:00
-6500000001,2015-04-01 00:00:00
-6661000001,2015-11-01 00:00:00
-4501030001,2015-01-01 00:00:00
-4503050001,2015-12-01 00:00:00
-4502040001,2017-01-01 00:00:00
-3501030001,2016-12-01 00:00:00
-3501040001,2012-07-01 00:00:00
-3501810001,2014-12-01 00:00:00
-3505030001,2013-05-01 00:00:00
-3503020001,2013-04-01 00:00:00
-3509010001,2013-06-01 00:00:00
-3650000001,2017-02-01 00:00:00
-3505820001,2013-06-01 00:00:00
-3502060001,2012-06-01 00:00:00
-3502110001,2013-10-01 00:00:00
-3506020001,2013-05-01 00:00:00
-3506810001,2017-02-01 00:00:00
-4401110001,2012-04-01 00:00:00
-4401830001,2014-06-01 00:00:00
-4401130001,2017-04-01 00:00:00
-4401120001,2015-07-01 00:00:00
-4401150001,2015-12-01 00:00:00
-4418020001,2017-05-01 00:00:00
-4406820001,2015-01-01 00:00:00
-4406070001,2017-01-01 00:00:00
-4407030001,2014-12-01 00:00:00
-5240000001,2016-08-01 00:00:00
-4601060001,2017-03-01 00:00:00
-4419000001,2014-02-01 00:00:00
-4419010002,2015-12-01 00:00:00
-4419010003,2017-01-01 00:00:00
-4414000001,2016-09-01 00:00:00
-3201050001,2011-01-01 00:00:00
-3201150001,2014-06-01 00:00:00
-3211020001,2012-08-01 00:00:00
-3208020001,2016-10-01 00:00:00
-3212020001,2012-08-01 00:00:00
-3203040001,2014-07-01 00:00:00
-3203120001,2017-04-01 00:00:00
-3207000001,2017-03-01 00:00:00
-2140000005,2015-07-01 00:00:00
-3202060001,2014-06-01 00:00:00
-3204110001,2012-08-01 00:00:00
-3204120001,2017-02-01 00:00:00
-3202810001,2013-06-01 00:00:00
-3202820001,2014-07-01 00:00:00
-3205850001,2013-06-01 00:00:00
-2016060001,2014-10-01 00:00:00
-3101140001,2012-08-01 00:00:00
-3101130001,2012-08-01 00:00:00
-3101170001,2014-08-01 00:00:00
-3101160001,2015-07-01 00:00:00
-3302120001,2014-12-01 00:00:00
-3302050001,2015-12-02 00:00:00
-3302810001,2014-03-01 00:00:00
-3307020001,2014-07-01 00:00:00
-3307820001,2016-12-01 00:00:00
-3303030001,2013-06-01 00:00:00
-3254010001,2014-12-01 00:00:00
-3310000001,2016-10-01 00:00:00
-3301050001,2015-02-01 00:00:00
-3306210001,2016-07-01 00:00:00
-3306820001,2017-01-01 00:00:00
-3305020001,2017-01-01 00:00:00
-4505030001,2017-06-01 00:00:00
-3205060001,2016-05-01 00:00:00
-1130000002,2016-01-04 00:00:00

+ 0 - 5
.svn/text-base/buildinglistgld.json.svn-base

@@ -1,5 +0,0 @@
-{
-"Buildings":[
-{"building":"1101080001","time":"2016-01-01 00:00:00"}
-]	
-}

+ 0 - 33
.svn/text-base/config.json.svn-base

@@ -1,33 +0,0 @@
-{
-	"Work_DB":[
-		"db_wanda"
-	],
-	"ComputeCycle":[
-		"16"
-	],
-	"ComputeDensity":[
-		"15min"
-	],
-	"ComputeDensity_SS":[
-		"5min"
-	],
-	"BreakEndure":[
-		"300"
-	],
-	"AbandonEndure":[
-		"900"
-	],
-	"Thread_Count":[
-		"20"
-	],
-	"PointResource_Format":[
-		"CSV"
-	],
-	"compute_realtime":[
-		"true"
-	],
-	"compute_buildings":[
-		"1101080001,1101080002"
-	]
-	
-}

+ 0 - 27
.svn/text-base/def_buildingcomputetime.json.svn-base

@@ -1,27 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"compute_time",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"first_compute_time",
-			"Multiplicity":"1",
-			"Type":"String"
-		}
-		
-	],
-	"Key":[
-		"building"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 45
.svn/text-base/def_computedetail.json.svn-base

@@ -1,45 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"compute_round",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"meter",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"funcid",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"valid_time_from",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"valid_time_to",
-			"Multiplicity":"1",
-			"Type":"String"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"compute_round",
-		"meter",
-		"funcid"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 50
.svn/text-base/def_computedetail1.json.svn-base

@@ -1,50 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"compute_round",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"meter",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"funcid",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"data_time",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"label2",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"meter_cleaned2",
-			"Multiplicity":"1",
-			"Type":"Double"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"compute_round",
-		"meter",
-		"funcid",
-		"data_time"
-	],
-	"Indexes":[	
-	]
-	
-}

+ 0 - 62
.svn/text-base/def_computedetail2.json.svn-base

@@ -1,62 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"compute_round",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"meter",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"funcid",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"time_period",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_time",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_flag",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"data_value",
-			"Multiplicity":"1",
-			"Type":"Double"
-		},
-		{
-			"Name":"data_value_old",
-			"Multiplicity":"1",
-			"Type":"Double"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"compute_round",
-		"meter",
-		"funcid",
-		"time_period",
-		"data_time"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 38
.svn/text-base/def_computelog.json.svn-base

@@ -1,38 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"compute_round",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"compute_time_from",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"compute_time_to",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"is_finished",
-			"Multiplicity":"1",
-			"Type":"Long"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"compute_round"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 48
.svn/text-base/def_computelog1.json.svn-base

@@ -1,48 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"compute_round",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"fjd_compute_round_from",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"fjd_compute_round_to",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"compute_time_from",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"compute_time_to",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"is_finished",
-			"Multiplicity":"1",
-			"Type":"Long"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"compute_round"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 43
.svn/text-base/def_computelog2.json.svn-base

@@ -1,43 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"meter",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"funcid",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"compute_round",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"compute_time_from",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"compute_time_to",
-			"Multiplicity":"1",
-			"Type":"String"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"compute_round"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 44
.svn/text-base/def_metercomputetime.json.svn-base

@@ -1,44 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"meter",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"funcid",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"compute_time",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_time",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"first_compute_time",
-			"Multiplicity":"1",
-			"Type":"String"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"meter",
-		"funcid"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 51
.svn/text-base/def_near.json.svn-base

@@ -1,51 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"meter",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"funcid",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"time_period",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_time",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_flag",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"data_value",
-			"Multiplicity":"1",
-			"Type":"Double"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"meter",
-		"funcid",
-		"time_period",
-		"data_time"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 51
.svn/text-base/def_near1.json.svn-base

@@ -1,51 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"meter",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"funcid",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"time_period",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_time",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_flag",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"data_value",
-			"Multiplicity":"1",
-			"Type":"Double"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"meter",
-		"funcid",
-		"time_period",
-		"data_time"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 51
.svn/text-base/def_near2.json.svn-base

@@ -1,51 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"meter",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"funcid",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"time_period",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_time",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_flag",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"data_value",
-			"Multiplicity":"1",
-			"Type":"Double"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"meter",
-		"funcid",
-		"time_period",
-		"data_time"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 39
.svn/text-base/def_pointlist.json.svn-base

@@ -1,39 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"meter",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"funcid",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"data_type",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"collect_cycle",
-			"Multiplicity":"1",
-			"Type":"String"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"meter",
-		"funcid"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 57
.svn/text-base/def_rate.json.svn-base

@@ -1,57 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"meter",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"funcid",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"time_period",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_time",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_flag",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"status_value",
-			"Multiplicity":"1",
-			"Type":"Double"
-		},
-		{
-			"Name":"status_ratio",
-			"Multiplicity":"1",
-			"Type":"Double"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"meter",
-		"funcid",
-		"time_period",
-		"data_time",
-		"status_value"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 51
.svn/text-base/def_service.json.svn-base

@@ -1,51 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"meter",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"funcid",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"time_period",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_time",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_flag",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"data_value",
-			"Multiplicity":"1",
-			"Type":"Double"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"meter",
-		"funcid",
-		"time_period",
-		"data_time"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 50
.svn/text-base/def_servicecomputedetail.json.svn-base

@@ -1,50 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"compute_round",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"fjd_source",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"meter",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"funcid",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"valid_time_from",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"valid_time_to",
-			"Multiplicity":"1",
-			"Type":"String"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"compute_round",
-		"fjd_source",
-		"meter",
-		"funcid"
-	],
-	"Indexes":[	
-	]
-	
-}

+ 0 - 54
.svn/text-base/def_servicecomputelog.json.svn-base

@@ -1,54 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"compute_round",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"fjd_source",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"fjd_compute_round_from",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"fjd_compute_round_to",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"compute_time_from",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"compute_time_to",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"is_finished",
-			"Multiplicity":"1",
-			"Type":"Long"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"compute_round",
-		"fjd_source"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 76
.svn/text-base/def_static.json.svn-base

@@ -1,76 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"meter",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"funcid",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"time_period",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_time",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_flag",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"data_count",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"data_avg",
-			"Multiplicity":"1",
-			"Type":"Double"
-		},
-		{
-			"Name":"data_max",
-			"Multiplicity":"1",
-			"Type":"Double"
-		},
-		{
-			"Name":"time_max",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_min",
-			"Multiplicity":"1",
-			"Type":"Double"
-		},
-		{
-			"Name":"time_min",
-			"Multiplicity":"1",
-			"Type":"String"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"meter",
-		"funcid",
-		"time_period",
-		"data_time"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 34
.svn/text-base/hbase-site.xml.svn-base

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<configuration>
-	<!-- hbase-site.xml -->
-	<property>
-		<name>dfs.replication</name>
-		<value>1</value>
-	</property>
-
-	<property>
-		<name>hbase.rootdir</name>
-		<value>hdfs://namenode:8020/hbase</value>
-	</property>
-	<property>
-		<name>hbase.cluster.distributed</name>
-		<value>true</value>
-	</property>
-	<property>
-		<name>hbase.zookeeper.quorum</name>
-		<value>zookeeper1,zookeeper2,zookeeper3</value>
-	</property>
-	<property>
-		<name>hbase.zookeeper.property.dataDir</name>
-		<value>/var/zookeeper/data</value>
-	</property>
-
-	<!--
-	<property>
-		<name>hbase.security.authentication</name>
-		<value>simple</value>
-	</property>
-	-->
-
-</configuration>

+ 0 - 17
.svn/text-base/log4j.properties.svn-base

@@ -1,17 +0,0 @@
-log4j.rootLogger=INFO,ConsoleAppender,RollingLogFileAppender
-
-log4j.appender.RollingLogFileAppender=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.RollingLogFileAppender.Threshold=INFO
-log4j.appender.RollingLogFileAppender.ImmediateFlush=true
-log4j.appender.RollingLogFileAppender.File=log.log
-log4j.appender.RollingLogFileAppender.DatePattern=yyyy-MM-dd'.log'  
-log4j.appender.RollingLogFileAppender.Append=true
-log4j.appender.RollingLogFileAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.RollingLogFileAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %t %m%n
-
-log4j.appender.ConsoleAppender=org.apache.log4j.ConsoleAppender
-log4j.appender.ConsoleAppender.Threshold=INFO
-log4j.appender.ConsoleAppender.ImmediateFlush=true
-log4j.appender.ConsoleAppender.Target=System.out
-log4j.appender.ConsoleAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.ConsoleAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH\:mm\:ss} %t %m%n

File diff suppressed because it is too large
+ 0 - 3571
.svn/text-base/pointlist.csv.svn-base


+ 0 - 10
.svn/text-base/pointlist.json.svn-base

@@ -1,10 +0,0 @@
-{
-"Points":[
-{"building":"4301050001","meter":"1001","funcid":0,"data_type":"Inst","collect_cycle":"5min"},
-{"building":"4301050001","meter":"1002","funcid":0,"data_type":"Acc","collect_cycle":"5min"},
-{"building":"4301050001","meter":"1003","funcid":0,"data_type":"Boolv","collect_cycle":"5min"},
-{"building":"4301050001","meter":"1004","funcid":0,"data_type":"Enumv","collect_cycle":"5min"},
-{"building":"4301050001","meter":"6666","funcid":0,"data_type":"Acc","collect_cycle":"5min"}
-
-]	
-}

File diff suppressed because it is too large
+ 0 - 557182
.svn/text-base/pointlist2.csv.svn-base


File diff suppressed because it is too large
+ 0 - 5176
.svn/text-base/pointlist2.json.svn-base


File diff suppressed because it is too large
+ 0 - 557182
.svn/text-base/pointlist3.csv.svn-base


+ 0 - 10
.svn/text-base/pointlist3.json.svn-base

@@ -1,10 +0,0 @@
-{
-"Points":[
-{"building":"4301050001","meter":"1001","funcid":0,"data_type":"Inst","collect_cycle":"5min"},
-{"building":"4301050001","meter":"1002","funcid":0,"data_type":"Acc","collect_cycle":"5min"},
-{"building":"4301050001","meter":"1003","funcid":0,"data_type":"Boolv","collect_cycle":"5min"},
-{"building":"4301050001","meter":"1004","funcid":0,"data_type":"Enumv","collect_cycle":"5min"},
-{"building":"4301050001","meter":"6666","funcid":0,"data_type":"Acc","collect_cycle":"5min"}
-
-]	
-}

File diff suppressed because it is too large
+ 0 - 5173
.svn/text-base/pointlistgld.csv.svn-base


File diff suppressed because it is too large
+ 0 - 5177
.svn/text-base/pointlistgld.json.svn-base


+ 0 - 169
.svn/text-base/pom.xml.svn-base

@@ -1,169 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.sagacloud</groupId>
-	<artifactId>compute-fjd</artifactId>
-	<version>1.0-SNAPSHOT</version>
-	<properties>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
-	</properties>
-
-	<repositories>
-		<repository>
-			<id>SagaCloud</id>
-			<name>SagaCloud</name>
-			<url>http://172.16.0.86:8081/repository/SagaCloud/</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-		</repository>
-		<repository>
-			<id>alimaven</id>
-			<name>aliyun maven</name>
-			<url>http://maven.aliyun.com/nexus/content/groups/public</url>
-		</repository>
-		<repository>
-			<id>mvnrepository</id>
-			<url>https://mvnrepository.com/</url>
-		</repository>
-		<repository>
-			<id>sonatype-nexus-snapshots</id>
-			<name>Sonatype Nexus Snapshots</name>
-			<url>http://oss.sonatype.org/content/repositories/snapshots</url>
-		</repository>
-	</repositories>
-
-	<dependencies>
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.13</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.hbase</groupId>
-			<artifactId>hbase-server</artifactId>
-			<version>1.3.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.hbase</groupId>
-			<artifactId>hbase-client</artifactId>
-			<version>1.3.0</version>
-		</dependency>
-		<dependency>
-			<groupId>dom4j</groupId>
-			<artifactId>dom4j</artifactId>
-			<version>1.6.1</version>
-		</dependency>
-		<dependency>
-			<groupId>jaxen</groupId>
-			<artifactId>jaxen</artifactId>
-			<version>1.1.6</version>
-		</dependency>
-		<dependency>
-			<groupId>com.sagacloud</groupId>
-			<artifactId>zillion-util</artifactId>
-			<version>1.2</version>
-			<type>jar</type>
-		</dependency>
-		<dependency>
-			<groupId>com.sagacloud</groupId>
-			<artifactId>json-lib-zillion</artifactId>
-			<version>1.0</version>
-			<type>jar</type>
-		</dependency>
-		<dependency>
-			<groupId>jdk.tools</groupId>
-			<artifactId>jdk.tools</artifactId>
-			<version>1.8</version>
-			<scope>system</scope>
-			<systemPath>${JAVA_HOME}/lib/tools.jar</systemPath>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<targetPath>${project.build.directory}</targetPath>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.4</version>
-				<configuration>
-					<defaultLibBundleDir></defaultLibBundleDir>
-					<source>1.8</source>
-					<target>1.8</target>
-					<encoding>gbk</encoding>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
-				<configuration>
-					<archive>
-						<manifest>
-							<addClasspath>true</addClasspath>
-							<classpathPrefix></classpathPrefix>
-							<mainClass>com.persagy.compute.main.ComputeMain</mainClass>
-						</manifest>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.4</version>
-				<executions>
-					<execution>
-						<id>copy</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>
-								${project.build.directory}
-							</outputDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.4</version>
-				<configuration>
-					<encoding>UTF-8</encoding>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-	<profiles>
-		<profile>
-			<id>dev</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-shade-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>none</phase>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-
-</project>

+ 51 - 0
META-INF/MANIFEST.MF

@@ -0,0 +1,51 @@
+Manifest-Version: 1.0
+Main-Class: com.saga.main.Main
+Class-Path: jackson-jaxrs-1.9.13.jar geronimo-jms_1.1_spec-1.1.1.jar hba
+ se-client-1.3.0.jar jasypt-1.9.0.jar leveldbjni-all-1.8.jar jsch-0.1.42
+ .jar hbase-common-1.3.0-tests.jar httpclient-4.2.5.jar findbugs-annotat
+ ions-1.3.9-1.jar jersey-guice-1.9.jar spring-beans-3.0.7.RELEASE.jar co
+ mmons-math3-3.1.1.jar jaxb-impl-2.2.3-1.jar netty-all-4.0.23.Final.jar 
+ jasper-runtime-5.5.23.jar jxl-2.6.12.jar protobuf-java-2.5.0.jar jsp-2.
+ 1-6.1.14.jar apacheds-i18n-2.0.0-M15.jar hadoop-hdfs-2.5.1.jar hadoop-m
+ apreduce-client-shuffle-2.5.1.jar commons-codec-1.9.jar hadoop-annotati
+ ons-2.5.1.jar jettison-1.1.jar stax-api-1.0-2.jar commons-logging-1.2.j
+ ar api-asn1-api-1.0.0-M20.jar jetty-util-6.1.26.jar zookeeper-3.4.6.jar
+  xml-apis-1.0.b2.jar jersey-core-1.9.jar hadoop-yarn-common-2.5.1.jar j
+ ackson-core-asl-1.9.13.jar hadoop-yarn-server-common-2.5.1.jar mqtt-cli
+ ent-1.3.jar slf4j-log4j12-1.6.1.jar hadoop-yarn-client-2.5.1.jar jcodin
+ gs-1.0.8.jar guice-servlet-3.0.jar apacheds-kerberos-codec-2.0.0-M15.ja
+ r dom4j-1.6.1.jar asm-3.1.jar api-util-1.0.0-M20.jar paranamer-2.3.jar 
+ log4j-1.2.17.jar hadoop-client-2.5.1.jar commons-io-2.4.jar kahadb-5.7.
+ 0.jar guice-3.0.jar commons-net-3.1.jar jersey-client-1.9.jar spring-as
+ m-3.0.7.RELEASE.jar servlet-api-2.5-6.1.14.jar slf4j-api-1.6.6.jar hbas
+ e-common-1.3.0.jar hawtdispatch-transport-1.11.jar hbase-annotations-1.
+ 3.0.jar hbase-prefix-tree-1.3.0.jar commons-beanutils-core-1.8.0.jar to
+ ols.jar hawtbuf-1.9.jar activemq-protobuf-1.1.jar xz-1.0.jar activation
+ -1.1.jar spring-core-3.0.7.RELEASE.jar spring-aop-3.0.7.RELEASE.jar jas
+ per-compiler-5.5.23.jar hbase-hadoop-compat-1.3.0.jar jetty-6.1.26.jar 
+ htrace-core-3.1.0-incubating.jar junit-4.12.jar spring-context-3.0.7.RE
+ LEASE.jar hadoop-mapreduce-client-jobclient-2.5.1.jar snappy-java-1.0.4
+ .1.jar hadoop-mapreduce-client-app-2.5.1.jar jamon-runtime-2.4.1.jar hb
+ ase-server-1.3.0.jar metrics-core-2.2.0.jar jaxb-api-2.2.2.jar spring-e
+ xpression-3.0.7.RELEASE.jar jaxen-1.1.6.jar geronimo-j2ee-management_1.
+ 1_spec-1.0.1.jar java-xmlbuilder-0.4.jar commons-el-1.0.jar activemq-co
+ re-5.7.0.jar commons-collections-3.2.2.jar joni-2.1.2.jar jersey-server
+ -1.9.jar hawtdispatch-1.11.jar disruptor-3.3.0.jar commons-compress-1.4
+ .1.jar hadoop-yarn-api-2.5.1.jar hadoop-common-2.5.1.jar hadoop-auth-2.
+ 5.1.jar log4j-1.2.11.jar json-lib-2.4-jdk15.jar gson-2.2.4.jar commons-
+ logging-1.1.1.jar slf4j-api-1.6.1.jar slf4j-log4j12-1.6.1.jar mina-core
+ -2.0.7.jar jaxen-1.1-beta-7.jar dom4j-1.6.1.jar commons-beanutils-1.8.0
+ .jar commons-collections-3.2.1.jar fastjson-1.1.33.jar poi-3.9.jar ezmo
+ rph-1.0.6.jar c3p0-0.9.5.2.jar mchange-commons-java-0.2.11.jar ems-com.
+ jar commons-lang-2.5.jar zillion-util-1.8.2.jar commons-configuration-1
+ .6.jar hbase-procedure-1.3.0.jar commons-digester-1.8.jar jets3t-0.9.0.
+ jar commons-math-2.2.jar commons-daemon-1.0.13.jar aopalliance-1.0.jar 
+ commons-lang-2.6.jar hbase-protocol-1.3.0.jar hadoop-mapreduce-client-c
+ ommon-2.5.1.jar jackson-xc-1.8.3.jar xmlenc-0.52.jar hadoop-mapreduce-c
+ lient-core-2.5.1.jar hbase-hadoop2-compat-1.3.0.jar jackson-mapper-asl-
+ 1.9.13.jar jetty-sslengine-6.1.26.jar servlet-api-2.5.jar commons-httpc
+ lient-3.1.jar guava-12.0.1.jar httpcore-4.1.2.jar json-lib-zillion-1.0.
+ jar jersey-json-1.9.jar hamcrest-core-1.3.jar mysql-connector-java-5.1.
+ 13.jar avro-1.7.4.jar commons-beanutils-1.7.0.jar jsp-api-2.1-6.1.14.ja
+ r commons-cli-1.2.jar javax.inject-1.jar
+

BIN
config.xls


+ 0 - 5
src/.svn/dir-prop-base

@@ -1,5 +0,0 @@
-K 14
-bugtraq:number
-V 4
-true
-END

+ 0 - 34
src/.svn/entries

@@ -1,34 +0,0 @@
-10
-
-dir
-7
-svn://60.205.112.142/Saga_Project_Compute/compute-fjd/src
-svn://60.205.112.142/Saga_Project_Compute
-
-
-
-2017-06-06T11:22:23.110374Z
-5
-menglu
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-76837162-0bd0-9d41-b8e9-7b9c1ee79ca4
-
-main
-dir
-
-test
-dir
-

+ 0 - 5
src/main/.svn/dir-prop-base

@@ -1,5 +0,0 @@
-K 14
-bugtraq:number
-V 4
-true
-END

+ 0 - 34
src/main/.svn/entries

@@ -1,34 +0,0 @@
-10
-
-dir
-7
-svn://60.205.112.142/Saga_Project_Compute/compute-fjd/src/main
-svn://60.205.112.142/Saga_Project_Compute
-
-
-
-2017-06-06T11:22:23.110374Z
-5
-menglu
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-76837162-0bd0-9d41-b8e9-7b9c1ee79ca4
-
-java
-dir
-
-resources
-dir
-

+ 0 - 5
src/main/java/.svn/dir-prop-base

@@ -1,5 +0,0 @@
-K 14
-bugtraq:number
-V 4
-true
-END

+ 0 - 235
src/main/java/.svn/entries

@@ -1,235 +0,0 @@
-10
-
-dir
-7
-svn://60.205.112.142/Saga_Project_Compute/compute-fjd/src/main/java
-svn://60.205.112.142/Saga_Project_Compute
-
-
-
-2017-06-06T11:22:23.110374Z
-5
-menglu
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-76837162-0bd0-9d41-b8e9-7b9c1ee79ca4
-
-SS.java
-file
-9
-
-
-
-2017-07-13T06:42:22.816000Z
-74077f0dafe47fbaeffcdfb171656608
-2017-08-18T02:06:56.468898Z
-9
-lijingqiang
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1369
-
-TDD.java
-file
-9
-
-
-
-2017-06-30T09:59:00.057000Z
-a5d8b35291ac41ceede92e8f5c275802
-2017-08-18T02:06:56.468898Z
-9
-lijingqiang
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-665
-
-TestCSV.java
-file
-9
-
-
-
-2017-06-02T10:29:06.196000Z
-7be23e7b6fa1ca8bb7edf898b4b7f759
-2017-08-18T02:06:56.468898Z
-9
-lijingqiang
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1117
-
-TestInsert.java
-file
-9
-
-
-
-2017-06-13T09:46:56.582000Z
-3266ba2232f560667733dc1cc2218946
-2017-08-18T02:06:56.468898Z
-9
-lijingqiang
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2203
-
-TestPointList.java
-file
-
-
-
-
-2017-05-31T02:31:09.791838Z
-84b51d234654008e23c87ead8e3277c4
-2017-05-31T02:20:14.846128Z
-1
-menglu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4609
-
-TestResetCompute.java
-file
-
-
-
-
-2017-05-31T02:31:09.789833Z
-295f92ddca1ea98d82f5d2f8cc7f527b
-2017-05-31T02:20:14.846128Z
-1
-menglu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2400
-
-com
-dir
-

+ 0 - 37
src/main/java/.svn/text-base/SS.java.svn-base

@@ -1,37 +0,0 @@
-import com.saga.compute.util.DB.DBOperate;
-import com.saga.compute.util.common.Constant;
-import com.sagacloud.json.JSONObject;
-
-public class SS {
-
-	public static void main(String[] args) throws Exception {
-		// TODO Auto-generated method stub
-
-		// JSONObject deleteObject = new JSONObject();
-		// deleteObject.put("building", "4301050001");
-		// deleteObject.put("meter", "1001");
-		// deleteObject.put("funcid", Long.valueOf(String.valueOf(0)));
-		// if ((DBOperate.Instance().selectFirstDate(deleteObject,
-		// "fjd_0_metercomputetime")) == null) {
-		// System.out.println("xxx");
-		//
-		// }
-		// try {
-		// System.out.println(DBOperate.Instance().selectFirstDate(deleteObject,
-		// "fjd_0_metercomputetime"));
-		//
-		// } catch (Exception e) {
-		// // TODO Auto-generated catch block
-		// e.printStackTrace();
-		// }
-		String timefrom = "20170713140000";
-		String timeto = "20170713141500";
-		System.out.println((Constant.parseDB(timefrom).getTime() + "-" + Constant.parseDB(timeto).getTime() + " " + "="
-				+ (Constant.parseDB(timeto).getTime() - Constant.parseDB(timefrom).getTime()) + " "
-				+ (Constant.parseDB(timeto).getTime() - Constant.parseDB(timefrom).getTime() < (24 * 60 * 60 * 1000L)
-						? Constant.SIMPLEDATEFORMATDB.format(Constant.parseDB(timeto).getTime() + 24 * 60 * 60 * 1000L)
-						: timeto)));
-
-	}
-
-}

+ 0 - 20
src/main/java/.svn/text-base/TDD.java.svn-base

@@ -1,20 +0,0 @@
-import java.text.ParseException;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.persagy.compute.entity.EntityServiceLog;
-import com.persagy.compute.util.QueryUtil;
-import com.saga.compute.util.common.Constant;
-
-public class TDD {
-
-	public static void main(String[] args) throws ParseException {
-		// TODO Auto-generated method stub
-		System.out.println(
-				Constant.parse("20170629155800").getTime() < Constant.parse("20170629155845").getTime() ? 1 : 2);
-		Map<Long, EntityServiceLog> servicelog = new HashMap<Long, EntityServiceLog>();
-		servicelog.put(0l, new EntityServiceLog());
-		System.out.println(servicelog.get(1l));
-	}
-
-}

+ 0 - 43
src/main/java/.svn/text-base/TestCSV.java.svn-base

@@ -1,43 +0,0 @@
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.zillion.util.log.LogUtil;
-
-public class TestCSV {
-
-	public static void main(String[] args) {
-		// TODO Auto-generated method stub
-		String resource = "/wandapointlist.csv";
-		File csv = new File(LogUtil.GetPath() + resource);
-		BufferedReader br = null;
-		try {
-			br = new BufferedReader(new FileReader(csv));
-		} catch (FileNotFoundException e) {
-			e.printStackTrace();
-		}
-		String line = "";
-		String everyLine = "";
-		try {
-			List<String> allString = new ArrayList<>();
-			while ((line = br.readLine()) != null) // 读取到的内容给line变量
-			{
-				everyLine = line;
-				String[] str = everyLine.split(",");
-				for (String s : str) {
-					System.out.print(s + " ");
-				}
-				System.out.println();
-				allString.add(everyLine);
-			}
-			System.out.println("csv表格中所有行数:" + allString.size());
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-}

+ 0 - 56
src/main/java/.svn/text-base/TestInsert.java.svn-base

@@ -1,56 +0,0 @@
-
-import java.io.FileInputStream;
-
-import org.apache.hadoop.conf.Configuration;
-import org.zillion.util.log.LogUtil;
-
-import com.saga.compute.util.DB.DBOperate;
-import com.saga.compute.util.common.Constant;
-import com.sagacloud.json.JSONObject;
-import com.zillion.database.agent.ZillionAgent;
-
-public class TestInsert {
-
-	public static void main(String[] arsg) throws Exception {
-		String resource = "/hbase-site.xml";
-		Configuration configuration = new Configuration();
-		LogUtil.info(LogUtil.GetPath());
-		configuration.addResource(new FileInputStream(LogUtil.GetPath() + resource));
-		String zookeeper_connectionAddress = "zookeeper1:2181,zookeeper2:2181,zookeeper3:2181";
-		int zookeeper_sessionTimeout = 300000;
-		Constant.agent = new ZillionAgent(configuration, zookeeper_connectionAddress, zookeeper_sessionTimeout);
-		Constant.agent.Start();
-
-		// JSONObject InsertObject_detail = new JSONObject();
-		// InsertObject_detail.put("building", "4301050001");
-		// InsertObject_detail.put("compute_round", 1l);
-		// InsertObject_detail.put("meter", "1001");
-		// InsertObject_detail.put("funcid", 0l);
-		// InsertObject_detail.put("data_time", "20170102000000");
-		// InsertObject_detail.put("label2", 0l);
-		// InsertObject_detail.put("meter_cleaned2", 1111.22);
-		//
-		// JSONObject wrapperObject = new JSONObject();
-		// wrapperObject.put("QueryType", "insert");
-		// wrapperObject.put("Database", "db_wanda");
-		// wrapperObject.put("Datatable", "fjd_1_computedetail");
-		// wrapperObject.put("InsertObject", InsertObject_detail);
-		// Constant.agent.Query(wrapperObject);
-
-		JSONObject deleteObject = new JSONObject();
-		deleteObject.put("building", "4301050001");
-		deleteObject.put("meter", "1001");
-		deleteObject.put("funcid", 0l);
-		String[] time_periods = { "5min", "15min", "1h", "1d" };
-		for (String timePeriod : time_periods) {
-			deleteObject.put("time_period", timePeriod);
-			JSONObject range = new JSONObject();
-			range.put("$gte", "20170105000000");
-			range.put("$lte", "20170106000000");
-			deleteObject.put("data_time", range);
-			DBOperate.Instance().deleteData(deleteObject, "fjd_0_near");
-		}
-
-		System.exit(0);
-	}
-}

+ 0 - 116
src/main/java/.svn/text-base/TestPointList.java.svn-base

@@ -1,116 +0,0 @@
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseConfiguration;
-
-import com.persagy.compute.main.ComputeMain;
-import com.sagacloud.json.JSONArray;
-import com.sagacloud.json.JSONObject;
-import com.zillion.database.agent.ZillionAgent;
-
-public class TestPointList {
-	public static String database_name = "db_public";
-
-	public static void main(String[] args) throws Exception {
-		Configuration configuration = HBaseConfiguration.create();
-		String zookeeper_connectionAddress = "zookeeper1:2181,zookeeper2:2181,zookeeper3:2181";
-		int zookeeper_sessionTimeout = 300000;
-		ZillionAgent agent = new ZillionAgent(configuration, zookeeper_connectionAddress, zookeeper_sessionTimeout);
-		agent.Start();
-
-		JSONObject Criteria = new JSONObject();
-		JSONObject wrapperObject = new JSONObject();
-		wrapperObject.put("QueryType", "select");
-		wrapperObject.put("Database", database_name);
-		wrapperObject.put("Datatable", "dy_pointlist");
-		wrapperObject.put("Criteria", Criteria);
-		JSONObject queryResult = agent.Query(wrapperObject);
-		JSONArray resultContent = (JSONArray) queryResult.get("Content");
-
-		for (int i = 0; i < resultContent.size(); i++) {
-			JSONObject contentItem = (JSONObject) resultContent.get(i);
-			String building = (String) contentItem.get("building");
-			if (building.equals("1101080002")) {
-				contentItem.remove("building");
-				contentItem.put("building", "1101080001");
-
-				wrapperObject = new JSONObject();
-				wrapperObject.put("QueryType", "insert");
-				wrapperObject.put("Database", ComputeMain.database_name);
-				wrapperObject.put("Datatable", "dy_pointlist");
-				wrapperObject.put("InsertObject", contentItem);
-				agent.Query(wrapperObject);
-			}
-		}
-		Criteria = new JSONObject();
-		Criteria.put("building", "1101080002");
-		wrapperObject = new JSONObject();
-		wrapperObject.put("QueryType", "delete");
-		wrapperObject.put("Database", database_name);
-		wrapperObject.put("Datatable", "dy_pointlist");
-		wrapperObject.put("Criteria", Criteria);
-		agent.Query(wrapperObject);
-
-		// for (int i = 0; i < resultContent.size(); i++) {
-		// JSONObject contentItem = (JSONObject) resultContent.get(i);
-		// String building = (String) contentItem.get("building");
-		// String meter = (String) contentItem.get("meter");
-		// long funcid = (Long) contentItem.get("funcid");
-		// String data_type = (String) contentItem.get("data_type");
-		//
-		// Criteria = new JSONObject();
-		// Criteria.put("building", building);
-		// Criteria.put("meter", meter);
-		// Criteria.put("funcid", funcid);
-		// JSONObject Set = new JSONObject();
-		// if (data_type.equals("Acc")) {
-		// Set.put("collect_cycle", "15min");
-		// } else {
-		// Set.put("collect_cycle", "5min");
-		// }
-		// wrapperObject = new JSONObject();
-		// wrapperObject.put("QueryType", "update");
-		// wrapperObject.put("Database", ComputeMain.database_name);
-		// wrapperObject.put("Datatable", "dy_pointlist");
-		// wrapperObject.put("Criteria", Criteria);
-		// wrapperObject.put("Set", Set);
-		// agent.Query(wrapperObject);
-		// }
-		//
-		// int index_first = 0;
-		// for (int i = 1; i < resultContent.size() - 1; i++) {
-		// JSONObject item = (JSONObject) resultContent.get(i);
-		// String building = (String) item.get("building");
-		// String meter = (String) item.get("meter");
-		// JSONObject item_first = (JSONObject) resultContent.get(index_first);
-		// String building_first = (String) item_first.get("building");
-		// String meter_first = (String) item_first.get("meter");
-		// long funcid_first = (Long) item_first.get("funcid");
-		// if (building_first.equals(building) && meter_first.equals(meter)) {
-		// continue;
-		// }
-		//
-		// if (i - index_first == 9) {
-		// JSONObject item_final = (JSONObject) resultContent.get(i - 1);
-		// long funcid_final = (Long) item_final.get("funcid");
-		// if (funcid_first == 4 && funcid_final == 26) {
-		// JSONObject InsertObject = new JSONObject();
-		// InsertObject.put("building", building_first);
-		// InsertObject.put("meter", meter_first);
-		// InsertObject.put("funcid", 0L);
-		// InsertObject.put("data_type", "Acc");
-		// InsertObject.put("collect_cycle", "15min");
-		// wrapperObject = new JSONObject();
-		// wrapperObject.put("QueryType", "insert");
-		// wrapperObject.put("Database", ComputeMain.database_name);
-		// wrapperObject.put("Datatable", "dy_pointlist");
-		// wrapperObject.put("InsertObject", InsertObject);
-		// agent.Query(wrapperObject);
-		// }
-		// }
-		//
-		// index_first = i;
-		// }
-
-		agent.Stop();
-	}
-
-}

+ 0 - 63
src/main/java/.svn/text-base/TestResetCompute.java.svn-base

@@ -1,63 +0,0 @@
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseConfiguration;
-
-import com.sagacloud.json.JSONObject;
-import com.zillion.database.agent.ZillionAgent;
-
-public class TestResetCompute {
-	public static String database_name = "db_public";
-
-	public static void main(String[] args) throws Exception {
-		Configuration configuration = HBaseConfiguration.create();
-		String zookeeper_connectionAddress = "zookeeper1:2181,zookeeper2:2181,zookeeper3:2181";
-		int zookeeper_sessionTimeout = 300000;
-		ZillionAgent agent = new ZillionAgent(configuration, zookeeper_connectionAddress, zookeeper_sessionTimeout);
-		agent.Start();
-
-		JSONObject Criteria = new JSONObject();
-		JSONObject wrapperObject = new JSONObject();
-		wrapperObject.put("QueryType", "delete");
-		wrapperObject.put("Database", database_name);
-		wrapperObject.put("Datatable", "fjd_0_computelog");
-		wrapperObject.put("Criteria", Criteria);
-		agent.Query(wrapperObject);
-
-		Criteria = new JSONObject();
-		wrapperObject = new JSONObject();
-		wrapperObject.put("QueryType", "delete");
-		wrapperObject.put("Database", database_name);
-		wrapperObject.put("Datatable", "fjd_0_computedetail");
-		wrapperObject.put("Criteria", Criteria);
-		agent.Query(wrapperObject);
-
-		Criteria = new JSONObject();
-		wrapperObject = new JSONObject();
-		wrapperObject.put("QueryType", "delete");
-		wrapperObject.put("Database", database_name);
-		wrapperObject.put("Datatable", "fjd_0_metercomputetime");
-		wrapperObject.put("Criteria", Criteria);
-		agent.Query(wrapperObject);
-
-		Criteria = new JSONObject();
-		wrapperObject = new JSONObject();
-		wrapperObject.put("QueryType", "delete");
-		wrapperObject.put("Database", database_name);
-		wrapperObject.put("Datatable", "fjd_0_buildingcomputetime");
-		wrapperObject.put("Criteria", Criteria);
-		agent.Query(wrapperObject);
-
-		JSONObject InsertObject = new JSONObject();
-		InsertObject.put("building", "1101080001");
-		InsertObject.put("compute_time", "20170101000000");
-		InsertObject.put("first_compute_time", "20170101000000");
-		wrapperObject = new JSONObject();
-		wrapperObject.put("QueryType", "insert");
-		wrapperObject.put("Database", database_name);
-		wrapperObject.put("Datatable", "fjd_0_buildingcomputetime");
-		wrapperObject.put("InsertObject", InsertObject);
-		agent.Query(wrapperObject);
-
-		agent.Stop();
-	}
-
-}

+ 0 - 5
src/main/resources/.svn/dir-prop-base

@@ -1,5 +0,0 @@
-K 14
-bugtraq:number
-V 4
-true
-END

+ 0 - 640
src/main/resources/.svn/entries

@@ -1,640 +0,0 @@
-10
-
-dir
-7
-svn://60.205.112.142/Saga_Project_Compute/compute-fjd/src/main/resources
-svn://60.205.112.142/Saga_Project_Compute
-
-
-
-2017-05-31T02:20:14.846128Z
-1
-menglu
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-76837162-0bd0-9d41-b8e9-7b9c1ee79ca4
-
-def_buildingcomputetime.json
-file
-
-
-
-
-2017-05-31T02:31:09.873054Z
-5fab12248f0e43d7dacbc9e423fdeba3
-2017-05-31T02:20:14.846128Z
-1
-menglu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-328
-
-def_computedetail.json
-file
-
-
-
-
-2017-05-31T02:31:09.865033Z
-8ff6b364dad84fdd3dbceb3a4b7b751d
-2017-05-31T02:20:14.846128Z
-1
-menglu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-643
-
-def_computedetail1.json
-file
-
-
-
-
-2017-05-31T02:31:09.876068Z
-f0fd8f1fb18dc84d7a39f709160e5fa2
-2017-05-31T02:20:14.846128Z
-1
-menglu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-686
-
-def_computedetail2.json
-file
-
-
-
-
-2017-05-31T02:31:09.877065Z
-b567804f8e7ced085fb8bb9f782ff46c
-2017-05-31T02:20:14.846128Z
-1
-menglu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-769
-
-def_computelog.json
-file
-
-
-
-
-2017-05-31T02:31:09.874057Z
-61d01bbde5fbd769e0f8123e6d2066ef
-2017-05-31T02:20:14.846128Z
-1
-menglu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-510
-
-def_computelog1.json
-file
-
-
-
-
-2017-05-31T02:31:09.863028Z
-ca46f8fd3a22462fbbd73e6886579c95
-2017-05-31T02:20:14.846128Z
-1
-menglu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-688
-
-def_computelog2.json
-file
-
-
-
-
-2017-05-31T02:31:09.866037Z
-d7b368453152d85c93097c32467f2424
-2017-05-31T02:20:14.846128Z
-1
-menglu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-605
-
-def_metercomputetime.json
-file
-
-
-
-
-2017-05-31T02:31:09.887091Z
-a0555e803db305a27598182cba869c7b
-2017-05-31T02:20:14.846128Z
-1
-menglu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-493
-
-def_near.json
-file
-
-
-
-
-2017-05-31T02:31:09.882086Z
-c26a7825d1c4e4664d3f2e5121346129
-2017-05-31T02:20:14.846128Z
-1
-menglu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-683
-
-def_near1.json
-file
-
-
-
-
-2017-05-31T02:31:09.868041Z
-c26a7825d1c4e4664d3f2e5121346129
-2017-05-31T02:20:14.846128Z
-1
-menglu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-683
-
-def_near2.json
-file
-
-
-
-
-2017-05-31T02:31:09.870046Z
-c26a7825d1c4e4664d3f2e5121346129
-2017-05-31T02:20:14.846128Z
-1
-menglu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-683
-
-def_pointlist.json
-file
-
-
-
-
-2017-05-31T02:31:09.880073Z
-3865bbc82575c138190a0ca9674572de
-2017-05-31T02:20:14.846128Z
-1
-menglu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-494
-
-def_rate.json
-file
-
-
-
-
-2017-05-31T02:31:09.859033Z
-c1200e8b960bcbd31ec2942603f02ebe
-2017-05-31T02:20:14.846128Z
-1
-menglu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-786
-
-def_static.json
-file
-
-
-
-
-2017-05-31T02:31:09.883081Z
-b0a06c9bef287142ce2a82387190c8b0
-2017-05-31T02:20:14.846128Z
-1
-menglu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1071
-
-hbase-site.xml
-file
-
-
-
-
-2017-05-31T02:31:09.861022Z
-d45288b36056d189172a3e2af0a01d14
-2017-05-31T02:20:14.846128Z
-1
-menglu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-748
-
-log4j.properties
-file
-
-
-
-
-2017-05-31T02:31:09.879070Z
-0599a2d30a9eddc64f978904dd9ce2f3
-2017-05-31T02:20:14.846128Z
-1
-menglu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-979
-
-pointlist.json
-file
-
-
-
-
-2017-05-31T02:31:09.872052Z
-669e0f5b31879c86215ec455ac857042
-2017-05-31T02:20:14.846128Z
-1
-menglu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-523904
-
-pointlistxx.json
-file
-
-
-
-
-2017-05-31T02:31:09.885086Z
-1d09ff0e405d19e5329fff09f26d3af2
-2017-05-31T02:20:14.846128Z
-1
-menglu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-516
-

+ 0 - 27
src/main/resources/.svn/text-base/def_buildingcomputetime.json.svn-base

@@ -1,27 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"compute_time",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"first_compute_time",
-			"Multiplicity":"1",
-			"Type":"String"
-		}
-		
-	],
-	"Key":[
-		"building"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 47
src/main/resources/.svn/text-base/def_computedetail.json.svn-base

@@ -1,47 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"compute_round",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"meter",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"funcid",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"valid_time_from",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"valid_time_to",
-			"Multiplicity":"1",
-			"Type":"String"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"compute_round",
-		"meter",
-		"funcid",
-		"valid_time_from",
-		"valid_time_to"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 51
src/main/resources/.svn/text-base/def_computedetail1.json.svn-base

@@ -1,51 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"compute_round",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"meter",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"funcid",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"data_time",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"label2",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"meter_cleaned2",
-			"Multiplicity":"1",
-			"Type":"Double"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"compute_round",
-		"meter",
-		"funcid",
-		"data_time"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 56
src/main/resources/.svn/text-base/def_computedetail2.json.svn-base

@@ -1,56 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"compute_round",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"meter",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"funcid",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"data_time",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_flag",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"data_value",
-			"Multiplicity":"1",
-			"Type":"Double"
-		},
-		{
-			"Name":"data_value_old",
-			"Multiplicity":"1",
-			"Type":"Double"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"compute_round",
-		"meter",
-		"funcid",
-		"data_time"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 38
src/main/resources/.svn/text-base/def_computelog.json.svn-base

@@ -1,38 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"compute_round",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"compute_time_from",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"compute_time_to",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"is_finished",
-			"Multiplicity":"1",
-			"Type":"Long"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"compute_round"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 48
src/main/resources/.svn/text-base/def_computelog1.json.svn-base

@@ -1,48 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"compute_round",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"fjd_compute_round_from",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"fjd_compute_round_to",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"compute_time_from",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"compute_time_to",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"is_finished",
-			"Multiplicity":"1",
-			"Type":"Long"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"compute_round"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 45
src/main/resources/.svn/text-base/def_computelog2.json.svn-base

@@ -1,45 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"meter",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"funcid",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"compute_round",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"compute_time_from",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"compute_time_to",
-			"Multiplicity":"1",
-			"Type":"String"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"meter",
-		"funcid",
-		"compute_round"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 39
src/main/resources/.svn/text-base/def_metercomputetime.json.svn-base

@@ -1,39 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"meter",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"funcid",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"compute_time",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_time",
-			"Multiplicity":"1",
-			"Type":"String"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"meter",
-		"funcid"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 51
src/main/resources/.svn/text-base/def_near.json.svn-base

@@ -1,51 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"meter",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"funcid",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"time_period",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_time",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_flag",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"data_value",
-			"Multiplicity":"1",
-			"Type":"Double"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"meter",
-		"funcid",
-		"time_period",
-		"data_time"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 51
src/main/resources/.svn/text-base/def_near1.json.svn-base

@@ -1,51 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"meter",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"funcid",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"time_period",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_time",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_flag",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"data_value",
-			"Multiplicity":"1",
-			"Type":"Double"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"meter",
-		"funcid",
-		"time_period",
-		"data_time"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 51
src/main/resources/.svn/text-base/def_near2.json.svn-base

@@ -1,51 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"meter",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"funcid",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"time_period",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_time",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_flag",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"data_value",
-			"Multiplicity":"1",
-			"Type":"Double"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"meter",
-		"funcid",
-		"time_period",
-		"data_time"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 39
src/main/resources/.svn/text-base/def_pointlist.json.svn-base

@@ -1,39 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"meter",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"funcid",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"data_type",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"collect_cycle",
-			"Multiplicity":"1",
-			"Type":"String"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"meter",
-		"funcid"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 57
src/main/resources/.svn/text-base/def_rate.json.svn-base

@@ -1,57 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"meter",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"funcid",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"time_period",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_time",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_flag",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"status_value",
-			"Multiplicity":"1",
-			"Type":"Double"
-		},
-		{
-			"Name":"status_ratio",
-			"Multiplicity":"1",
-			"Type":"Double"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"meter",
-		"funcid",
-		"time_period",
-		"data_time",
-		"status_value"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 76
src/main/resources/.svn/text-base/def_static.json.svn-base

@@ -1,76 +0,0 @@
-{
-	"Columns":[
-		{
-			"Name":"building",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"meter",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"funcid",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"time_period",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_time",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_flag",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"data_count",
-			"Multiplicity":"1",
-			"Type":"Long"
-		},
-		{
-			"Name":"data_avg",
-			"Multiplicity":"1",
-			"Type":"Double"
-		},
-		{
-			"Name":"data_max",
-			"Multiplicity":"1",
-			"Type":"Double"
-		},
-		{
-			"Name":"time_max",
-			"Multiplicity":"1",
-			"Type":"String"
-		},
-		{
-			"Name":"data_min",
-			"Multiplicity":"1",
-			"Type":"Double"
-		},
-		{
-			"Name":"time_min",
-			"Multiplicity":"1",
-			"Type":"String"
-		}
-		
-	],
-	"Key":[
-		"building",
-		"meter",
-		"funcid",
-		"time_period",
-		"data_time"
-	],
-	"Indexes":[
-		
-	]
-	
-}

+ 0 - 34
src/main/resources/.svn/text-base/hbase-site.xml.svn-base

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<configuration>
-	<!-- hbase-site.xml -->
-	<property>
-		<name>dfs.replication</name>
-		<value>1</value>
-	</property>
-
-	<property>
-		<name>hbase.rootdir</name>
-		<value>hdfs://namenode:8020/hbase</value>
-	</property>
-	<property>
-		<name>hbase.cluster.distributed</name>
-		<value>true</value>
-	</property>
-	<property>
-		<name>hbase.zookeeper.quorum</name>
-		<value>zookeeper1,zookeeper2,zookeeper3</value>
-	</property>
-	<property>
-		<name>hbase.zookeeper.property.dataDir</name>
-		<value>/var/zookeeper/data</value>
-	</property>
-
-	<!--
-	<property>
-		<name>hbase.security.authentication</name>
-		<value>simple</value>
-	</property>
-	-->
-
-</configuration>

+ 0 - 17
src/main/resources/.svn/text-base/log4j.properties.svn-base

@@ -1,17 +0,0 @@
-log4j.rootLogger=INFO,ConsoleAppender,RollingLogFileAppender
-
-log4j.appender.RollingLogFileAppender=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.RollingLogFileAppender.Threshold=INFO
-log4j.appender.RollingLogFileAppender.ImmediateFlush=true
-log4j.appender.RollingLogFileAppender.File=log.log
-log4j.appender.RollingLogFileAppender.DatePattern=yyyy-MM-dd'.log'  
-log4j.appender.RollingLogFileAppender.Append=true
-log4j.appender.RollingLogFileAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.RollingLogFileAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %t %m%n
-
-log4j.appender.ConsoleAppender=org.apache.log4j.ConsoleAppender
-log4j.appender.ConsoleAppender.Threshold=INFO
-log4j.appender.ConsoleAppender.ImmediateFlush=true
-log4j.appender.ConsoleAppender.Target=System.out
-log4j.appender.ConsoleAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.ConsoleAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH\:mm\:ss} %t %m%n

File diff suppressed because it is too large
+ 0 - 5177
src/main/resources/.svn/text-base/pointlist.json.svn-base


+ 0 - 10
src/main/resources/.svn/text-base/pointlistxx.json.svn-base

@@ -1,10 +0,0 @@
-{
-"Points":[
-{"building":"4301050001","meter":"1001","funcid":0,"data_type":"Inst","collect_cycle":"5minute"},
-{"building":"4301050001","meter":"1002","funcid":0,"data_type":"Acc","collect_cycle":"5minute"},
-{"building":"4301050001","meter":"1003","funcid":0,"data_type":"Boolv","collect_cycle":"5minute"},
-{"building":"4301050001","meter":"1004","funcid":0,"data_type":"Enumv","collect_cycle":"5minute"},
-{"building":"4301050001","meter":"6666","funcid":0,"data_type":"Acc","collect_cycle":"5minute"}
-
-]	
-}

+ 0 - 5
src/test/.svn/dir-prop-base

@@ -1,5 +0,0 @@
-K 14
-bugtraq:number
-V 4
-true
-END

+ 0 - 34
src/test/.svn/entries

@@ -1,34 +0,0 @@
-10
-
-dir
-7
-svn://60.205.112.142/Saga_Project_Compute/compute-fjd/src/test
-svn://60.205.112.142/Saga_Project_Compute
-
-
-
-2017-05-31T02:20:14.846128Z
-1
-menglu
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-76837162-0bd0-9d41-b8e9-7b9c1ee79ca4
-
-java
-dir
-
-resources
-dir
-

+ 0 - 5
src/test/java/.svn/dir-prop-base

@@ -1,5 +0,0 @@
-K 14
-bugtraq:number
-V 4
-true
-END

+ 0 - 28
src/test/java/.svn/entries

@@ -1,28 +0,0 @@
-10
-
-dir
-7
-svn://60.205.112.142/Saga_Project_Compute/compute-fjd/src/test/java
-svn://60.205.112.142/Saga_Project_Compute
-
-
-
-2017-05-31T02:20:14.846128Z
-1
-menglu
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-76837162-0bd0-9d41-b8e9-7b9c1ee79ca4
-

+ 0 - 5
src/test/resources/.svn/dir-prop-base

@@ -1,5 +0,0 @@
-K 14
-bugtraq:number
-V 4
-true
-END

+ 0 - 28
src/test/resources/.svn/entries

@@ -1,28 +0,0 @@
-10
-
-dir
-7
-svn://60.205.112.142/Saga_Project_Compute/compute-fjd/src/test/resources
-svn://60.205.112.142/Saga_Project_Compute
-
-
-
-2017-05-31T02:20:14.846128Z
-1
-menglu
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-76837162-0bd0-9d41-b8e9-7b9c1ee79ca4
-