b2c / titan · Commits

Commit 33a755cd2991901104500988c187b4d5d337e1fc

Authored by alexyang
1 parent 08c8ca7e

remove code

Inline Side-by-side
Showing 58 changed files with 126 additions and 4337 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 58 of 147 files are displayed.

titan-api/src/main/java/com/diligrp/titan/rest/domain/output/SkuOut.java
  View file @33a755c
... ... @@ -42,6 +42,16 @@ public class SkuOut {
42 42  
43 43 private Integer status;
44 44  
  45 + private Integer storeUnit;
  46 +
  47 + public Integer getStoreUnit() {
  48 + return storeUnit;
  49 + }
  50 +
  51 + public void setStoreUnit(Integer storeUnit) {
  52 + this.storeUnit = storeUnit;
  53 + }
  54 +
45 55 /**
46 56 * sku属性Map
47 57 */
... ...
titan-sdk/src/main/java/com/diligrp/titan/sdk/domain/Sku.java
  View file @33a755c
... ... @@ -43,6 +43,16 @@ public class Sku {
43 43  
44 44 private Integer status;
45 45  
  46 + private Integer storeUnit;
  47 +
  48 + public Integer getStoreUnit() {
  49 + return storeUnit;
  50 + }
  51 +
  52 + public void setStoreUnit(Integer storeUnit) {
  53 + this.storeUnit = storeUnit;
  54 + }
  55 +
46 56 /**
47 57 * sku属性Map
48 58 */
... ...
titan-sdk/src/main/java/com/diligrp/titan/sdk/input/BaseProductView.java
  View file @33a755c
... ... @@ -21,7 +21,7 @@ public class BaseProductView {
21 21 */
22 22 protected String cname;
23 23 /**
24   - * 商品类型(0普通商品,1拼购商品)
  24 + * 商品类型(0普通商品,促销商品)
25 25 */
26 26 private int productType;
27 27 /**
... ...
titan-sdk/src/main/java/com/diligrp/titan/sdk/input/PopProductView.java
  View file @33a755c
... ... @@ -6,6 +6,9 @@ public class PopProductView extends BaseProductView {
6 6 * 商品PID
7 7 */
8 8 private Long pid;
  9 + /**
  10 + * 是否首页推荐
  11 + */
9 12  
10 13 private Integer indexTop;
11 14  
... ...
titan-sdk/src/test/java/com/diligrp/titan/sdk/TestProductService.java
  View file @33a755c
1 1 package com.diligrp.titan.sdk;
2 2  
3 3 import com.alibaba.fastjson.JSON;
4   -import com.diligrp.titan.sdk.constant.TopTypeEnum;
5 4 import com.diligrp.titan.sdk.domain.Attribute;
6 5 import com.diligrp.titan.sdk.domain.Product;
7 6 import com.diligrp.titan.sdk.domain.Sku;
... ...
titan-web/pom.xml
  View file @33a755c
... ... @@ -53,25 +53,11 @@
53 53 </configuration>
54 54 </plugin>
55 55 <plugin>
56   - <groupId>org.mortbay.jetty</groupId>
57   - <artifactId>maven-jetty-plugin</artifactId>
58   - <version>6.1.26</version>
59   - <configuration>
60   - <scanIntervalSeconds>3</scanIntervalSeconds>
61   - <contextPath>/</contextPath>
62   - <connectors>
63   - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
64   - <port>8080</port>
65   - </connector>
66   - </connectors>
67   - </configuration>
68   - </plugin>
69   - <plugin>
70 56 <groupId>org.apache.tomcat.maven</groupId>
71 57 <artifactId>tomcat7-maven-plugin</artifactId>
72 58 <version>2.2</version>
73 59 <configuration>
74   - <port>80</port>
  60 + <port>8080</port>
75 61 <path>/</path>
76 62 </configuration>
77 63 </plugin>
... ... @@ -103,62 +89,22 @@
103 89 </build>
104 90  
105 91 <dependencies>
106   -
107   - <dependency>
108   - <groupId>com.diligrp</groupId>
109   - <artifactId>diligrp-crm-api</artifactId>
110   - <!--更换最新的 chenzhiwei-->
111   - <version>0.0.1-SNAPSHOT</version>
112   - <exclusions>
113   - <exclusion>
114   - <groupId>org.apache.httpcomponents</groupId>
115   - <artifactId>httpcore</artifactId>
116   - </exclusion>
117   - </exclusions>
118   - </dependency>
119   - <!-- 团购 -->
120   - <dependency>
121   - <groupId>com.diligrp.group-purchase</groupId>
122   - <artifactId>gpurchase-sdk</artifactId>
123   - <version>0.0.1-SNAPSHOT</version>
124   - <exclusions>
125   - <exclusion>
126   - <groupId>*</groupId>
127   - <artifactId>titan-sdk</artifactId>
128   - </exclusion>
129   - <exclusion>
130   - <artifactId>diligrp-website-util</artifactId>
131   - <groupId>com.diligrp.website</groupId>
132   - </exclusion>
133   - </exclusions>
134   - </dependency>
135 92 <dependency>
136 93 <groupId>com.yqyw.titan</groupId>
137 94 <artifactId>titan-sdk</artifactId>
138 95 <version>0.0.2-SNAPSHOT</version>
139   - </dependency>
140   - <dependency>
141   - <groupId>com.yqyw.website.web</groupId>
142   - <artifactId>diligrp-website-api</artifactId>
143   - <version>1.0.3-SNAPSHOT</version>
144 96 <exclusions>
145 97 <exclusion>
146   - <artifactId>velocity-dep</artifactId>
147   - <groupId>velocity</groupId>
  98 + <artifactId>log4j</artifactId>
  99 + <groupId>log4j</groupId>
148 100 </exclusion>
149   - </exclusions>
150   - </dependency>
151   - <dependency>
152   - <groupId>com.diligrp.store</groupId>
153   - <artifactId>diligrp-store-sdk</artifactId>
154   - <version>0.0.1-SNAPSHOT</version>
155   - <exclusions>
156 101 <exclusion>
157   - <artifactId>httpcore</artifactId>
158   - <groupId>org.apache.httpcomponents</groupId>
  102 + <artifactId>junit</artifactId>
  103 + <groupId>junit</groupId>
159 104 </exclusion>
160 105 </exclusions>
161 106 </dependency>
  107 +
162 108 <dependency>
163 109 <groupId>com.diligrp</groupId>
164 110 <artifactId>image-server-sdk</artifactId>
... ... @@ -170,24 +116,9 @@
170 116 </exclusion>
171 117 </exclusions>
172 118 </dependency>
173   - <dependency>
174   - <groupId>com.yqyw.user</groupId>
175   - <artifactId>diligrp-user-client</artifactId>
176   - <version>0.0.5-SNAPSHOT</version>
177   - <exclusions>
178   - <exclusion>
179   - <artifactId>diligrp-website-util</artifactId>
180   - <groupId>com.diligrp.website</groupId>
181   - </exclusion>
182   - </exclusions>
183   - </dependency>
184 119  
185   - <dependency>
186   - <groupId>com.yqyw.shop</groupId>
187   - <artifactId>shop-sdk</artifactId>
188   - <version>0.0.1-SNAPSHOT</version>
189   - <!--<version>1.0.1.RELEASE</version>-->
190   - </dependency>
  120 +
  121 +
191 122 <!-- spring -->
192 123 <dependency>
193 124 <groupId>org.springframework</groupId>
... ... @@ -236,6 +167,12 @@
236 167 <groupId>org.slf4j</groupId>
237 168 <artifactId>slf4j-log4j12</artifactId>
238 169 <version>1.6.4</version>
  170 + <exclusions>
  171 + <exclusion>
  172 + <artifactId>log4j</artifactId>
  173 + <groupId>log4j</groupId>
  174 + </exclusion>
  175 + </exclusions>
239 176 </dependency>
240 177 <dependency>
241 178 <groupId>log4j</groupId>
... ... @@ -322,12 +259,24 @@
322 259 <groupId>org.hibernate</groupId>
323 260 <artifactId>hibernate-validator</artifactId>
324 261 <version>4.2.0.Final</version>
  262 + <exclusions>
  263 + <exclusion>
  264 + <artifactId>slf4j-api</artifactId>
  265 + <groupId>org.slf4j</groupId>
  266 + </exclusion>
  267 + </exclusions>
325 268 </dependency>
326 269 <!-- if you use velocity view in springmvc -->
327 270 <dependency>
328 271 <groupId>org.apache.velocity</groupId>
329 272 <artifactId>velocity</artifactId>
330 273 <version>1.7</version>
  274 + <exclusions>
  275 + <exclusion>
  276 + <artifactId>commons-lang</artifactId>
  277 + <groupId>commons-lang</groupId>
  278 + </exclusion>
  279 + </exclusions>
331 280 </dependency>
332 281 <!-- if you use velocity layout view in springmvc -->
333 282 <dependency>
... ... @@ -351,6 +300,22 @@
351 300 <groupId>sslext</groupId>
352 301 <artifactId>sslext</artifactId>
353 302 </exclusion>
  303 + <exclusion>
  304 + <artifactId>commons-logging</artifactId>
  305 + <groupId>commons-logging</groupId>
  306 + </exclusion>
  307 + <exclusion>
  308 + <artifactId>commons-collections</artifactId>
  309 + <groupId>commons-collections</groupId>
  310 + </exclusion>
  311 + <exclusion>
  312 + <artifactId>velocity</artifactId>
  313 + <groupId>org.apache.velocity</groupId>
  314 + </exclusion>
  315 + <exclusion>
  316 + <artifactId>commons-digester</artifactId>
  317 + <groupId>commons-digester</groupId>
  318 + </exclusion>
354 319 </exclusions>
355 320 </dependency>
356 321 <!-- if you enable json support in spring mvc. -->
... ... @@ -401,13 +366,13 @@
401 366 <groupId>org.springframework</groupId>
402 367 <artifactId>spring-context</artifactId>
403 368 </exclusion>
  369 + <exclusion>
  370 + <artifactId>slf4j-api</artifactId>
  371 + <groupId>org.slf4j</groupId>
  372 + </exclusion>
404 373 </exclusions>
405 374 </dependency>
406   - <dependency>
407   - <artifactId>hbase-client</artifactId>
408   - <groupId>org.apache.hbase</groupId>
409   - <version>0.96.1.1-cdh5.0.0</version>
410   - </dependency>
  375 +
411 376 <dependency>
412 377 <groupId>org.springframework</groupId>
413 378 <artifactId>spring-test</artifactId>
... ... @@ -429,13 +394,15 @@
429 394 <groupId>org.apache.httpcomponents</groupId>
430 395 <artifactId>httpclient</artifactId>
431 396 <version>4.3.3</version>
  397 + <exclusions>
  398 + <exclusion>
  399 + <artifactId>commons-logging</artifactId>
  400 + <groupId>commons-logging</groupId>
  401 + </exclusion>
  402 + </exclusions>
432 403 </dependency>
433 404  
434   - <dependency>
435   - <groupId>com.diligrp.log.util</groupId>
436   - <artifactId>diligrp-log-util</artifactId>
437   - <version>0.0.1-SNAPSHOT</version>
438   - </dependency>
  405 +
439 406 <dependency>
440 407 <groupId>edit</groupId>
441 408 <artifactId>edit</artifactId>
... ... @@ -452,11 +419,40 @@
452 419 <groupId>com.diligrp.manage</groupId>
453 420 <artifactId>diligrp-manage-sdk</artifactId>
454 421 <version>0.0.2-SNAPSHOT</version>
  422 + <exclusions>
  423 + <exclusion>
  424 + <artifactId>fastjson</artifactId>
  425 + <groupId>com.alibaba</groupId>
  426 + </exclusion>
  427 + <exclusion>
  428 + <artifactId>slf4j-log4j12</artifactId>
  429 + <groupId>org.slf4j</groupId>
  430 + </exclusion>
  431 + <exclusion>
  432 + <artifactId>log4j</artifactId>
  433 + <groupId>log4j</groupId>
  434 + </exclusion>
  435 + <exclusion>
  436 + <artifactId>slf4j-api</artifactId>
  437 + <groupId>org.slf4j</groupId>
  438 + </exclusion>
  439 + <exclusion>
  440 + <artifactId>guava</artifactId>
  441 + <groupId>com.google.guava</groupId>
  442 + </exclusion>
  443 + </exclusions>
455 444 </dependency>
  445 +
456 446 <dependency>
457   - <groupId>com.yqyw.messageCenter.sdk</groupId>
458   - <artifactId>diligrp-messageCenter-sdk</artifactId>
459   - <version>0.0.4-SNAPSHOT</version>
  447 + <groupId>com.diligrp.store</groupId>
  448 + <artifactId>diligrp-store-sdk</artifactId>
  449 + <version>0.0.1-SNAPSHOT</version>
  450 + <exclusions>
  451 + <exclusion>
  452 + <artifactId>httpcore</artifactId>
  453 + <groupId>org.apache.httpcomponents</groupId>
  454 + </exclusion>
  455 + </exclusions>
460 456 </dependency>
461 457  
462 458 </dependencies>
... ... @@ -480,31 +476,14 @@
480 476 <dili_titan.master.jdbc.url>jdbc:MySql://10.28.11.162:3306/titan?useUnicode=true&amp;characterEncoding=utf8</dili_titan.master.jdbc.url>
481 477 <dili_titan.master.jdbc.username>root</dili_titan.master.jdbc.username>
482 478 <dili_titan.master.jdbc.password>123456</dili_titan.master.jdbc.password>
483   - <!-- 从库配置-->
484   - <dili_titan.slave.jdbc.url>jdbc:MySql://10.28.11.162:3306/titan?useUnicode=true&amp;characterEncoding=utf8</dili_titan.slave.jdbc.url>
485   - <dili_titan.slave.jdbc.username>root</dili_titan.slave.jdbc.username>
486   - <dili_titan.slave.jdbc.password>123456</dili_titan.slave.jdbc.password>
487   - <!-- crm接口地址 -->
488   - <dili_titan.crm.url>supplier.1n4j.com</dili_titan.crm.url>
489   - <!-- user接口地址 -->
490   - <dili_titan.user.url>user.1n4j.com</dili_titan.user.url>
491   - <!--shop接口地址,需要测试自己修改 -->
492   - <dili_titan.shop.url>http://shop.1n4j.com</dili_titan.shop.url>
  479 +
  480 +
493 481 <!-- redis接口地址 -->
494   - <dili_titan.redis.url>10.28.10.208</dili_titan.redis.url>
  482 + <dili_titan.redis.url>10.28.11.205</dili_titan.redis.url>
495 483 <!--权限管理的redis配置-->
496   - <manage.redis.url>10.28.6.51</manage.redis.url>
  484 + <manage.redis.url>10.28.11.205</manage.redis.url>
497 485 <manage.redis.port>6379</manage.redis.port>
498   - <!-- MQ 地址-->
499   - <conf.mq.namesrvAddr>10.28.10.209:9876;10.28.10.149:9876</conf.mq.namesrvAddr>
500   - <conf.mq.producerGroup>titanPNR</conf.mq.producerGroup>
501   - <!--<dili_titan.mq.url>tcp://10.28.6.114:61616</dili_titan.mq.url>-->
502   - <!-- website接口地址 -->
503   - <dili_titan.website.url>manweb.1n4j.com</dili_titan.website.url>
504   - <!-- 日志 -->
505   - <dili_titan.log.level>INFO</dili_titan.log.level>
506   - <dili_titan.log.path>/export/logs</dili_titan.log.path>
507   - <dili_titan.log.root.appender>CONSOLE</dili_titan.log.root.appender>
  486 +
508 487 <!--打包编码 -->
509 488 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
510 489 <!-- 图片服务器 -->
... ... @@ -516,23 +495,11 @@
516 495 <conf.manage.enable>true</conf.manage.enable>
517 496 <conf.manage.spider>true</conf.manage.spider>
518 497 <conf.manage.system>titan</conf.manage.system>
519   - <conf.manage.domain>http://manage.1n4j.com/</conf.manage.domain>
  498 + <conf.manage.domain>http://manage.zandeapp.com/</conf.manage.domain>
520 499 <conf.manage.includes>^/.*</conf.manage.includes>
521 500 <conf.manage.excludes>
522 501 ^/noAccess.do$,^/welcome.do$,^/loginControl/.*,^/api/.*,^/common/.*,^/img/.*,^/css/.*,^/assets/.*,^/js/.*,.*?/exportExcel,^/moni,^/init.*,^/titan/productPop/queryProductPopData
523 502 </conf.manage.excludes>
524   - <!--上传视频-->
525   - <project.fastdfs.trackercount>2</project.fastdfs.trackercount>
526   - <project.fastdfs.connectTimeout>2000</project.fastdfs.connectTimeout>
527   - <project.fastdfs.networkTimeout>30000</project.fastdfs.networkTimeout>
528   - <project.fastdfs.charset>utf-8</project.fastdfs.charset>
529   - <project.fastdfs.trackers>10.28.6.148:22122,10.28.6.149:22122</project.fastdfs.trackers>
530   - <!-- 团购 -->
531   - <project.grouppurchase.url>http://group.1n4j.com</project.grouppurchase.url>
532   - <project.grouppurchase.token>123</project.grouppurchase.token>
533   - <!--爱奇艺视频 -->
534   - <titan.aqy.appkey>e64a09bece964bb484e5decc30c0b950</titan.aqy.appkey>
535   - <titan.aqy.appSecret>f48d2b799f9661acdb6041e4ac7c142f</titan.aqy.appSecret>
536 503 </properties>
537 504 </profile>
538 505 </profiles>
... ...
titan-web/src/main/hbase-profiles/develop/core-site.xml deleted 100644 → 0
  View file @08c8ca7
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<configuration>
3   -
4   - <property>
5   - <name>fs.defaultFS</name>
6   - <value>hdfs://mycluster</value>
7   - <final>true</final>
8   - </property>
9   -
10   - <property>
11   - <name>fs.trash.interval</name>
12   - <value>360</value>
13   - </property>
14   -
15   - <property>
16   - <name>ha.failover-controller.active-standby-elector.zk.op.retries</name>
17   - <value>120</value>
18   - </property>
19   -
20   - <property>
21   - <name>ha.zookeeper.quorum</name>
22   - <value>node2:2181,node3:2181,node4:2181</value>
23   - </property>
24   -
25   - <property>
26   - <name>hadoop.http.authentication.simple.anonymous.allowed</name>
27   - <value>true</value>
28   - </property>
29   -
30   - <property>
31   - <name>hadoop.security.auth_to_local</name>
32   - <value>DEFAULT</value>
33   - </property>
34   -
35   - <property>
36   - <name>hadoop.security.authentication</name>
37   - <value>simple</value>
38   - </property>
39   -
40   - <property>
41   - <name>hadoop.security.authorization</name>
42   - <value>false</value>
43   - </property>
44   -
45   - <property>
46   - <name>io.compression.codecs</name>
47   - <value>org.apache.hadoop.io.compress.GzipCodec,org.apache.hadoop.io.compress.DefaultCodec,org.apache.hadoop.io.compress.SnappyCodec</value>
48   - </property>
49   -
50   - <property>
51   - <name>io.file.buffer.size</name>
52   - <value>131072</value>
53   - </property>
54   -
55   - <property>
56   - <name>io.serializations</name>
57   - <value>org.apache.hadoop.io.serializer.WritableSerialization</value>
58   - </property>
59   -
60   - <property>
61   - <name>ipc.client.connect.max.retries</name>
62   - <value>50</value>
63   - </property>
64   -
65   - <property>
66   - <name>ipc.client.connection.maxidletime</name>
67   - <value>30000</value>
68   - </property>
69   -
70   - <property>
71   - <name>ipc.client.idlethreshold</name>
72   - <value>8000</value>
73   - </property>
74   -
75   - <property>
76   - <name>ipc.server.tcpnodelay</name>
77   - <value>true</value>
78   - </property>
79   -
80   - <property>
81   - <name>mapreduce.jobtracker.webinterface.trusted</name>
82   - <value>false</value>
83   - </property>
84   -
85   - <property>
86   - <name>proxyuser_group</name>
87   - <value>users</value>
88   - </property>
89   -
90   -</configuration>
titan-web/src/main/hbase-profiles/develop/hbase-site.xml deleted 100644 → 0
  View file @08c8ca7
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<configuration>
3   -
4   - <property>
5   - <name>dfs.domain.socket.path</name>
6   - <value>/var/lib/hadoop-hdfs/dn_socket</value>
7   - </property>
8   -
9   - <property>
10   - <name>hbase.client.keyvalue.maxsize</name>
11   - <value>10485760</value>
12   - </property>
13   -
14   - <property>
15   - <name>hbase.client.scanner.caching</name>
16   - <value>100</value>
17   - </property>
18   -
19   - <property>
20   - <name>hbase.cluster.distributed</name>
21   - <value>true</value>
22   - </property>
23   -
24   - <property>
25   - <name>hbase.coprocessor.master.classes</name>
26   - <value></value>
27   - </property>
28   -
29   - <property>
30   - <name>hbase.coprocessor.region.classes</name>
31   - <value></value>
32   - </property>
33   -
34   - <property>
35   - <name>hbase.defaults.for.version.skip</name>
36   - <value>true</value>
37   - </property>
38   -
39   - <property>
40   - <name>hbase.hregion.majorcompaction</name>
41   - <value>604800000</value>
42   - </property>
43   -
44   - <property>
45   - <name>hbase.hregion.majorcompaction.jitter</name>
46   - <value>0.50</value>
47   - </property>
48   -
49   - <property>
50   - <name>hbase.hregion.max.filesize</name>
51   - <value>10737418240</value>
52   - </property>
53   -
54   - <property>
55   - <name>hbase.hregion.memstore.block.multiplier</name>
56   - <value>4</value>
57   - </property>
58   -
59   - <property>
60   - <name>hbase.hregion.memstore.flush.size</name>
61   - <value>134217728</value>
62   - </property>
63   -
64   - <property>
65   - <name>hbase.hregion.memstore.mslab.enabled</name>
66   - <value>true</value>
67   - </property>
68   -
69   - <property>
70   - <name>hbase.hstore.blockingStoreFiles</name>
71   - <value>10</value>
72   - </property>
73   -
74   - <property>
75   - <name>hbase.hstore.compactionThreshold</name>
76   - <value>3</value>
77   - </property>
78   -
79   - <property>
80   - <name>hbase.local.dir</name>
81   - <value>${hbase.tmp.dir}/local</value>
82   - </property>
83   -
84   - <property>
85   - <name>hbase.master.info.bindAddress</name>
86   - <value>0.0.0.0</value>
87   - </property>
88   -
89   - <property>
90   - <name>hbase.master.info.port</name>
91   - <value>60010</value>
92   - </property>
93   -
94   - <property>
95   - <name>hbase.master.port</name>
96   - <value>60000</value>
97   - </property>
98   -
99   - <property>
100   - <name>hbase.regionserver.global.memstore.lowerLimit</name>
101   - <value>0.38</value>
102   - </property>
103   -
104   - <property>
105   - <name>hbase.regionserver.global.memstore.upperLimit</name>
106   - <value>0.4</value>
107   - </property>
108   -
109   - <property>
110   - <name>hbase.regionserver.handler.count</name>
111   - <value>60</value>
112   - </property>
113   -
114   - <property>
115   - <name>hbase.regionserver.info.port</name>
116   - <value>60030</value>
117   - </property>
118   -
119   - <property>
120   - <name>hbase.rootdir</name>
121   - <value>hdfs://mycluster/apps/hbase/data</value>
122   - </property>
123   -
124   - <property>
125   - <name>hbase.rpc.protection</name>
126   - <value>authentication</value>
127   - </property>
128   -
129   - <property>
130   - <name>hbase.security.authentication</name>
131   - <value>simple</value>
132   - </property>
133   -
134   - <property>
135   - <name>hbase.security.authorization</name>
136   - <value>false</value>
137   - </property>
138   -
139   - <property>
140   - <name>hbase.superuser</name>
141   - <value>hadoop</value>
142   - </property>
143   -
144   - <property>
145   - <name>hbase.zookeeper.property.clientPort</name>
146   - <value>2181</value>
147   - </property>
148   -
149   - <property>
150   - <name>hbase.zookeeper.quorum</name>
151   - <value>node2,node3,node4</value>
152   - </property>
153   -
154   - <property>
155   - <name>hbase.zookeeper.useMulti</name>
156   - <value>true</value>
157   - </property>
158   -
159   - <property>
160   - <name>hfile.block.cache.size</name>
161   - <value>0.40</value>
162   - </property>
163   -
164   - <property>
165   - <name>zookeeper.session.timeout</name>
166   - <value>30000</value>
167   - </property>
168   -
169   - <property>
170   - <name>zookeeper.znode.parent</name>
171   - <value>/hbase</value>
172   - </property>
173   -
174   -</configuration>
titan-web/src/main/hbase-profiles/online/core-site.xml deleted 100644 → 0
  View file @08c8ca7
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<configuration>
3   -
4   - <property>
5   - <name>fs.defaultFS</name>
6   - <value>hdfs://bigdata1</value>
7   - <final>true</final>
8   - </property>
9   -
10   - <property>
11   - <name>fs.trash.interval</name>
12   - <value>360</value>
13   - </property>
14   -
15   - <property>
16   - <name>ha.failover-controller.active-standby-elector.zk.op.retries</name>
17   - <value>120</value>
18   - </property>
19   -
20   - <property>
21   - <name>ha.zookeeper.quorum</name>
22   - <value>ddbigdata.29.115.nong12.com:2181,ddbigdata.29.116.nong12.com:2181,ddbigdata.29.117.nong12.com:2181</value>
23   - </property>
24   -
25   - <property>
26   - <name>hadoop.http.authentication.simple.anonymous.allowed</name>
27   - <value>true</value>
28   - </property>
29   -
30   - <property>
31   - <name>hadoop.security.auth_to_local</name>
32   - <value>DEFAULT</value>
33   - </property>
34   -
35   - <property>
36   - <name>hadoop.security.authentication</name>
37   - <value>simple</value>
38   - </property>
39   -
40   - <property>
41   - <name>hadoop.security.authorization</name>
42   - <value>false</value>
43   - </property>
44   -
45   - <property>
46   - <name>io.compression.codecs</name>
47   - <value>org.apache.hadoop.io.compress.GzipCodec,org.apache.hadoop.io.compress.DefaultCodec,org.apache.hadoop.io.compress.SnappyCodec</value>
48   - </property>
49   -
50   - <property>
51   - <name>io.file.buffer.size</name>
52   - <value>131072</value>
53   - </property>
54   -
55   - <property>
56   - <name>io.serializations</name>
57   - <value>org.apache.hadoop.io.serializer.WritableSerialization</value>
58   - </property>
59   -
60   - <property>
61   - <name>ipc.client.connect.max.retries</name>
62   - <value>50</value>
63   - </property>
64   -
65   - <property>
66   - <name>ipc.client.connection.maxidletime</name>
67   - <value>30000</value>
68   - </property>
69   -
70   - <property>
71   - <name>ipc.client.idlethreshold</name>
72   - <value>8000</value>
73   - </property>
74   -
75   - <property>
76   - <name>ipc.server.tcpnodelay</name>
77   - <value>true</value>
78   - </property>
79   -
80   - <property>
81   - <name>mapreduce.jobtracker.webinterface.trusted</name>
82   - <value>false</value>
83   - </property>
84   -
85   - <property>
86   - <name>proxyuser_group</name>
87   - <value>users</value>
88   - </property>
89   -
90   -</configuration>
titan-web/src/main/hbase-profiles/online/hbase-site.xml deleted 100644 → 0
  View file @08c8ca7
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<configuration>
3   -
4   - <property>
5   - <name>dfs.domain.socket.path</name>
6   - <value>/var/lib/hadoop-hdfs/dn_socket</value>
7   - </property>
8   -
9   - <property>
10   - <name>hbase.client.keyvalue.maxsize</name>
11   - <value>10485760</value>
12   - </property>
13   -
14   - <property>
15   - <name>hbase.client.scanner.caching</name>
16   - <value>100</value>
17   - </property>
18   -
19   - <property>
20   - <name>hbase.cluster.distributed</name>
21   - <value>true</value>
22   - </property>
23   -
24   - <property>
25   - <name>hbase.coprocessor.master.classes</name>
26   - <value></value>
27   - </property>
28   -
29   - <property>
30   - <name>hbase.coprocessor.region.classes</name>
31   - <value></value>
32   - </property>
33   -
34   - <property>
35   - <name>hbase.defaults.for.version.skip</name>
36   - <value>true</value>
37   - </property>
38   -
39   - <property>
40   - <name>hbase.hregion.majorcompaction</name>
41   - <value>604800000</value>
42   - </property>
43   -
44   - <property>
45   - <name>hbase.hregion.majorcompaction.jitter</name>
46   - <value>0.50</value>
47   - </property>
48   -
49   - <property>
50   - <name>hbase.hregion.max.filesize</name>
51   - <value>10737418240</value>
52   - </property>
53   -
54   - <property>
55   - <name>hbase.hregion.memstore.block.multiplier</name>
56   - <value>4</value>
57   - </property>
58   -
59   - <property>
60   - <name>hbase.hregion.memstore.flush.size</name>
61   - <value>134217728</value>
62   - </property>
63   -
64   - <property>
65   - <name>hbase.hregion.memstore.mslab.enabled</name>
66   - <value>true</value>
67   - </property>
68   -
69   - <property>
70   - <name>hbase.hstore.blockingStoreFiles</name>
71   - <value>10</value>
72   - </property>
73   -
74   - <property>
75   - <name>hbase.hstore.compactionThreshold</name>
76   - <value>3</value>
77   - </property>
78   -
79   - <property>
80   - <name>hbase.local.dir</name>
81   - <value>${hbase.tmp.dir}/local</value>
82   - </property>
83   -
84   - <property>
85   - <name>hbase.master.info.bindAddress</name>
86   - <value>0.0.0.0</value>
87   - </property>
88   -
89   - <property>
90   - <name>hbase.master.info.port</name>
91   - <value>60010</value>
92   - </property>
93   -
94   - <property>
95   - <name>hbase.master.port</name>
96   - <value>60000</value>
97   - </property>
98   -
99   - <property>
100   - <name>hbase.regionserver.global.memstore.lowerLimit</name>
101   - <value>0.38</value>
102   - </property>
103   -
104   - <property>
105   - <name>hbase.regionserver.global.memstore.upperLimit</name>
106   - <value>0.4</value>
107   - </property>
108   -
109   - <property>
110   - <name>hbase.regionserver.handler.count</name>
111   - <value>60</value>
112   - </property>
113   -
114   - <property>
115   - <name>hbase.regionserver.info.port</name>
116   - <value>60030</value>
117   - </property>
118   -
119   - <property>
120   - <name>hbase.rootdir</name>
121   - <value>hdfs://bigdata1/apps/hbase/data</value>
122   - </property>
123   -
124   - <property>
125   - <name>hbase.rpc.protection</name>
126   - <value>authentication</value>
127   - </property>
128   -
129   - <property>
130   - <name>hbase.security.authentication</name>
131   - <value>simple</value>
132   - </property>
133   -
134   - <property>
135   - <name>hbase.security.authorization</name>
136   - <value>false</value>
137   - </property>
138   -
139   - <property>
140   - <name>hbase.superuser</name>
141   - <value>hbase</value>
142   - </property>
143   -
144   - <!--<property>
145   - <name>hbase.tmp.dir</name>
146   - <value>/diliapp/data1/hadoop/hbase</value>
147   - </property>-->
148   -
149   - <property>
150   - <name>hbase.zookeeper.property.clientPort</name>
151   - <value>2181</value>
152   - </property>
153   -
154   - <property>
155   - <name>hbase.zookeeper.quorum</name>
156   - <value>ddbigdata.29.115.nong12.com:2181,ddbigdata.29.116.nong12.com:2181,ddbigdata.29.117.nong12.com:2181</value>
157   - </property>
158   -
159   - <property>
160   - <name>hbase.zookeeper.useMulti</name>
161   - <value>true</value>
162   - </property>
163   -
164   - <property>
165   - <name>hfile.block.cache.size</name>
166   - <value>0.40</value>
167   - </property>
168   -
169   - <property>
170   - <name>zookeeper.session.timeout</name>
171   - <value>30000</value>
172   - </property>
173   -
174   - <property>
175   - <name>zookeeper.znode.parent</name>
176   - <value>/hbase-unsecure</value>
177   - </property>
178   -
179   -</configuration>
titan-web/src/main/hbase-profiles/pre-online/core-site.xml deleted 100644 → 0
  View file @08c8ca7
1   -<!--Mon Nov 14 17:17:58 2016-->
2   - <configuration>
3   -
4   - <property>
5   - <name>fs.defaultFS</name>
6   - <value>hdfs://hbase1.hadoop:8020</value>
7   - <final>true</final>
8   - </property>
9   -
10   - <property>
11   - <name>fs.trash.interval</name>
12   - <value>360</value>
13   - </property>
14   -
15   - <property>
16   - <name>ha.failover-controller.active-standby-elector.zk.op.retries</name>
17   - <value>120</value>
18   - </property>
19   -
20   - <property>
21   - <name>hadoop.http.authentication.simple.anonymous.allowed</name>
22   - <value>true</value>
23   - </property>
24   -
25   - <property>
26   - <name>hadoop.security.auth_to_local</name>
27   - <value>DEFAULT</value>
28   - </property>
29   -
30   - <property>
31   - <name>hadoop.security.authentication</name>
32   - <value>simple</value>
33   - </property>
34   -
35   - <property>
36   - <name>hadoop.security.authorization</name>
37   - <value>false</value>
38   - </property>
39   -
40   - <property>
41   - <name>io.compression.codecs</name>
42   - <value>org.apache.hadoop.io.compress.GzipCodec,org.apache.hadoop.io.compress.DefaultCodec,org.apache.hadoop.io.compress.SnappyCodec</value>
43   - </property>
44   -
45   - <property>
46   - <name>io.file.buffer.size</name>
47   - <value>131072</value>
48   - </property>
49   -
50   - <property>
51   - <name>io.serializations</name>
52   - <value>org.apache.hadoop.io.serializer.WritableSerialization</value>
53   - </property>
54   -
55   - <property>
56   - <name>ipc.client.connect.max.retries</name>
57   - <value>50</value>
58   - </property>
59   -
60   - <property>
61   - <name>ipc.client.connection.maxidletime</name>
62   - <value>30000</value>
63   - </property>
64   -
65   - <property>
66   - <name>ipc.client.idlethreshold</name>
67   - <value>8000</value>
68   - </property>
69   -
70   - <property>
71   - <name>ipc.server.tcpnodelay</name>
72   - <value>true</value>
73   - </property>
74   -
75   - <property>
76   - <name>mapreduce.jobtracker.webinterface.trusted</name>
77   - <value>false</value>
78   - </property>
79   -
80   - <property>
81   - <name>proxyuser_group</name>
82   - <value>users</value>
83   - </property>
84   -
85   - </configuration>
titan-web/src/main/hbase-profiles/pre-online/hbase-site.xml deleted 100644 → 0
  View file @08c8ca7
1   -<!--Mon Nov 14 17:18:24 2016-->
2   - <configuration>
3   -
4   - <property>
5   - <name>dfs.domain.socket.path</name>
6   - <value>/var/lib/hadoop-hdfs/dn_socket</value>
7   - </property>
8   -
9   - <property>
10   - <name>hbase.client.keyvalue.maxsize</name>
11   - <value>10485760</value>
12   - </property>
13   -
14   - <property>
15   - <name>hbase.client.scanner.caching</name>
16   - <value>100</value>
17   - </property>
18   -
19   - <property>
20   - <name>hbase.cluster.distributed</name>
21   - <value>true</value>
22   - </property>
23   -
24   - <property>
25   - <name>hbase.coprocessor.master.classes</name>
26   - <value></value>
27   - </property>
28   -
29   - <property>
30   - <name>hbase.coprocessor.region.classes</name>
31   - <value></value>
32   - </property>
33   -
34   - <property>
35   - <name>hbase.defaults.for.version.skip</name>
36   - <value>true</value>
37   - </property>
38   -
39   - <property>
40   - <name>hbase.hregion.majorcompaction</name>
41   - <value>604800000</value>
42   - </property>
43   -
44   - <property>
45   - <name>hbase.hregion.majorcompaction.jitter</name>
46   - <value>0.50</value>
47   - </property>
48   -
49   - <property>
50   - <name>hbase.hregion.max.filesize</name>
51   - <value>10737418240</value>
52   - </property>
53   -
54   - <property>
55   - <name>hbase.hregion.memstore.block.multiplier</name>
56   - <value>4</value>
57   - </property>
58   -
59   - <property>
60   - <name>hbase.hregion.memstore.flush.size</name>
61   - <value>134217728</value>
62   - </property>
63   -
64   - <property>
65   - <name>hbase.hregion.memstore.mslab.enabled</name>
66   - <value>true</value>
67   - </property>
68   -
69   - <property>
70   - <name>hbase.hstore.blockingStoreFiles</name>
71   - <value>10</value>
72   - </property>
73   -
74   - <property>
75   - <name>hbase.hstore.compactionThreshold</name>
76   - <value>3</value>
77   - </property>
78   -
79   - <property>
80   - <name>hbase.local.dir</name>
81   - <value>${hbase.tmp.dir}/local</value>
82   - </property>
83   -
84   - <property>
85   - <name>hbase.master.info.bindAddress</name>
86   - <value>0.0.0.0</value>
87   - </property>
88   -
89   - <property>
90   - <name>hbase.master.info.port</name>
91   - <value>60010</value>
92   - </property>
93   -
94   - <property>
95   - <name>hbase.master.port</name>
96   - <value>60000</value>
97   - </property>
98   -
99   - <property>
100   - <name>hbase.regionserver.global.memstore.lowerLimit</name>
101   - <value>0.38</value>
102   - </property>
103   -
104   - <property>
105   - <name>hbase.regionserver.global.memstore.upperLimit</name>
106   - <value>0.4</value>
107   - </property>
108   -
109   - <property>
110   - <name>hbase.regionserver.handler.count</name>
111   - <value>60</value>
112   - </property>
113   -
114   - <property>
115   - <name>hbase.regionserver.info.port</name>
116   - <value>60030</value>
117   - </property>
118   -
119   - <property>
120   - <name>hbase.rootdir</name>
121   - <value>hdfs://hbase1.hadoop:8020/apps/hbase/data</value>
122   - </property>
123   -
124   - <property>
125   - <name>hbase.rpc.protection</name>
126   - <value>authentication</value>
127   - </property>
128   -
129   - <property>
130   - <name>hbase.security.authentication</name>
131   - <value>simple</value>
132   - </property>
133   -
134   - <property>
135   - <name>hbase.security.authorization</name>
136   - <value>false</value>
137   - </property>
138   -
139   - <property>
140   - <name>hbase.superuser</name>
141   - <value>hbase</value>
142   - </property>
143   -
144   - <property>
145   - <name>hbase.tmp.dir</name>
146   - <value>/hadoop/hbase</value>
147   - </property>
148   -
149   - <property>
150   - <name>hbase.zookeeper.property.clientPort</name>
151   - <value>2181</value>
152   - </property>
153   -
154   - <property>
155   - <name>hbase.zookeeper.quorum</name>
156   - <value>hbase2.hadoop,hbase1.hadoop,hbase3.hadoop</value>
157   - </property>
158   -
159   - <property>
160   - <name>hbase.zookeeper.useMulti</name>
161   - <value>true</value>
162   - </property>
163   -
164   - <property>
165   - <name>hfile.block.cache.size</name>
166   - <value>0.40</value>
167   - </property>
168   -
169   - <property>
170   - <name>zookeeper.session.timeout</name>
171   - <value>30000</value>
172   - </property>
173   -
174   - <property>
175   - <name>zookeeper.znode.parent</name>
176   - <value>/hbase-unsecure</value>
177   - </property>
178   -
179   - </configuration>
titan-web/src/main/hbase-profiles/test/core-site.xml deleted 100644 → 0
  View file @08c8ca7
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
3   -<!--
4   - Licensed under the Apache License, Version 2.0 (the "License");
5   - you may not use this file except in compliance with the License.
6   - You may obtain a copy of the License at
7   -
8   - http://www.apache.org/licenses/LICENSE-2.0
9   -
10   - Unless required by applicable law or agreed to in writing, software
11   - distributed under the License is distributed on an "AS IS" BASIS,
12   - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13   - See the License for the specific language governing permissions and
14   - limitations under the License. See accompanying LICENSE file.
15   --->
16   -
17   -<!-- Put site-specific property overrides in this file. -->
18   -
19   -<configuration>
20   - <property>
21   - <name>hadoop.tmp.dir</name>
22   - <value>/usr/hadoop/tmp</value>
23   - </property>
24   - <property>
25   - <name>io.file.buffer.size</name>
26   - <value>131072</value>
27   - </property>
28   - <property>
29   - <name>fs.defaultFS</name>
30   - <value>hdfs://testcluster</value>
31   - </property>
32   - <property>
33   - <name>hadoop.proxyuser.hadoop.groups</name>
34   - <value>hadoop</value>
35   - </property>
36   - <property>
37   - <name>hadoop.proxyuser.hadoop.hosts</name>
38   - <value>*</value>
39   - </property>
40   -</configuration>
titan-web/src/main/hbase-profiles/test/hbase-site.xml deleted 100644 → 0
  View file @08c8ca7
1   -<?xml version="1.0"?>
2   -<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
3   -<!--
4   -/**
5   - *
6   - * Licensed to the Apache Software Foundation (ASF) under one
7   - * or more contributor license agreements. See the NOTICE file
8   - * distributed with this work for additional information
9   - * regarding copyright ownership. The ASF licenses this file
10   - * to you under the Apache License, Version 2.0 (the
11   - * "License"); you may not use this file except in compliance
12   - * with the License. You may obtain a copy of the License at
13   - *
14   - * http://www.apache.org/licenses/LICENSE-2.0
15   - *
16   - * Unless required by applicable law or agreed to in writing, software
17   - * distributed under the License is distributed on an "AS IS" BASIS,
18   - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
19   - * See the License for the specific language governing permissions and
20   - * limitations under the License.
21   - */
22   --->
23   -<configuration>
24   - <property>
25   - <name>hbase.rootdir</name>
26   - <value>hdfs://testcluster/hbase</value>
27   - </property>
28   - <property>
29   - <name>hbase.cluster.distributed</name>
30   - <value>true</value>
31   - </property>
32   - <property>
33   - <name>hbase.zookeeper.quorum</name>
34   - <value>server13,server12,server55</value>
35   - </property>
36   -
37   - <!--HBase retry times-->
38   - <property>
39   - <name>hbase.client.retries.number</name>
40   - <value>1</value>
41   - </property>
42   -</configuration>
titan-web/src/main/java/com/dili/titan/dao/AuthDao.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.dao;
6   -
7   -import com.dili.titan.dao.base.BaseDao;
8   -import com.dili.titan.domain.Auth;
9   -
10   -import java.util.List;
11   -
12   -/**
13   - * AuthDao 接口
14   - * @author dev-center
15   - * @since 2014-10-29
16   - */
17   -public interface AuthDao extends BaseDao<Auth,Long>{
18   - /**
19   - * 根据运营范围查询当前正在生效的认证
20   - * @param scope 运营范围 1自营 2代销 4买卖对接
21   - * @return
22   - */
23   - public List<Auth> findNormalAuthByScope(Integer scope);
24   -
25   - /**
26   - * this method is 根据名称查询认证对象
27   - * @param name
28   - * @return
29   - * @createTime 2014年10月30日 上午11:46:09
30   - * @author yangweidong
31   - */
32   - public Auth selecEntrytByName(String name);
33   -
34   -}
35 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/dao/AuthScopeDao.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.dao;
6   -
7   -import com.dili.titan.dao.base.BaseDao;
8   -import com.dili.titan.domain.AuthScope;
9   -
10   -/**
11   - * AuthScopeDao 接口
12   - * @author dev-center
13   - * @since 2014-10-29
14   - */
15   -public interface AuthScopeDao extends BaseDao<AuthScope,Long>{
16   - //自定义扩展
17   -
18   - /**
19   - *
20   - * this method is 根据authId删除authScope数据
21   - * @param authId
22   - * @return
23   - * @createTime 2014年10月29日 下午8:13:21
24   - * @author yangweidong
25   - */
26   - public boolean deleteByAuthId(Long authId);
27   -
28   -}
29 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/dao/IndexCategoryDao.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.dao;
6   -
7   -
8   -import com.dili.titan.dao.base.BaseDao;
9   -import com.dili.titan.domain.IndexCategory;
10   -
11   -/**
12   - * IndexCategoryDao 接口
13   - * @author dev-center
14   - * @since 2014-12-22
15   - */
16   -public interface IndexCategoryDao extends BaseDao<IndexCategory,Long> {
17   - //自定义扩展
18   -
19   -}
20 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/dao/ProductAuthDao.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.dao;
6   -
7   -import com.dili.titan.dao.base.BaseDao;
8   -import com.dili.titan.domain.ProductAuth;
9   -
10   -import java.util.List;
11   -
12   -/**
13   - * ProductAuthDao 接口
14   - * @author dev-center
15   - * @since 2014-10-29
16   - */
17   -public interface ProductAuthDao extends BaseDao<ProductAuth,Long>{
18   - //自定义扩展
19   - public int batchInsert(List<ProductAuth> authList);
20   -
21   - /**
22   - * 查找出状态不是删除的商品认证 （包含不可用的认证）
23   - * @param pid
24   - * @return
25   - */
26   - public List<ProductAuth> findByPid(Long pid);
27   -
28   - /**
29   - * 根据PID跟新状态
30   - * @param pid
31   - * @param status
32   - */
33   - public int updateByPid(Long pid,Integer status);
34   -}
35 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/dao/ProductOfflineAttrValueDao.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.dao;
6   -
7   -import com.dili.titan.dao.base.BaseDao;
8   -import com.dili.titan.domain.ProductOfflineAttrValue;
9   -
10   -/**
11   - * ProductOfflineAttrValueDao 接口
12   - * @author dev-center
13   - * @since 2014-11-14
14   - */
15   -public interface ProductOfflineAttrValueDao extends BaseDao<ProductOfflineAttrValue,Long>{
16   - //自定义扩展
17   -
18   -}
19 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/dao/ProductOfflineDao.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.dao;
6   -
7   -import com.dili.titan.dao.base.BaseDao;
8   -import com.dili.titan.domain.ProductOffline;
9   -
10   -/**
11   - * ProductOfflineDao 接口
12   - * @author dev-center
13   - * @since 2014-11-14
14   - */
15   -public interface ProductOfflineDao extends BaseDao<ProductOffline,Long>{
16   - //自定义扩展
17   -
18   -}
19 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/dao/ProductPopAuditDao.java deleted 100644 → 0
  View file @08c8ca7
1   -package com.dili.titan.dao;
2   -
3   -import com.dili.titan.dao.base.BaseDao;
4   -import com.dili.titan.domain.ProductPopAudit;
5   -
6   -import java.util.List;
7   -import java.util.Map;
8   -
9   -/**
10   - *
11   - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
12   - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
13   - * <B>Company</B> 地利集团
14   - * @createTime 2014年6月9日 下午6:50:14
15   - * @author celine
16   - */
17   -public interface ProductPopAuditDao extends BaseDao<ProductPopAudit, Long> {
18   -
19   - /**
20   - * 根据pid查询商品审核历史
21   - * @param pid
22   - * @return
23   - * @createTime 2014年6月10日 上午11:06:23
24   - * @author celine
25   - */
26   - public List<ProductPopAudit> selectAuditHistory(Long pid);
27   -
28   - /**
29   - * 查询商品的最新审核历史
30   - * @param pids
31   - * @return
32   - * @createTime 2014年6月17日 上午10:07:38
33   - * @author celine
34   - */
35   - public Map<Long, ProductPopAudit> selectLatestAuditHistory(List<Long> pids);
36   -
37   - /**
38   - * this method is 批量下架
39   - * @param pids
40   - * @param productPopAudit
41   - * @return
42   - * @createTime 2015年6月10日 下午4:03:04
43   - * @author yangwd
44   - */
45   - public int batchInsert(List<Long> pids,ProductPopAudit productPopAudit);
46   -
47   -}
titan-web/src/main/java/com/dili/titan/dao/ProductPopPriceRangeDao.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.dao;
6   -
7   -
8   -import com.dili.titan.dao.base.BaseDao;
9   -import com.dili.titan.domain.ProductPopPriceRange;
10   -
11   -/**
12   - * ProductPopPriceRangeDao 接口
13   - * @author dev-center
14   - * @since 2014-08-27
15   - */
16   -public interface ProductPopPriceRangeDao extends BaseDao<ProductPopPriceRange,Long> {
17   - //自定义扩展
18   -
19   -}
20 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/dao/ProductVideoDao.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.dao;
6   -
7   -import com.dili.titan.dao.base.BaseDao;
8   -import com.dili.titan.domain.ProductVideo;
9   -
10   -import java.util.List;
11   -
12   -/**
13   - * 产品视频接口
14   - * @author dev-center
15   - * @since 2014-10-29
16   - */
17   -public interface ProductVideoDao extends BaseDao<ProductVideo,Long>{
18   - //自定义扩展
19   -
20   - /**
21   - * 根据PID跟新状态
22   - *
23   - * @param pid
24   - * @param status
25   - */
26   - public int updateByPid(Long pid, Integer status);
27   -
28   - /**
29   - * this method is 根据条件查找数据
30   - * @param query
31   - * @return
32   - * @createTime 2015年1月4日 下午2:28:01
33   - * @author yangwd
34   - */
35   - public List<ProductVideo> listProductVideoByVideoId(ProductVideo query);
36   -
37   - public Integer countProductVideoByVideoId(ProductVideo query);
38   -}
39 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/dao/VideoDao.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.dao;
6   -
7   -import com.dili.titan.dao.base.BaseDao;
8   -import com.dili.titan.domain.Video;
9   -
10   -import java.util.List;
11   -
12   -/**
13   - * VideoDao 接口
14   - * @author dev-center
15   - * @since 2014-12-26
16   - */
17   -public interface VideoDao extends BaseDao<Video,Long>{
18   - //自定义扩展
19   -
20   - /**
21   - * this method is 根据商品ID获取视频列表
22   - * @param pid
23   - * @return
24   - * @createTime 2015年1月6日 下午5:47:12
25   - * @author yangwd
26   - */
27   - public List<Video> selectVideoByPid(Long pid);
28   -
29   - List<Video> searchEntryList(Video video);
30   -
31   - int searchEntryListCount(Video video);
32   -
33   - List<Long> findPidsByVideoId(Long videoId);
34   -}
35 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/dao/base/HbaseOperationImpl.java deleted 100644 → 0
  View file @08c8ca7
1   -package com.dili.titan.dao.base;
2   -
3   -import org.apache.commons.collections.MapUtils;
4   -import org.apache.hadoop.conf.Configuration;
5   -import org.apache.hadoop.hbase.client.*;
6   -import org.apache.hadoop.hbase.util.Bytes;
7   -
8   -import java.io.IOException;
9   -import java.util.*;
10   -import java.util.Map.Entry;
11   -
12   -public abstract class HbaseOperationImpl implements HbaseOpaeration{
13   - public HbaseOperationImpl () {
14   - conf.addResource("core-site.xml");
15   - conf.addResource("hbase-site.xml");
16   - }
17   -
18   - private Configuration conf = new Configuration();;
19   -
20   - @Override
21   - public abstract String getTableName();
22   -
23   - /**
24   - * 获取列族
25   - * @author xiaoyang@diligrp.com 2014年6月17日
26   - *
27   - * @return
28   - */
29   - public abstract String getFamily();
30   -
31   - public abstract String getQualifier();
32   -
33   - @Override
34   - public void put(byte[] key, byte[] value) throws IOException {
35   - HConnection conn = null;
36   - HTableInterface table = null;
37   - try {
38   - conn = HConnectionManager.createConnection(conf);
39   - table = conn.getTable(getTableName());
40   - Put put = new Put(key);
41   - put.add(Bytes.toBytes(getFamily()), Bytes.toBytes(getQualifier()), value);
42   - table.put(put);
43   - table.flushCommits();
44   - } catch (Exception e) {
45   - throw new IOException(e);
46   - } finally {
47   - try {
48   - if(table != null){
49   - table.close();
50   - }
51   - } catch (Exception e) {}
52   - try {
53   - if(conn !=null && !conn.isClosed()){
54   - conn.close();
55   - }
56   - } catch (Exception e) {
57   - throw new IOException(e);
58   - }
59   - }
60   - }
61   -
62   - @Override
63   - public void put(String key, String value) throws IOException {
64   - put(Bytes.toBytes(key), Bytes.toBytes(value));
65   - }
66   -
67   - @Override
68   - public void batchPut(Map<String, String> items) throws IOException{
69   - if(MapUtils.isEmpty(items)){
70   - return;
71   - }
72   - HConnection conn = null;
73   - HTableInterface table = null;
74   - List<Put> puts = new ArrayList<Put>();
75   - try {
76   - conn = HConnectionManager.createConnection(conf);
77   - table = conn.getTable(getTableName());
78   - Set<Entry<String, String>> entrys = items.entrySet();
79   - for(Entry<String, String> entry : entrys){
80   - Put put = new Put(Bytes.toBytes(entry.getKey()));
81   - put.add(Bytes.toBytes(getFamily()), Bytes.toBytes(getQualifier()), Bytes.toBytes(entry.getValue()));
82   - puts.add(put);
83   - }
84   - table.put(puts);
85   - table.flushCommits();
86   - } catch (Exception e) {
87   - throw new IOException(e);
88   - } finally {
89   - try {
90   - if(table != null){
91   - table.close();
92   - }
93   - } catch (Exception e) {
94   - }
95   - try {
96   - if(conn !=null && !conn.isClosed()){
97   - conn.close();
98   - }
99   - } catch (Exception e) {
100   - throw new IOException(e);
101   - }
102   - }
103   - }
104   -
105   - @Override
106   - public String get(String key) throws IOException {
107   - return get(Bytes.toBytes(key));
108   - }
109   -
110   - @Override
111   - public String get(byte[] key) throws IOException {
112   -
113   - HConnection conn = null;
114   - HTableInterface table = null;
115   - String value = null;
116   - try {
117   - conn = HConnectionManager.createConnection(conf);
118   - table = conn.getTable(getTableName());
119   - Get get = new Get(key);
120   - Result result = table.get(get);
121   - byte[] temp = result.getValue(Bytes.toBytes(getFamily()), Bytes.toBytes(getQualifier()));
122   - if(temp != null && temp.length > 0){
123   - value = new String(temp , "utf-8");
124   - }
125   - } catch (Exception e) {
126   - throw new IOException(e);
127   - } finally {
128   - try {
129   - if(table != null){
130   - table.close();
131   - }
132   - } catch (Exception e) {
133   - }
134   - try {
135   - if(conn !=null && !conn.isClosed()){
136   - conn.close();
137   - }
138   - } catch (Exception e) {
139   - throw new IOException(e);
140   - }
141   - }
142   - return value;
143   -
144   - }
145   -
146   - @Override
147   - public Map<String, String> batchGet(List<String> keys) {
148   - throw new RuntimeException("尚未实现");
149   - }
150   -
151   - @Override
152   - public Map<String, String> getItems(String startKey, String endKey) throws IOException {
153   - HConnection conn = null;
154   - HTableInterface table = null;
155   - ResultScanner results = null;
156   - Map<String, String> returnVal = new HashMap<String, String>();
157   - try {
158   - conn = HConnectionManager.createConnection(conf);
159   - table = conn.getTable(getTableName());
160   -
161   - Scan scan = new Scan(Bytes.toBytes(startKey), Bytes.toBytes(endKey));
162   - results = table.getScanner(scan);
163   -
164   - Iterator<Result> iterator = results.iterator();
165   - while(iterator.hasNext()){
166   - Result result = iterator.next();
167   - byte[] tempValByte = result.getValue(Bytes.toBytes(getFamily()), Bytes.toBytes(getQualifier()));
168   - String tempVal = null;
169   - if(tempValByte != null && tempValByte.length > 0){
170   - tempVal = new String(tempValByte, "utf-8");
171   - }
172   - returnVal.put(new String(result.getRow() ,"utf-8"), tempVal);
173   - }
174   - } catch (Exception e) {
175   - throw new IOException(e);
176   - } finally {
177   - try {
178   - if(results != null){
179   - results.close();
180   - }
181   - } catch (Exception e2) {
182   - }
183   - try {
184   - if(table != null){
185   - table.close();
186   - }
187   - } catch (Exception e) {}
188   - try {
189   - if(conn !=null && !conn.isClosed()){
190   - conn.close();
191   - }
192   - } catch (Exception e) {
193   - throw new IOException(e);
194   - }
195   - }
196   - return returnVal;
197   - }
198   -
199   -}
titan-web/src/main/java/com/dili/titan/dao/gq/PresaleDao.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2015 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.dao.gq;
6   -
7   -import com.dili.titan.dao.base.BaseDao;
8   -import com.dili.titan.gq.domain.Presale;
9   -
10   -/**
11   - * PresaleDao 接口
12   - * @author dev-center
13   - * @since 2015-07-24
14   - */
15   -public interface PresaleDao extends BaseDao<Presale,Long> {
16   - //自定义扩展
17   -
18   -}
19 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/dao/gq/PurchaseDao.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.dao.gq;
6   -
7   -
8   -import com.dili.titan.dao.base.BaseDao;
9   -import com.dili.titan.gq.domain.Purchase;
10   -
11   -/**
12   - * PurchaseDao 接口
13   - * @author dev-center
14   - * @since 2014-12-16
15   - */
16   -public interface PurchaseDao extends BaseDao<Purchase,Long> {
17   -}
18 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/dao/gq/SupplyDao.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.dao.gq;
6   -
7   -
8   -import com.dili.titan.dao.base.BaseDao;
9   -import com.dili.titan.gq.domain.Supply;
10   -
11   -/**
12   - * SupplyDao 接口
13   - * @author dev-center
14   - * @since 2014-12-16
15   - */
16   -public interface SupplyDao extends BaseDao<Supply,Long> {
17   -}
18 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/dao/gq/impl/PresaleDaoImpl.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2015 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.dao.gq.impl;
6   -
7   -
8   -import com.dili.titan.dao.base.BaseDaoImpl;
9   -import com.dili.titan.dao.gq.PresaleDao;
10   -import com.dili.titan.gq.domain.Presale;
11   -import org.springframework.stereotype.Repository;
12   -
13   -/**
14   - * PresaleDao 实现类
15   - * @author dev-center
16   - * @since 2015-07-24
17   - */
18   -@Repository("presaleDao")
19   -public class PresaleDaoImpl extends BaseDaoImpl<Presale,Long> implements PresaleDao {
20   - private final static String NAMESPACE = "com.dili.titan.dao.PresaleDao.";
21   -
22   - //返回本DAO命名空间,并添加statement
23   - public String getNameSpace(String statement) {
24   - return NAMESPACE + statement;
25   - }
26   -
27   -}
28 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/dao/gq/impl/PurchaseDaoImpl.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.dao.gq.impl;
6   -
7   -import com.dili.titan.dao.base.BaseDaoImpl;
8   -import com.dili.titan.dao.gq.PurchaseDao;
9   -import com.dili.titan.gq.domain.Purchase;
10   -import org.springframework.stereotype.Repository;
11   -
12   -
13   -/**
14   - * PurchaseDao 实现类
15   - * @author dev-center
16   - * @since 2014-12-16
17   - */
18   -@Repository("purchaseDao")
19   -public class PurchaseDaoImpl extends BaseDaoImpl<Purchase,Long> implements PurchaseDao {
20   - private final static String NAMESPACE = "com.dili.titan.dao.PurchaseDao.";
21   -
22   - //返回本DAO命名空间,并添加statement
23   - public String getNameSpace(String statement) {
24   - return NAMESPACE + statement;
25   - }
26   -
27   -}
titan-web/src/main/java/com/dili/titan/dao/gq/impl/SupplyDaoImpl.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.dao.gq.impl;
6   -
7   -import com.dili.titan.dao.base.BaseDaoImpl;
8   -import com.dili.titan.dao.gq.SupplyDao;
9   -import com.dili.titan.gq.domain.Supply;
10   -import org.springframework.stereotype.Repository;
11   -
12   -
13   -/**
14   - * SupplyDao 实现类
15   - * @author dev-center
16   - * @since 2014-12-16
17   - */
18   -@Repository("supplyDao")
19   -public class SupplyDaoImpl extends BaseDaoImpl<Supply,Long> implements SupplyDao {
20   - private final static String NAMESPACE = "com.dili.titan.dao.SupplyDao.";
21   -
22   - //返回本DAO命名空间,并添加statement
23   - public String getNameSpace(String statement) {
24   - return NAMESPACE + statement;
25   - }
26   -}
titan-web/src/main/java/com/dili/titan/dao/impl/AttributeDaoImpl.java
  View file @33a755c
... ... @@ -21,7 +21,7 @@ import java.util.List;
21 21 @Repository("attributeDao")
22 22 public class AttributeDaoImpl extends BaseDaoImpl<Attribute, Long> implements AttributeDao {
23 23  
24   - private final static String NAMESPACE = "com.dili.titan.dao.AttributeDao.";
  24 + private final static String NAMESPACE = "AttributeDao.";
25 25  
26 26 // 返回本DAO命名空间,并添加statement
27 27 public String getNameSpace(String statement) {
... ...
titan-web/src/main/java/com/dili/titan/dao/impl/AuthDaoImpl.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.dao.impl;
6   -
7   -import com.dili.titan.dao.AuthDao;
8   -import com.dili.titan.dao.base.BaseDaoImpl;
9   -import com.dili.titan.domain.Auth;
10   -import org.springframework.stereotype.Repository;
11   -
12   -import java.util.List;
13   -
14   -/**
15   - * AuthDao 实现类
16   - * @author dev-center
17   - * @since 2014-10-29
18   - */
19   -@Repository("authDao")
20   -public class AuthDaoImpl extends BaseDaoImpl<Auth,Long> implements AuthDao {
21   - private final static String NAMESPACE = "com.diligrp.titan.dao.AuthDao.";
22   -
23   - //返回本DAO命名空间,并添加statement
24   - public String getNameSpace(String statement) {
25   - return NAMESPACE + statement;
26   - }
27   -
28   - @Override
29   - public Auth selecEntrytByName(String name) {
30   - return this.getSqlTemplate(false, false).selectOne(this.getNameSpace("selecEntrytByName"), name);
31   - }
32   -
33   - @Override
34   - public List<Auth> findNormalAuthByScope(Integer scope) {
35   - return this.selectList(getNameSpace("findNormalAuthByScope"),scope);
36   - }
37   -}
38 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/dao/impl/AuthScopeDaoImpl.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.dao.impl;
6   -
7   -import com.dili.titan.dao.AuthScopeDao;
8   -import com.dili.titan.dao.base.BaseDaoImpl;
9   -import com.dili.titan.domain.AuthScope;
10   -import org.springframework.stereotype.Repository;
11   -
12   -/**
13   - * AuthScopeDao 实现类
14   - * @author dev-center
15   - * @since 2014-10-29
16   - */
17   -@Repository("authScopeDao")
18   -public class AuthScopeDaoImpl extends BaseDaoImpl<AuthScope,Long> implements AuthScopeDao {
19   - private final static String NAMESPACE = "com.diligrp.titan.dao.AuthScopeDao.";
20   -
21   - //返回本DAO命名空间,并添加statement
22   - public String getNameSpace(String statement) {
23   - return NAMESPACE + statement;
24   - }
25   -
26   - @Override
27   - public boolean deleteByAuthId(Long authId) {
28   - return this.getSqlTemplate(false, false).delete(this.getNameSpace("deleteByAuthId"), authId)>0 ? true : false;
29   - }
30   -
31   -}
32 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/dao/impl/IndexCategoryDaoImpl.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.dao.impl;
6   -
7   -import com.dili.titan.dao.IndexCategoryDao;
8   -import com.dili.titan.dao.base.BaseDaoImpl;
9   -import com.dili.titan.domain.IndexCategory;
10   -import org.springframework.stereotype.Repository;
11   -
12   -
13   -/**
14   - * IndexCategoryDao 实现类
15   - * @author dev-center
16   - * @since 2014-12-22
17   - */
18   -@Repository("indexCategoryDao")
19   -public class IndexCategoryDaoImpl extends BaseDaoImpl<IndexCategory,Long> implements IndexCategoryDao {
20   - private final static String NAMESPACE = "com.diligrp.dili.dao.IndexCategoryDao.";
21   -
22   - //返回本DAO命名空间,并添加statement
23   - public String getNameSpace(String statement) {
24   - return NAMESPACE + statement;
25   - }
26   -
27   -}
28 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/dao/impl/ProductAuthDaoImpl.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.dao.impl;
6   -
7   -import com.dili.titan.dao.ProductAuthDao;
8   -import com.dili.titan.dao.base.BaseDaoImpl;
9   -import com.dili.titan.domain.ProductAuth;
10   -import org.springframework.stereotype.Repository;
11   -
12   -import java.util.List;
13   -
14   -/**
15   - * ProductAuthDao 实现类
16   - * @author dev-center
17   - * @since 2014-10-29
18   - */
19   -@Repository("productAuthDao")
20   -public class ProductAuthDaoImpl extends BaseDaoImpl<ProductAuth,Long> implements ProductAuthDao {
21   - private final static String NAMESPACE = "com.diligrp.titan.dao.ProductAuthDao.";
22   -
23   - //返回本DAO命名空间,并添加statement
24   - public String getNameSpace(String statement) {
25   - return NAMESPACE + statement;
26   - }
27   -
28   - @Override
29   - public int batchInsert(List<ProductAuth> authList) {
30   - return this.insert(getNameSpace("batchInsert"), authList);
31   - }
32   -
33   - @Override
34   - public List<ProductAuth> findByPid(Long pid) {
35   - return this.selectList(getNameSpace("findByPid"),pid);
36   - }
37   -
38   - @Override
39   - public int updateByPid(Long pid, Integer status) {
40   - ProductAuth update = new ProductAuth();
41   - update.setPid(pid);
42   - update.setStatus(status);
43   - return this.update(getNameSpace("updateByPid"), update);
44   - }
45   -}
46 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/dao/impl/ProductDescDaoImpl.java
  View file @33a755c
1 1 package com.dili.titan.dao.impl;
2 2  
3 3 import com.dili.titan.dao.ProductDescDao;
4   -import com.dili.titan.dao.base.HbaseOperationImpl;
5   -import org.apache.hadoop.hbase.util.Bytes;
  4 +import org.springframework.stereotype.Component;
6 5  
7 6 import java.io.IOException;
8 7  
... ... @@ -13,7 +12,8 @@ import java.io.IOException;
13 12 * 2014年6月17日
14 13 *
15 14 */
16   -public class ProductDescDaoImpl extends HbaseOperationImpl implements ProductDescDao{
  15 +@Component
  16 +public class ProductDescDaoImpl implements ProductDescDao{
17 17  
18 18 /**
19 19 * 表名
... ... @@ -35,17 +35,13 @@ public class ProductDescDaoImpl extends HbaseOperationImpl implements ProductDes
35 35 */
36 36 private String suffix;
37 37  
38   - @Override
39 38 public String getTableName() {
40 39 return this.tableName;
41 40 }
42 41  
43   - @Override
44 42 public String getFamily() {
45 43 return this.family;
46 44 }
47   -
48   - @Override
49 45 public String getQualifier() {
50 46 return this.qualifier;
51 47 }
... ... @@ -55,9 +51,7 @@ public class ProductDescDaoImpl extends HbaseOperationImpl implements ProductDes
55 51 */
56 52 @Override
57 53 public String getProductDesc(Long pid) throws IOException {
58   - byte[] rowKey = Bytes.add(Bytes.toBytes(Long.reverse(pid)), Bytes.toBytes(suffix));
59   - String result = this.get(rowKey);
60   - return result == null ? "" : result;
  54 + return "";
61 55 }
62 56  
63 57 /**
... ... @@ -65,8 +59,7 @@ public class ProductDescDaoImpl extends HbaseOperationImpl implements ProductDes
65 59 */
66 60 @Override
67 61 public void putProductDesc(Long pid, String desc) throws IOException {
68   - byte[] rowKey = Bytes.add(Bytes.toBytes(Long.reverse(pid)), Bytes.toBytes(suffix));
69   - put(rowKey, Bytes.toBytes(desc));
  62 +
70 63 }
71 64  
72 65 public void setTableName(String tableName) {
... ...
titan-web/src/main/java/com/dili/titan/dao/impl/ProductImgDaoImpl.java
  View file @33a755c
... ... @@ -18,7 +18,7 @@ import java.util.List;
18 18 */
19 19 @Repository("productImgDao")
20 20 public class ProductImgDaoImpl extends BaseDaoImpl<ProductImg,Long> implements ProductImgDao {
21   - private final static String NAMESPACE = "com.dili.titan.dao.ProductImgDao.";
  21 + private final static String NAMESPACE = "ProductImgDao.";
22 22 private static final String DEFAULT_BATCHINSERT = "batchInsert";
23 23 private static final String DEFAULT_SELECT_PID = "selectByPid";
24 24 private static final String DEFAULT_DELETE_ID = "deleteById";
... ...
titan-web/src/main/java/com/dili/titan/dao/impl/ProductOfflineAttrValueDaoImpl.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.dao.impl;
6   -
7   -import com.dili.titan.dao.ProductOfflineAttrValueDao;
8   -import com.dili.titan.dao.base.BaseDaoImpl;
9   -import com.dili.titan.domain.ProductOfflineAttrValue;
10   -import org.springframework.stereotype.Repository;
11   -
12   -/**
13   - * ProductOfflineAttrValueDao 实现类
14   - * @author dev-center
15   - * @since 2014-11-14
16   - */
17   -@Repository("productOfflineAttrValueDao")
18   -public class ProductOfflineAttrValueDaoImpl extends BaseDaoImpl<ProductOfflineAttrValue,Long> implements ProductOfflineAttrValueDao {
19   - private final static String NAMESPACE = "com.dili.titan.dao.ProductOfflineAttrValueDao.";
20   -
21   - //返回本DAO命名空间,并添加statement
22   - public String getNameSpace(String statement) {
23   - return NAMESPACE + statement;
24   - }
25   -
26   -}
27 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/dao/impl/ProductOfflineDaoImpl.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.dao.impl;
6   -
7   -import com.dili.titan.dao.ProductOfflineDao;
8   -import com.dili.titan.dao.base.BaseDaoImpl;
9   -import com.dili.titan.domain.ProductOffline;
10   -import org.springframework.stereotype.Repository;
11   -
12   -/**
13   - * ProductOfflineDao 实现类
14   - * @author dev-center
15   - * @since 2014-11-14
16   - */
17   -@Repository("productOfflineDao")
18   -public class ProductOfflineDaoImpl extends BaseDaoImpl<ProductOffline,Long> implements ProductOfflineDao {
19   - private final static String NAMESPACE = "com.dili.titan.dao.ProductOfflineDao.";
20   -
21   - //返回本DAO命名空间,并添加statement
22   - public String getNameSpace(String statement) {
23   - return NAMESPACE + statement;
24   - }
25   -
26   -}
27 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/dao/impl/ProductPopAuditDaoImpl.java deleted 100644 → 0
  View file @08c8ca7
1   -package com.dili.titan.dao.impl;
2   -
3   -import com.dili.titan.dao.ProductPopAuditDao;
4   -import com.dili.titan.dao.base.BaseDaoImpl;
5   -import com.dili.titan.domain.ProductPopAudit;
6   -import org.springframework.stereotype.Component;
7   -
8   -import java.util.HashMap;
9   -import java.util.List;
10   -import java.util.Map;
11   -
12   -@Component
13   -public class ProductPopAuditDaoImpl extends BaseDaoImpl<ProductPopAudit, Long> implements ProductPopAuditDao {
14   -
15   - private final static String NAMESPACE = "com.dili.titan.dao.ProductPopAuditDao.";
16   -
17   - // 返回本DAO命名空间,并添加statement
18   - public String getNameSpace(String statement) {
19   - return NAMESPACE + statement;
20   - }
21   -
22   - @Override
23   - public List<ProductPopAudit> selectAuditHistory(Long pid) {
24   - return this.selectList(getNameSpace("selectAuditHistory"), pid);
25   - }
26   -
27   - @Override
28   - public Map<Long, ProductPopAudit> selectLatestAuditHistory(List<Long> pids) {
29   - return this.<Long, ProductPopAudit> selectMap(getNameSpace("selectLatestAuditHistory"), pids, "pid");
30   - }
31   -
32   - @Override
33   - public int batchInsert(List<Long> pids, ProductPopAudit productPopAudit) {
34   - Map<String,Object> map = new HashMap<String,Object>();
35   - map.put("list", pids);
36   - map.put("productPopAudit", productPopAudit);
37   - return this.insert(getNameSpace("batchInsert"), map);
38   - }
39   -}
titan-web/src/main/java/com/dili/titan/dao/impl/ProductPopPriceRangeDaoImpl.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.dao.impl;
6   -
7   -import com.dili.titan.dao.ProductPopPriceRangeDao;
8   -import com.dili.titan.dao.base.BaseDaoImpl;
9   -import com.dili.titan.domain.ProductPopPriceRange;
10   -import org.springframework.stereotype.Repository;
11   -
12   -/**
13   - * ProductPopPriceRangeDao 实现类
14   - * @author dev-center
15   - * @since 2014-08-27
16   - */
17   -@Repository("productPopPriceRangeDao")
18   -public class ProductPopPriceRangeDaoImpl extends BaseDaoImpl<ProductPopPriceRange,Long> implements ProductPopPriceRangeDao {
19   - private final static String NAMESPACE = "com.dili.titan.dao.ProductPopPriceRangeDao.";
20   -
21   - //返回本DAO命名空间,并添加statement
22   - public String getNameSpace(String statement) {
23   - return NAMESPACE + statement;
24   - }
25   -
26   -}
27 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/dao/impl/ProductVideoDaoImpl.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.dao.impl;
6   -
7   -import com.dili.titan.dao.ProductVideoDao;
8   -import com.dili.titan.dao.base.BaseDaoImpl;
9   -import com.dili.titan.domain.ProductVideo;
10   -import org.springframework.stereotype.Repository;
11   -
12   -import java.util.List;
13   -
14   -/**
15   - * ProductVideoDao 实现类
16   - * @author dev-center
17   - * @since 2014-10-29
18   - */
19   -@Repository("productVideoDao")
20   -public class ProductVideoDaoImpl extends BaseDaoImpl<ProductVideo,Long> implements ProductVideoDao {
21   - private final static String NAMESPACE = "com.diligrp.titan.dao.ProductVideoDao.";
22   -
23   - //返回本DAO命名空间,并添加statement
24   - public String getNameSpace(String statement) {
25   - return NAMESPACE + statement;
26   - }
27   -
28   - @Override
29   - public int updateByPid(Long pid, Integer status) {
30   - ProductVideo update = new ProductVideo();
31   - update.setPid(pid);
32   - update.setStatus(status);
33   - return this.update(getNameSpace("updateByPid"),update);
34   - }
35   -
36   - @Override
37   - public List<ProductVideo> listProductVideoByVideoId(ProductVideo query) {
38   - return this.selectList(getNameSpace("listProductVideoByVideoId"), query);
39   - }
40   -
41   - @Override
42   - public Integer countProductVideoByVideoId(ProductVideo query) {
43   - return this.select(getNameSpace("countProductVideoByVideoId"), query);
44   - }
45   -}
46 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/dao/impl/TempleteDescDaoImpl.java
  View file @33a755c
1 1 package com.dili.titan.dao.impl;
2 2  
3 3 import com.dili.titan.dao.TempleteDescDao;
4   -import com.dili.titan.dao.base.HbaseOperationImpl;
5   -import org.apache.hadoop.hbase.util.Bytes;
6 4  
7 5 import java.io.IOException;
8 6  
... ... @@ -16,7 +14,7 @@ import java.io.IOException;
16 14 *
17 15 * @author gongsz
18 16 */
19   -public class TempleteDescDaoImpl extends HbaseOperationImpl implements
  17 +public class TempleteDescDaoImpl implements
20 18 TempleteDescDao {
21 19  
22 20 /**
... ... @@ -41,17 +39,12 @@ public class TempleteDescDaoImpl extends HbaseOperationImpl implements
41 39  
42 40 @Override
43 41 public String getTempleteDesc(Long tempId) throws IOException {
44   - byte[] rowKey = Bytes
45   - .add(Bytes.toBytes(Long.reverse(tempId)), Bytes.toBytes(suffix));
46   - String result = this.get(rowKey);
47   - return result == null ? "" : result;
  42 + return "";
48 43 }
49 44  
50 45 @Override
51 46 public void putTempleteDesc(Long tempId, String desc)
52 47 throws IOException {
53   - byte[] rowKey = Bytes.add(Bytes.toBytes(Long.reverse(tempId)), Bytes.toBytes(suffix));
54   - put(rowKey, Bytes.toBytes(desc));
55 48 }
56 49  
57 50 public String getTableName() {
... ...
titan-web/src/main/java/com/dili/titan/dao/impl/VideoDaoImpl.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.dao.impl;
6   -
7   -import com.dili.titan.dao.VideoDao;
8   -import com.dili.titan.dao.base.BaseDaoImpl;
9   -import com.dili.titan.domain.Video;
10   -import org.springframework.stereotype.Repository;
11   -
12   -import java.util.List;
13   -
14   -/**
15   - * VideoDao 实现类
16   - * @author dev-center
17   - * @since 2014-12-26
18   - */
19   -@Repository("videoDao")
20   -public class VideoDaoImpl extends BaseDaoImpl<Video,Long> implements VideoDao {
21   - private final static String NAMESPACE = "com.dili.titan.dao.VideoDao.";
22   -
23   - //返回本DAO命名空间,并添加statement
24   - public String getNameSpace(String statement) {
25   - return NAMESPACE + statement;
26   - }
27   -
28   - @Override
29   - public List<Video> selectVideoByPid(Long pid) {
30   - return this.selectList("selectVideoByPid", pid);
31   - }
32   -
33   - @Override
34   - public List<Video> searchEntryList(Video video) {
35   - return this.selectList(getNameSpace("searchEntryList"), video);
36   - }
37   -
38   - @Override
39   - public int searchEntryListCount(Video video) {
40   - return this.select(getNameSpace("searchEntryListCount"), video);
41   - }
42   -
43   - public List<Long> findPidsByVideoId(Long videoId) {
44   - return this.selectList(this.getNameSpace("findPidsByVideoId"), videoId);
45   - }
46   -}
47 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/domain/Auth.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.domain;
6   -
7   -import com.dili.titan.domain.base.BaseDomain;
8   -
9   -import java.util.Date;
10   -import java.util.Set;
11   -
12   -/**
13   - * 认证表 TODO 所有的认证？
14   - *
15   - * @author dev-center
16   - * @since 2014-10-29
17   - */
18   -public class Auth extends BaseDomain {
19   - private static final long serialVersionUID = 1L;
20   - /**
21   - * 认证名称
22   - */
23   - private String name;
24   - /**
25   - * 认证图标
26   - */
27   - private String authIcon;
28   - /**
29   - * 认证状态 1有效 2 无效 -1删除 <br/>
30   - * Auth类有常量表示
31   - */
32   - private Integer status;
33   - /**
34   - * 创建时间
35   - */
36   - private Date ctime;
37   - /**
38   - * 修改时间，是个时间字符串
39   - */
40   - private String utime;
41   -
42   - // ******************** 以下为业务属性 *********************
43   - /**
44   - * 认证与经营范围关联信息
45   - */
46   - private Set<AuthScope> scopeSet;
47   -
48   - // ******************** 以下为此类的常量值 *********************
49   - /**
50   - * 运营范围 ：自营
51   - */
52   - public static final int SCOPE_SELF_SALE = 1;
53   -
54   - /**
55   - * 运营范围 ：代销
56   - */
57   - public static final int SCOPE_AGENT_SALE = 2;
58   -
59   - /**
60   - * 运营范围 ：买卖对接
61   - */
62   - public static final int SCOPE_THIRDPARTY_SALE = 4;
63   -
64   - /**
65   - * 状态：可用
66   - */
67   - public static final int STATUS_ENABLE = 1;
68   - /**
69   - * 状态：不可用
70   - */
71   - public static final int STATUS_UNTENABLE = 2;
72   - /**
73   - * 状态：删除
74   - */
75   - public static final int STATUS_DEL = -1;
76   -
77   - public Auth() {
78   - //默认无参构造方法
79   - }
80   -
81   - /**
82   - * 获取 name
83   - *
84   - * @return
85   - */
86   - public String getName() {
87   - return name;
88   - }
89   -
90   - /**
91   - * 设置 name
92   - *
93   - * @param name
94   - */
95   - public void setName(String name) {
96   - this.name = name;
97   - }
98   -
99   - /**
100   - * 获取 authIcon
101   - *
102   - * @return
103   - */
104   - public String getAuthIcon() {
105   - return authIcon;
106   - }
107   -
108   - /**
109   - * 设置 authIcon
110   - *
111   - * @param authIcon
112   - */
113   - public void setAuthIcon(String authIcon) {
114   - this.authIcon = authIcon;
115   - }
116   -
117   - /**
118   - * 获取 status
119   - *
120   - * @return
121   - */
122   - public Integer getStatus() {
123   - return status;
124   - }
125   -
126   - /**
127   - * 设置 status
128   - *
129   - * @param status
130   - */
131   - public void setStatus(Integer status) {
132   - this.status = status;
133   - }
134   -
135   - /**
136   - * 获取 ctime
137   - *
138   - * @return
139   - */
140   - public Date getCtime() {
141   - return ctime;
142   - }
143   -
144   - /**
145   - * 设置 ctime
146   - *
147   - * @param ctime
148   - */
149   - public void setCtime(Date ctime) {
150   - this.ctime = ctime;
151   - }
152   -
153   - /**
154   - * 获取 utime
155   - *
156   - * @return
157   - */
158   - public String getUtime() {
159   - return utime;
160   - }
161   -
162   - /**
163   - * 设置 utime
164   - *
165   - * @param utime
166   - */
167   - public void setUtime(String utime) {
168   - this.utime = utime;
169   - }
170   -
171   - public Set<AuthScope> getScopeSet() {
172   - return scopeSet;
173   - }
174   -
175   - public void setScopeSet(Set<AuthScope> scopeSet) {
176   - this.scopeSet = scopeSet;
177   - }
178   -}
179 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/domain/AuthScope.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.domain;
6   -
7   -import com.dili.titan.domain.base.BaseDomain;
8   -
9   -/**
10   - * 认证与经营范围关联信息
11   - *
12   - * @author dev-center
13   - * @since 2014-10-29
14   - */
15   -public class AuthScope extends BaseDomain {
16   - private static final long serialVersionUID = 1L;
17   - /**
18   - * 商品认证表ID
19   - */
20   - private Long authId;
21   - /**
22   - * 经营范围ID
23   - */
24   - private Long scopeId;
25   -
26   - public AuthScope() {
27   - //默认无参构造方法
28   - }
29   -
30   - /**
31   - * 获取 authId
32   - *
33   - * @return
34   - */
35   - public Long getAuthId() {
36   - return authId;
37   - }
38   -
39   - /**
40   - * 设置 authId
41   - *
42   - * @param authId
43   - */
44   - public void setAuthId(Long authId) {
45   - this.authId = authId;
46   - }
47   -
48   - /**
49   - * 获取 scopeId
50   - *
51   - * @return
52   - */
53   - public Long getScopeId() {
54   - return scopeId;
55   - }
56   -
57   - /**
58   - * 设置 scopeId
59   - *
60   - * @param scopeId
61   - */
62   - public void setScopeId(Long scopeId) {
63   - this.scopeId = scopeId;
64   - }
65   -}
66 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/domain/IndexCategory.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.domain;
6   -
7   -
8   -import com.dili.titan.domain.base.BaseDomain;
9   -
10   -import java.util.List;
11   -
12   -/**
13   - * indexCategory
14   - *
15   - * @author dev-center
16   - * @since 2014-12-22
17   - */
18   -//TODO 自贸区此表无数据入口
19   -public class IndexCategory extends BaseDomain {
20   - private static final long serialVersionUID = 1L;
21   - private String indexName;
22   - private Long categoryId;
23   - /**
24   - * 状态：-1 删除，1 正常
25   - */
26   - private Integer status;
27   -
28   - // ******************** 以下为业务属性 *********************
29   - private String cateName;
30   - /**
31   - * 分类ID，随便第几级三类
32   - */
33   - private Integer queryCateId;
34   - /**
35   - * 分类ID
36   - */
37   - private List<Integer> cateList;
38   -
39   - public IndexCategory() {
40   - //默认无参构造方法
41   - }
42   -
43   - public Integer getQueryCateId() {
44   - return queryCateId;
45   - }
46   -
47   - public void setQueryCateId(Integer queryCateId) {
48   - this.queryCateId = queryCateId;
49   - }
50   -
51   - public List<Integer> getCateList() {
52   - return cateList;
53   - }
54   -
55   - public void setCateList(List<Integer> cateList) {
56   - this.cateList = cateList;
57   - }
58   -
59   - public String getCateName() {
60   - return cateName;
61   - }
62   -
63   - public void setCateName(String cateName) {
64   - this.cateName = cateName;
65   - }
66   -
67   - public String getIndexName() {
68   - return indexName;
69   - }
70   -
71   - public void setIndexName(String indexName) {
72   - this.indexName = indexName;
73   - }
74   -
75   - /**
76   - * 获取 categoryId
77   - *
78   - * @return
79   - */
80   - public Long getCategoryId() {
81   - return categoryId;
82   - }
83   -
84   - /**
85   - * 设置 categoryId
86   - *
87   - * @param categoryId
88   - */
89   - public void setCategoryId(Long categoryId) {
90   - this.categoryId = categoryId;
91   - }
92   -
93   - /**
94   - * 获取 status
95   - *
96   - * @return
97   - */
98   - public Integer getStatus() {
99   - return status;
100   - }
101   -
102   - /**
103   - * 设置 status
104   - *
105   - * @param status
106   - */
107   - public void setStatus(Integer status) {
108   - this.status = status;
109   - }
110   -}
111 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/domain/ProductAuth.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.domain;
6   -
7   -import com.dili.titan.domain.base.BaseDomain;
8   -
9   -import java.util.Date;
10   -
11   -/**
12   - * 商品认证
13   - *
14   - * @author dev-center
15   - * @since 2014-10-29
16   - */
17   -//TODO 自贸区此表无数据入口
18   -public class ProductAuth extends BaseDomain {
19   - private static final long serialVersionUID = 1L;
20   - /**
21   - * 商品ID
22   - */
23   - private Long pid;
24   - /**
25   - * 认证ID
26   - */
27   - private Long authId;
28   - /**
29   - * 认证地址
30   - */
31   - private String authUrl;
32   - /**
33   - * 商品认证状态 1可用 2 不可用 -1删除<br/>
34   - * ProductAuth类有常量表示
35   - */
36   - private Integer status;
37   - /**
38   - * 认证结束时间
39   - */
40   - private Date authEndTime;
41   - private Date ctime;
42   - private String utime;
43   -
44   - // ******************** 以下为业务属性 *********************
45   - /**
46   - * 认证名称
47   - */
48   - private String authName;
49   -
50   - // ******************** 以下为属性的常量值 *********************
51   - /**
52   - * 状态：可用
53   - */
54   - public static final int STATUS_ENABLE = 1;
55   - /**
56   - * 状态：不可用
57   - */
58   - public static final int STATUS_UNTENABLE = 2;
59   - /**
60   - * 状态：删除
61   - */
62   - public static final int STATUS_DEL = -1;
63   -
64   - public ProductAuth() {
65   - // 默认无参构造方法
66   - }
67   -
68   - /**
69   - * 获取 pid
70   - *
71   - * @return
72   - */
73   - public Long getPid() {
74   - return pid;
75   - }
76   -
77   - /**
78   - * 设置 pid
79   - *
80   - * @param pid
81   - */
82   - public void setPid(Long pid) {
83   - this.pid = pid;
84   - }
85   -
86   - /**
87   - * 获取 authId
88   - *
89   - * @return
90   - */
91   - public Long getAuthId() {
92   - return authId;
93   - }
94   -
95   - /**
96   - * 设置 authId
97   - *
98   - * @param authId
99   - */
100   - public void setAuthId(Long authId) {
101   - this.authId = authId;
102   - }
103   -
104   - /**
105   - * 获取 authUrl
106   - *
107   - * @return
108   - */
109   - public String getAuthUrl() {
110   - return authUrl;
111   - }
112   -
113   - /**
114   - * 设置 authUrl
115   - *
116   - * @param authUrl
117   - */
118   - public void setAuthUrl(String authUrl) {
119   - this.authUrl = authUrl;
120   - }
121   -
122   - /**
123   - * 获取 status
124   - *
125   - * @return
126   - */
127   - public Integer getStatus() {
128   - return status;
129   - }
130   -
131   - /**
132   - * 设置 status
133   - *
134   - * @param status
135   - */
136   - public void setStatus(Integer status) {
137   - this.status = status;
138   - }
139   -
140   - /**
141   - * 获取 authEndTime
142   - *
143   - * @return
144   - */
145   - public Date getAuthEndTime() {
146   - return authEndTime;
147   - }
148   -
149   - /**
150   - * 设置 authEndTime
151   - *
152   - * @param authEndTime
153   - */
154   - public void setAuthEndTime(Date authEndTime) {
155   - this.authEndTime = authEndTime;
156   - }
157   -
158   - /**
159   - * 获取 ctime
160   - *
161   - * @return
162   - */
163   - public Date getCtime() {
164   - return ctime;
165   - }
166   -
167   - /**
168   - * 设置 ctime
169   - *
170   - * @param ctime
171   - */
172   - public void setCtime(Date ctime) {
173   - this.ctime = ctime;
174   - }
175   -
176   - /**
177   - * 获取 utime
178   - *
179   - * @return
180   - */
181   - public String getUtime() {
182   - return utime;
183   - }
184   -
185   - /**
186   - * 设置 utime
187   - *
188   - * @param utime
189   - */
190   - public void setUtime(String utime) {
191   - this.utime = utime;
192   - }
193   -
194   - public String getAuthName() {
195   - return authName;
196   - }
197   -
198   - public void setAuthName(String authName) {
199   - this.authName = authName;
200   - }
201   -}
titan-web/src/main/java/com/dili/titan/domain/ProductOffline.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.domain;
6   -
7   -import com.dili.titan.domain.base.BaseDomain;
8   -
9   -import java.util.Date;
10   -import java.util.List;
11   -
12   -/**
13   - * productOffline
14   - *
15   - * @author dev-center
16   - * @since 2014-11-14
17   - */
18   -//TODO 自贸区此表无数据入口
19   -public class ProductOffline extends BaseDomain {
20   - private static final long serialVersionUID = 1L;
21   - /**
22   - * 商品ID
23   - */
24   - private Long pid;
25   - /**
26   - * 分类ID
27   - */
28   - private Integer cateId;
29   - /**
30   - * 卖家用户登录名
31   - */
32   - private String sellerName;
33   - /**
34   - * 卖家用户ID
35   - */
36   - private Long sellerUserId;
37   - /**
38   - * 商品价格
39   - */
40   - private Long price;
41   - /**
42   - * 商品状态 1-生效 2-失效 -1-删除
43   - */
44   - private Integer status;
45   - private Date ctime;
46   - private String utime;
47   -
48   - // ******************** 以下为业务属性 *********************
49   - /**
50   - * 手机号码，到用户中心去搜索
51   - */
52   - private String phone;
53   - private String realName;
54   - private String userName;
55   - /**
56   - * 类目名
57   - */
58   - private String cateName;
59   - /**
60   - * 品规
61   - */
62   - private String offlineAttrValue;
63   - /**
64   - * 分类ID
65   - */
66   - private List<Integer> cateList;
67   -
68   - public ProductOffline() {
69   - //默认无参构造方法
70   - }
71   -
72   - public Long getSellerUserId() {
73   - return sellerUserId;
74   - }
75   -
76   - public String getRealName() {
77   - return realName;
78   - }
79   -
80   - public void setRealName(String realName) {
81   - this.realName = realName;
82   - }
83   -
84   - public String getUserName() {
85   - return userName;
86   - }
87   -
88   - public void setUserName(String userName) {
89   - this.userName = userName;
90   - }
91   -
92   - public void setSellerUserId(Long sellerUserId) {
93   - this.sellerUserId = sellerUserId;
94   - }
95   -
96   -
97   - public List<Integer> getCateList() {
98   - return cateList;
99   - }
100   -
101   -
102   - public void setCateList(List<Integer> cateList) {
103   - this.cateList = cateList;
104   - }
105   -
106   - public String getPhone() {
107   - return phone;
108   - }
109   -
110   -
111   - public void setPhone(String phone) {
112   - this.phone = phone;
113   - }
114   -
115   -
116   - /**
117   - * 获取 pid
118   - *
119   - * @return
120   - */
121   - public Long getPid() {
122   - return pid;
123   - }
124   -
125   - /**
126   - * 设置 pid
127   - *
128   - * @param pid
129   - */
130   - public void setPid(Long pid) {
131   - this.pid = pid;
132   - }
133   -
134   - /**
135   - * 获取 cateId
136   - *
137   - * @return
138   - */
139   - public Integer getCateId() {
140   - return cateId;
141   - }
142   -
143   - /**
144   - * 设置 cateId
145   - *
146   - * @param cateId
147   - */
148   - public void setCateId(Integer cateId) {
149   - this.cateId = cateId;
150   - }
151   -
152   - public String getCateName() {
153   - return cateName;
154   - }
155   -
156   - public void setCateName(String cateName) {
157   - this.cateName = cateName;
158   - }
159   -
160   - public String getOfflineAttrValue() {
161   - return offlineAttrValue;
162   - }
163   -
164   - public void setOfflineAttrValue(String offlineAttrValue) {
165   - this.offlineAttrValue = offlineAttrValue;
166   - }
167   -
168   - /**
169   - * 获取 sellerName
170   - *
171   - * @return
172   - */
173   - public String getSellerName() {
174   - return sellerName;
175   - }
176   -
177   - /**
178   - * 设置 sellerName
179   - *
180   - * @param sellerName
181   - */
182   - public void setSellerName(String sellerName) {
183   - this.sellerName = sellerName;
184   - }
185   -
186   - /**
187   - * 获取 price
188   - *
189   - * @return
190   - */
191   - public Long getPrice() {
192   - return price;
193   - }
194   -
195   - /**
196   - * 设置 price
197   - *
198   - * @param price
199   - */
200   - public void setPrice(Long price) {
201   - this.price = price;
202   - }
203   -
204   - /**
205   - * 获取 status
206   - *
207   - * @return
208   - */
209   - public Integer getStatus() {
210   - return status;
211   - }
212   -
213   - /**
214   - * 设置 status
215   - *
216   - * @param status
217   - */
218   - public void setStatus(Integer status) {
219   - this.status = status;
220   - }
221   -
222   - /**
223   - * 获取 ctime
224   - *
225   - * @return
226   - */
227   - public Date getCtime() {
228   - return ctime;
229   - }
230   -
231   - /**
232   - * 设置 ctime
233   - *
234   - * @param ctime
235   - */
236   - public void setCtime(Date ctime) {
237   - this.ctime = ctime;
238   - }
239   -
240   - /**
241   - * 获取 utime
242   - *
243   - * @return
244   - */
245   - public String getUtime() {
246   - return utime;
247   - }
248   -
249   - /**
250   - * 设置 utime
251   - *
252   - * @param utime
253   - */
254   - public void setUtime(String utime) {
255   - this.utime = utime;
256   - }
257   -}
258 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/domain/ProductOfflineAttrValue.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.domain;
6   -
7   -import com.dili.titan.domain.base.BaseDomain;
8   -
9   -import java.util.Date;
10   -
11   -/**
12   - * productOfflineAttrValue
13   - * @author dev-center
14   - * @since 2014-11-14
15   - */
16   -//TODO 自贸区此表无数据入口
17   -public class ProductOfflineAttrValue extends BaseDomain {
18   - private static final long serialVersionUID = 1L;
19   - private Long pid;
20   - private Long attrValueId;
21   - private Integer status;
22   - private Date ctime;
23   - private String utime;
24   -
25   - public ProductOfflineAttrValue(){
26   - //默认无参构造方法
27   - }
28   -
29   - /**
30   - * 获取 pid
31   - * @return
32   - */
33   - public Long getPid(){
34   - return pid;
35   - }
36   -
37   - /**
38   - * 设置 pid
39   - * @param pid
40   - */
41   - public void setPid(Long pid){
42   - this.pid = pid;
43   - }
44   -
45   - /**
46   - * 获取 attrValueId
47   - * @return
48   - */
49   - public Long getAttrValueId(){
50   - return attrValueId;
51   - }
52   -
53   - /**
54   - * 设置 attrValueId
55   - * @param attrValueId
56   - */
57   - public void setAttrValueId(Long attrValueId){
58   - this.attrValueId = attrValueId;
59   - }
60   -
61   - /**
62   - * 获取 status
63   - * @return
64   - */
65   - public Integer getStatus(){
66   - return status;
67   - }
68   -
69   - /**
70   - * 设置 status
71   - * @param status
72   - */
73   - public void setStatus(Integer status){
74   - this.status = status;
75   - }
76   -
77   - /**
78   - * 获取 ctime
79   - * @return
80   - */
81   - public Date getCtime(){
82   - return ctime;
83   - }
84   -
85   - /**
86   - * 设置 ctime
87   - * @param ctime
88   - */
89   - public void setCtime(Date ctime){
90   - this.ctime = ctime;
91   - }
92   -
93   - /**
94   - * 获取 utime
95   - * @return
96   - */
97   - public String getUtime(){
98   - return utime;
99   - }
100   -
101   - /**
102   - * 设置 utime
103   - * @param utime
104   - */
105   - public void setUtime(String utime){
106   - this.utime = utime;
107   - }
108   -}
109 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/domain/ProductPop.java
  View file @33a755c
... ... @@ -192,9 +192,7 @@ public class ProductPop extends BaseDomain {
192 192 private List<ProductImg> imgList;
193 193 private List<ProductPopAttr> saleAttrList;
194 194 private List<ProductPopAttr> descAttrList;
195   - private List<ProductPopPriceRange> productPopPriceRanges;
196   - private List<ProductAuth> productAuthList;
197   - private ProductVideo productVideo;
  195 +
198 196  
199 197 // ******************** 以下为属性的常量值 *********************
200 198 /**
... ... @@ -585,48 +583,6 @@ public class ProductPop extends BaseDomain {
585 583 this.descAttrList = descAttrList;
586 584 }
587 585  
588   - public List<ProductPopPriceRange> getProductPopPriceRanges() {
589   - return productPopPriceRanges;
590   - }
591   -
592   - public void setProductPopPriceRanges(
593   - List<ProductPopPriceRange> productPopPriceRanges) {
594   - if (this.quotationType == QUOTATION_TYPE_QJ && CollectionUtils.isNotEmpty(productPopPriceRanges)) {
595   - Integer minPrice = null;
596   - Integer maxPrice = null;
597   - for (int i = 0; i < productPopPriceRanges.size(); i++) {
598   - int price = productPopPriceRanges.get(i).getPrice();
599   - if (i == 0) {
600   - minPrice = price;
601   - maxPrice = price;
602   - } else {
603   - if (price < minPrice)
604   - minPrice = price;
605   - if (price > maxPrice)
606   - maxPrice = price;
607   - }
608   - }
609   - this.maxPrice = maxPrice;
610   - this.minPrice = minPrice;
611   - }
612   - this.productPopPriceRanges = productPopPriceRanges;
613   - }
614   -
615   - public List<ProductAuth> getProductAuthList() {
616   - return productAuthList;
617   - }
618   -
619   - public void setProductAuthList(List<ProductAuth> productAuthList) {
620   - this.productAuthList = productAuthList;
621   - }
622   -
623   - public ProductVideo getProductVideo() {
624   - return productVideo;
625   - }
626   -
627   - public void setProductVideo(ProductVideo productVideo) {
628   - this.productVideo = productVideo;
629   - }
630 586  
631 587 public Integer getManualAuditType() {
632 588 return manualAuditType;
... ...
titan-web/src/main/java/com/dili/titan/domain/ProductPopAudit.java deleted 100644 → 0
  View file @08c8ca7
1   -package com.dili.titan.domain;
2   -
3   -import com.dili.titan.domain.base.BaseDomain;
4   -
5   -import java.util.Date;
6   -
7   -/**
8   - * 第三方商品审核
9   - */
10   -public class ProductPopAudit extends BaseDomain {
11   - private static final long serialVersionUID = 1L;
12   - private Long pid;
13   - /**
14   - * 操作员用户名
15   - */
16   - private String oper;
17   - /**
18   - * 状态 1=通过 ，2=不通过<br/>
19   - * ProductPopAudit类有常量表示
20   - */
21   - private Integer status;
22   - /**
23   - * 具体意见内容
24   - */
25   - private String feedback;
26   - private Date ctime;
27   -
28   - // ******************** 以下为此类的常量值 *********************
29   - /**
30   - * 商品审核通过
31   - */
32   - public final static int ALLOWED = 1;
33   - /**
34   - * 商品审核不通过
35   - */
36   - public final static int DENIED = 2;
37   -
38   - public Long getPid() {
39   - return pid;
40   - }
41   -
42   - public void setPid(Long pid) {
43   - this.pid = pid;
44   - }
45   -
46   - public String getOper() {
47   - return oper;
48   - }
49   -
50   - public void setOper(String oper) {
51   - this.oper = oper;
52   - }
53   -
54   - public Integer getStatus() {
55   - return status;
56   - }
57   -
58   - public void setStatus(Integer status) {
59   - this.status = status;
60   - }
61   -
62   - public String getFeedback() {
63   - return feedback;
64   - }
65   -
66   - public void setFeedback(String feedback) {
67   - this.feedback = feedback;
68   - }
69   -
70   - public Date getCtime() {
71   - return ctime;
72   - }
73   -
74   - public void setCtime(Date ctime) {
75   - this.ctime = ctime;
76   - }
77   -
78   - @Override
79   - public String toString() {
80   - return "ProductPopAudit{" +
81   - "pid=" + pid +
82   - ", oper='" + oper + '\'' +
83   - ", status=" + status +
84   - ", feedback='" + feedback + '\'' +
85   - ", ctime=" + ctime +
86   - '}';
87   - }
88   -}
titan-web/src/main/java/com/dili/titan/domain/ProductPopPriceRange.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.domain;
6   -
7   -import com.dili.titan.domain.base.BaseDomain;
8   -
9   -import java.util.Date;
10   -
11   -/**
12   - * 第三方商品价格区间
13   - *
14   - * @author dev-center
15   - * @since 2014-08-27
16   - */
17   -//TODO 光看表结构，不知道是拿来干嘛的
18   -public class ProductPopPriceRange extends BaseDomain {
19   - private static final long serialVersionUID = 1L;
20   - private Integer price;
21   - /**
22   - * 区间价格起批量
23   - */
24   - private Integer miniPurchase;
25   - private Long pid;
26   - //TODO
27   - private Integer status;
28   - //TODO
29   - private Integer version;
30   - private Date ctime;
31   - private String utime;
32   -
33   - public ProductPopPriceRange() {
34   - //默认无参构造方法
35   - }
36   -
37   - /**
38   - * 获取 price
39   - *
40   - * @return
41   - */
42   - public Integer getPrice() {
43   - return price;
44   - }
45   -
46   - /**
47   - * 设置 price
48   - *
49   - * @param price
50   - */
51   - public void setPrice(Integer price) {
52   - this.price = price;
53   - }
54   -
55   - /**
56   - * 获取 miniPurchase
57   - *
58   - * @return
59   - */
60   - public Integer getMiniPurchase() {
61   - return miniPurchase;
62   - }
63   -
64   - /**
65   - * 设置 miniPurchase
66   - *
67   - * @param miniPurchase
68   - */
69   - public void setMiniPurchase(Integer miniPurchase) {
70   - this.miniPurchase = miniPurchase;
71   - }
72   -
73   - /**
74   - * 获取 pid
75   - *
76   - * @return
77   - */
78   - public Long getPid() {
79   - return pid;
80   - }
81   -
82   - /**
83   - * 设置 pid
84   - *
85   - * @param pid
86   - */
87   - public void setPid(Long pid) {
88   - this.pid = pid;
89   - }
90   -
91   - /**
92   - * 获取 status
93   - *
94   - * @return
95   - */
96   - public Integer getStatus() {
97   - return status;
98   - }
99   -
100   - /**
101   - * 设置 status
102   - *
103   - * @param status
104   - */
105   - public void setStatus(Integer status) {
106   - this.status = status;
107   - }
108   -
109   - /**
110   - * 获取 version
111   - *
112   - * @return
113   - */
114   - public Integer getVersion() {
115   - return version;
116   - }
117   -
118   - /**
119   - * 设置 version
120   - *
121   - * @param version
122   - */
123   - public void setVersion(Integer version) {
124   - this.version = version;
125   - }
126   -
127   - /**
128   - * 获取 ctime
129   - *
130   - * @return
131   - */
132   - public Date getCtime() {
133   - return ctime;
134   - }
135   -
136   - /**
137   - * 设置 ctime
138   - *
139   - * @param ctime
140   - */
141   - public void setCtime(Date ctime) {
142   - this.ctime = ctime;
143   - }
144   -
145   - /**
146   - * 获取 utime
147   - *
148   - * @return
149   - */
150   - public String getUtime() {
151   - return utime;
152   - }
153   -
154   - /**
155   - * 设置 utime
156   - *
157   - * @param utime
158   - */
159   - public void setUtime(String utime) {
160   - this.utime = utime;
161   - }
162   -}
163 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/domain/ProductVideo.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2014 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.domain;
6   -
7   -import com.dili.titan.domain.base.BaseDomain;
8   -
9   -import java.util.Date;
10   -
11   -/**
12   - * productVideo
13   - *
14   - * @author dev-center
15   - * @since 2014-10-29
16   - */
17   -//TODO 自贸区此表无数据入口
18   -public class ProductVideo extends BaseDomain {
19   - private static final long serialVersionUID = 1L;
20   - /**
21   - * 状态：正常
22   - */
23   - public static final int STATUS_NORMAL = 1;
24   - /**
25   - * 状态：删除
26   - */
27   - public static final int STATUS_DEL = -1;
28   - private Long pid;
29   - private Long videoId;
30   - private Integer status;
31   - private Date ctime;
32   - private String utime;
33   -
34   - private String name;
35   - private Integer productStatus;
36   -
37   - public ProductVideo() {
38   - //默认无参构造方法
39   - }
40   -
41   - /**
42   - * 获取 pid
43   - *
44   - * @return
45   - */
46   - public Long getPid() {
47   - return pid;
48   - }
49   -
50   - /**
51   - * 设置 pid
52   - *
53   - * @param pid
54   - */
55   - public void setPid(Long pid) {
56   - this.pid = pid;
57   - }
58   -
59   -
60   - public Long getVideoId() {
61   - return videoId;
62   - }
63   -
64   - public void setVideoId(Long videoId) {
65   - this.videoId = videoId;
66   - }
67   -
68   - /**
69   - * 获取 status
70   - *
71   - * @return
72   - */
73   - public Integer getStatus() {
74   - return status;
75   - }
76   -
77   - public String getName() {
78   - return name;
79   - }
80   -
81   - public void setName(String name) {
82   - this.name = name;
83   - }
84   -
85   - public Integer getProductStatus() {
86   - return productStatus;
87   - }
88   -
89   - public void setProductStatus(Integer productStatus) {
90   - this.productStatus = productStatus;
91   - }
92   -
93   - /**
94   - * 设置 status
95   - *
96   - * @param status
97   - */
98   - public void setStatus(Integer status) {
99   - this.status = status;
100   - }
101   -
102   - /**
103   - * 获取 ctime
104   - *
105   - * @return
106   - */
107   - public Date getCtime() {
108   - return ctime;
109   - }
110   -
111   - /**
112   - * 设置 ctime
113   - *
114   - * @param ctime
115   - */
116   - public void setCtime(Date ctime) {
117   - this.ctime = ctime;
118   - }
119   -
120   - /**
121   - * 获取 utime
122   - *
123   - * @return
124   - */
125   - public String getUtime() {
126   - return utime;
127   - }
128   -
129   - /**
130   - * 设置 utime
131   - *
132   - * @param utime
133   - */
134   - public void setUtime(String utime) {
135   - this.utime = utime;
136   - }
137   -}
138 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/domain/Video.java deleted 100644 → 0
  View file @08c8ca7
1   -package com.dili.titan.domain;
2   -
3   -import com.dili.titan.domain.base.BaseDomain;
4   -
5   -import java.util.Date;
6   -import java.util.List;
7   -
8   -/**
9   - * <B>Description</B> <br />
10   - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
11   - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
12   - * <B>Company</B> 地利集团
13   - *
14   - * @author template
15   - * @createTime 2014-12-25 17:37:24
16   - */
17   -//TODO 自贸区此表无数据入口
18   -public class Video extends BaseDomain {
19   -
20   - /**
21   - *
22   - */
23   - private String name;
24   - /**
25   - *
26   - */
27   - private Long categoryId;
28   -
29   - private String categoryName;
30   - //视频资源id
31   - private String fileId;
32   - //视频url
33   - private String pageUrl;
34   - //视频图片
35   - private String img;
36   - /**
37   - *
38   - */
39   - private Integer status;
40   - private Integer aqyStatus;
41   - /**
42   - *
43   - */
44   - private String description;
45   - /**
46   - * 审核失败原因
47   - */
48   - private String reason;
49   - /**
50   - *
51   - */
52   - private Date ctime;
53   - /**
54   - *
55   - */
56   - private Date utime;
57   -
58   - /**
59   - * 用于页面条件查询的
60   - */
61   - private List<Integer> cateList;
62   - private Long pid;
63   - private String pname;
64   - private String shopName;
65   -
66   - /*状态---删除*/
67   - public static final int STATUS_DELETE = -1;
68   - /*状态--审核中*/
69   - public static final int STATUS_AUDIT = 1;
70   - /*状态--审核通过*/
71   - public static final int STATUS_AUDIT_COMPLETE = 2;
72   - /*状态--审核拒绝*/
73   - public static final int STATUS_AUDIT_REFUSE = 3;
74   -
75   - public void setName(String name) {
76   - this.name = name;
77   - }
78   -
79   - public String getName() {
80   - return this.name;
81   - }
82   -
83   - public void setCategoryId(Long categoryId) {
84   - this.categoryId = categoryId;
85   - }
86   -
87   - public Long getCategoryId() {
88   - return this.categoryId;
89   - }
90   -
91   - public void setStatus(Integer status) {
92   - this.status = status;
93   - }
94   -
95   - public Integer getStatus() {
96   - return this.status;
97   - }
98   -
99   - public void setDescription(String description) {
100   - this.description = description;
101   - }
102   -
103   - public String getDescription() {
104   - return this.description;
105   - }
106   -
107   - public void setCtime(Date ctime) {
108   - this.ctime = ctime;
109   - }
110   -
111   - public Date getCtime() {
112   - return this.ctime;
113   - }
114   -
115   - public void setUtime(Date utime) {
116   - this.utime = utime;
117   - }
118   -
119   - public Date getUtime() {
120   - return this.utime;
121   - }
122   -
123   - @Override
124   - public String toString() {
125   - return "Video [name=" + name + ", categoryId=" + categoryId
126   - + ", status=" + status + ", description=" + description
127   - + ", ctime=" + ctime + ", utime=" + utime + ", getId()="
128   - + getId() + "]";
129   - }
130   -
131   - public List<Integer> getCateList() {
132   - return cateList;
133   - }
134   -
135   - public void setCateList(List<Integer> cateList) {
136   - this.cateList = cateList;
137   - }
138   -
139   - public String getCategoryName() {
140   - return categoryName;
141   - }
142   -
143   - public void setCategoryName(String categoryName) {
144   - this.categoryName = categoryName;
145   - }
146   -
147   - public String getFileId() {
148   - return fileId;
149   - }
150   -
151   - public void setFileId(String fileId) {
152   - this.fileId = fileId;
153   - }
154   -
155   - public String getPageUrl() {
156   - return pageUrl;
157   - }
158   -
159   - public void setPageUrl(String pageUrl) {
160   - this.pageUrl = pageUrl;
161   - }
162   -
163   - public String getImg() {
164   - return img;
165   - }
166   -
167   - public void setImg(String img) {
168   - this.img = img;
169   - }
170   -
171   - public Integer getAqyStatus() {
172   - return aqyStatus;
173   - }
174   -
175   - public void setAqyStatus(Integer aqyStatus) {
176   - this.aqyStatus = aqyStatus;
177   - }
178   -
179   - public Long getPid() {
180   - return pid;
181   - }
182   -
183   - public void setPid(Long pid) {
184   - this.pid = pid;
185   - }
186   -
187   - public String getReason() {
188   - return reason;
189   - }
190   -
191   - public void setReason(String reason) {
192   - this.reason = reason;
193   - }
194   -
195   - public String getPname() {
196   - return pname;
197   - }
198   -
199   - public void setPname(String pname) {
200   - this.pname = pname;
201   - }
202   -
203   - public String getShopName() {
204   - return shopName;
205   - }
206   -
207   - public void setShopName(String shopName) {
208   - this.shopName = shopName;
209   - }
210   -}
211 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/gq/domain/Presale.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2015 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.gq.domain;
6   -
7   -import com.dili.titan.domain.base.BaseDomain;
8   -
9   -import java.util.Date;
10   -import java.util.List;
11   -
12   -/**
13   - * 预售
14   - *
15   - * @author dev-center
16   - * @since 2015-07-24
17   - */
18   -//TODO 自贸区此表无数据入口
19   -public class Presale extends BaseDomain {
20   - private static final long serialVersionUID = 1L;
21   - /**
22   - * 标题
23   - */
24   - private String title;
25   - /**
26   - * 联系人
27   - */
28   - private String userName;
29   - /**
30   - * 分类ID
31   - */
32   - private Long categoryId;
33   - /**
34   - * 所在地ID
35   - */
36   - private Long localityAreaId;
37   - /**
38   - * 产量
39   - */
40   - private Integer count;
41   - /**
42   - * 单位ID
43   - */
44   - private Integer unitId;
45   - /**
46   - * 联系人手机号
47   - */
48   - private String phone;
49   - /**
50   - * 状态：1待审核，2-审核通过，3-审核失败,4-已过期,-1-删除
51   - */
52   - private Integer status;
53   - private Long userId;
54   - /**
55   - * 来源1-PC;2-手机
56   - */
57   - private Integer source;
58   - /**
59   - * 审核失败原因
60   - */
61   - private String reason;
62   - /**
63   - * 预售开始时间
64   - */
65   - private Date startTime;
66   - /**
67   - * 预售结束时间
68   - */
69   - private Date endTime;
70   - private Date ctime;
71   - private String utime;
72   -
73   - // ******************** 以下为业务属性 *********************
74   - private List<String> imgs;
75   - /**
76   - * 后台显示需要 单位名称
77   - */
78   - private String unitName;
79   - private String desc;
80   - private String localityArea;
81   - private String cateName;
82   - /**
83   - * 分类ID，随便第几级三类
84   - */
85   - private Integer queryCateId;
86   - //查询参数
87   - private List<Integer> statuses;
88   - /**
89   - * 分类ID
90   - */
91   - private List<Integer> cateList;
92   -
93   - public Presale() {
94   - //默认无参构造方法
95   - }
96   -
97   - public String getLocalityArea() {
98   - return localityArea;
99   - }
100   -
101   - public void setLocalityArea(String localityArea) {
102   - this.localityArea = localityArea;
103   - }
104   -
105   - public String getDesc() {
106   - return desc;
107   - }
108   -
109   - public void setDesc(String desc) {
110   - this.desc = desc;
111   - }
112   -
113   - public String getTitle() {
114   - return title;
115   - }
116   -
117   - public void setTitle(String title) {
118   - this.title = title;
119   - }
120   -
121   - public String getUserName() {
122   - return userName;
123   - }
124   -
125   - public void setUserName(String userName) {
126   - this.userName = userName;
127   - }
128   -
129   - public String getUnitName() {
130   - return unitName;
131   - }
132   -
133   - public void setUnitName(String unitName) {
134   - this.unitName = unitName;
135   - }
136   -
137   - /**
138   - * 获取 categoryId
139   - *
140   - * @return
141   - */
142   - public Long getCategoryId() {
143   - return categoryId;
144   - }
145   -
146   - /**
147   - * 设置 categoryId
148   - *
149   - * @param categoryId
150   - */
151   - public void setCategoryId(Long categoryId) {
152   - this.categoryId = categoryId;
153   - }
154   -
155   - /**
156   - * 获取 count
157   - *
158   - * @return
159   - */
160   - public Integer getCount() {
161   - return count;
162   - }
163   -
164   - /**
165   - * 设置 count
166   - *
167   - * @param count
168   - */
169   - public void setCount(Integer count) {
170   - this.count = count;
171   - }
172   -
173   - /**
174   - * 获取 phone
175   - *
176   - * @return
177   - */
178   - public String getPhone() {
179   - return phone;
180   - }
181   -
182   - /**
183   - * 设置 phone
184   - *
185   - * @param phone
186   - */
187   - public void setPhone(String phone) {
188   - this.phone = phone;
189   - }
190   -
191   - /**
192   - * 获取 status
193   - *
194   - * @return
195   - */
196   - public Integer getStatus() {
197   - return status;
198   - }
199   -
200   - /**
201   - * 设置 status
202   - *
203   - * @param status
204   - */
205   - public void setStatus(Integer status) {
206   - this.status = status;
207   - }
208   -
209   - /**
210   - * 获取 userId
211   - *
212   - * @return
213   - */
214   - public Long getUserId() {
215   - return userId;
216   - }
217   -
218   - /**
219   - * 设置 userId
220   - *
221   - * @param userId
222   - */
223   - public void setUserId(Long userId) {
224   - this.userId = userId;
225   - }
226   -
227   - /**
228   - * 获取 source
229   - *
230   - * @return
231   - */
232   - public Integer getSource() {
233   - return source;
234   - }
235   -
236   - /**
237   - * 设置 source
238   - *
239   - * @param source
240   - */
241   - public void setSource(Integer source) {
242   - this.source = source;
243   - }
244   -
245   - /**
246   - * 获取 reason
247   - *
248   - * @return
249   - */
250   - public String getReason() {
251   - return reason;
252   - }
253   -
254   - /**
255   - * 设置 reason
256   - *
257   - * @param reason
258   - */
259   - public void setReason(String reason) {
260   - this.reason = reason;
261   - }
262   -
263   - /**
264   - * 获取 startTime
265   - *
266   - * @return
267   - */
268   - public Date getStartTime() {
269   - return startTime;
270   - }
271   -
272   - /**
273   - * 设置 startTime
274   - *
275   - * @param startTime
276   - */
277   - public void setStartTime(Date startTime) {
278   - this.startTime = startTime;
279   - }
280   -
281   - /**
282   - * 获取 endTime
283   - *
284   - * @return
285   - */
286   - public Date getEndTime() {
287   - return endTime;
288   - }
289   -
290   - /**
291   - * 设置 endTime
292   - *
293   - * @param endTime
294   - */
295   - public void setEndTime(Date endTime) {
296   - this.endTime = endTime;
297   - }
298   -
299   - /**
300   - * 获取 ctime
301   - *
302   - * @return
303   - */
304   - public Date getCtime() {
305   - return ctime;
306   - }
307   -
308   - /**
309   - * 设置 ctime
310   - *
311   - * @param ctime
312   - */
313   - public void setCtime(Date ctime) {
314   - this.ctime = ctime;
315   - }
316   -
317   - /**
318   - * 获取 utime
319   - *
320   - * @return
321   - */
322   - public String getUtime() {
323   - return utime;
324   - }
325   -
326   - /**
327   - * 设置 utime
328   - *
329   - * @param utime
330   - */
331   - public void setUtime(String utime) {
332   - this.utime = utime;
333   - }
334   -
335   - public Long getLocalityAreaId() {
336   - return localityAreaId;
337   - }
338   -
339   - public void setLocalityAreaId(Long localityAreaId) {
340   - this.localityAreaId = localityAreaId;
341   - }
342   -
343   - public Integer getUnitId() {
344   - return unitId;
345   - }
346   -
347   - public void setUnitId(Integer unitId) {
348   - this.unitId = unitId;
349   - }
350   -
351   - public List<Integer> getStatuses() {
352   - return statuses;
353   - }
354   -
355   - public void setStatuses(List<Integer> statuses) {
356   - this.statuses = statuses;
357   - }
358   -
359   - public List<String> getImgs() {
360   - return imgs;
361   - }
362   -
363   - public void setImgs(List<String> imgs) {
364   - this.imgs = imgs;
365   - }
366   -
367   - public Integer getQueryCateId() {
368   - return queryCateId;
369   - }
370   -
371   - public void setQueryCateId(Integer queryCateId) {
372   - this.queryCateId = queryCateId;
373   - }
374   -
375   - public List<Integer> getCateList() {
376   - return cateList;
377   - }
378   -
379   - public void setCateList(List<Integer> cateList) {
380   - this.cateList = cateList;
381   - }
382   -
383   - public String getCateName() {
384   - return cateName;
385   - }
386   -
387   - public void setCateName(String cateName) {
388   - this.cateName = cateName;
389   - }
390   -}
391 0 \ No newline at end of file
titan-web/src/main/java/com/dili/titan/gq/domain/Purchase.java deleted 100644 → 0
  View file @08c8ca7
1   -/*
2   - * Copyright (c) 2015 www.diligrp.com All rights reserved.
3   - * 本软件源代码版权归----所有,未经许可不得任意复制与传播.
4   - */
5   -package com.dili.titan.gq.domain;
6   -
7   -import com.dili.titan.domain.base.BaseDomain;
8   -
9   -import java.util.Date;
10   -import java.util.List;
11   -
12   -/**
13   - * 采购
14   - *
15   - * @author dev-center
16   - * @since 2015-07-24
17   - */
18   -//TODO 自贸区此表无数据入口
19   -public class Purchase extends BaseDomain {
20   - private static final long serialVersionUID = 1L;
21   - /**
22   - * 标题
23   - */
24   - private String title;
25   - /**
26   - * 联系人
27   - */
28   - private String userName;
29   - /**
30   - * 分类ID
31   - */
32   - private Long categoryId;
33   - /**
34   - * 产地Id
35   - */
36   - private Long producingAreaId;
37   - /**
38   - * 所在地
39   - */
40   - private Long localityAreaId;
41   - /**
42   - * 采购数量
43   - */
44   - private Integer count;
45   - /**
46   - * 采购单位ID
47   - */
48   - private Integer unitId;
49   - /**
50   - * 联系电话
51   - */
52   - private String phone;
53   - /**
54   - * 过期时间
55   - */
56   - private Date expireTime;
57   - /**
58   - * 状态：1待审核，2-审核通过，3-审核失败,4-已过期,-1-删除
59   - */
60   - private Integer status;
61   - private Long userId;
62   - /**
63   - * 来源1-PC;2-手机
64   - */
65   - private Integer source;
66   - /**
67   - * 审核失败原因
68   - */
69   - private String reason;
70   - private Date ctime;
71   - private String utime;
72   -
73   - // ******************** 以下为业务属性 *********************
74   - private List<String> imgs;
75   - /**
76   - * 后台显示需要 单位名称
77   - */
78   - private String unitName;
79   - private String desc;
80   - private String localityArea;
81   - private String producingArea;
82   - private String cateName;
83   - /**
84   - * 分类ID，随便第几级三类
85   - */
86   - private Integer queryCateId;
87   - //查询参数
88   - private List<Integer> statuses;
89   - /**
90   - * 分类ID
91   - */
92   - private List<Integer> cateList;
93   -
94   - public Purchase() {
95   - //默认无参构造方法
96   - }
97   -
98   - public String getUnitName() {
99   - return unitName;
100   - }
101   -
102   - public void setUnitName(String unitName) {
103   - this.unitName = unitName;
104   - }
105   -
106   - public String getDesc() {
107   - return desc;
108   - }
109   -
110   - public void setDesc(String desc) {
111   - this.desc = desc;
112   - }
113   -
114   - public String getLocalityArea() {
115   - return localityArea;
116   - }
117   -
118   - public void setLocalityArea(String localityArea) {
119   - this.localityArea = localityArea;
120   - }
121   -
122   - public String getTitle() {
123   - return title;
124   - }
125   -
126   - public void setTitle(String title) {
127   - this.title = title;
128   - }
129   -
130   - public String getUserName() {
131   - return userName;
132   - }
133   -
134   - public void setUserName(String userName) {
135   - this.userName = userName;
136   - }
137   -
138   - /**
139   - * 获取 categoryId
140   - *
141   - * @return
142   - */
143   - public Long getCategoryId() {
144   - return categoryId;
145   - }
146   -
147   - /**
148   - * 设置 categoryId
149   - *
150   - * @param categoryId
151   - */
152   - public void setCategoryId(Long categoryId) {
153   - this.categoryId = categoryId;
154   - }
155   -
156   - /**
157   - * 获取 count
158   - *
159   - * @return
160   - */
161   - public Integer getCount() {
162   - return count;
163   - }
164   -
165   - /**
166   - * 设置 count
167   - *
168   - * @param count
169   - */
170   - public void setCount(Integer count) {
171   - this.count = count;
172   - }
173   -
174   - /**
175   - * 获取 phone
176   - *
177   - * @return
178   - */
179   - public String getPhone() {
180   - return phone;
181   - }
182   -
183   - /**
184   - * 设置 phone
185   - *
186   - * @param phone
187   - */
188   - public void setPhone(String phone) {
189   - this.phone = phone;
190   - }
191   -
192   - /**
193   - * 获取 expireTime
194   - *
195   - * @return
196   - */
197   - public Date getExpireTime() {
198   - return expireTime;
199   - }
200   -
201   - /**
202   - * 设置 expireTime
203   - *
204   - * @param expireTime
205   - */
206   - public void setExpireTime(Date expireTime) {
207   - this.expireTime = expireTime;
208   - }
209   -
210   - /**
211   - * 获取 status
212   - *
213   - * @return
214   - */
215   - public Integer getStatus() {
216   - return status;
217   - }
218   -
219   - /**
220   - * 设置 status
221   - *
222   - * @param status
223   - */
224   - public void setStatus(Integer status) {
225   - this.status = status;
226   - }
227   -
228   - /**
229   - * 获取 userId
230   - *
231   - * @return
232   - */
233   - public Long getUserId() {
234   - return userId;
235   - }
236   -
237   - /**
238   - * 设置 userId
239   - *
240   - * @param userId
241   - */
242   - public void setUserId(Long userId) {
243   - this.userId = userId;
244   - }
245   -
246   - /**
247   - * 获取 source
248   - *
249   - * @return
250   - */
251   - public Integer getSource() {
252   - return source;
253   - }
254   -
255   - /**
256   - * 设置 source
257   - *
258   - * @param source
259   - */
260   - public void setSource(Integer source) {
261   - this.source = source;
262   - }
263   -
264   - /**
265   - * 获取 reason
266   - *
267   - * @return
268   - */
269   - public String getReason() {
270   - return reason;
271   - }
272   -
273   - /**
274   - * 设置 reason
275   - *
276   - * @param reason
277   - */
278   - public void setReason(String reason) {
279   - this.reason = reason;
280   - }
281   -
282   - /**
283   - * 获取 ctime
284   - *
285   - * @return
286   - */
287   - public Date getCtime() {
288   - return ctime;
289   - }
290   -
291   - /**
292   - * 设置 ctime
293   - *
294   - * @param ctime
295   - */
296   - public void setCtime(Date ctime) {
297   - this.ctime = ctime;
298   - }
299   -
300   - /**
301   - * 获取 utime
302   - *
303   - * @return
304   - */
305   - public String getUtime() {
306   - return utime;
307   - }
308   -
309   - /**
310   - * 设置 utime
311   - *
312   - * @param utime
313   - */
314   - public void setUtime(String utime) {
315   - this.utime = utime;
316   - }
317   -
318   - public Long getLocalityAreaId() {
319   - return localityAreaId;
320   - }
321   -
322   - public void setLocalityAreaId(Long localityAreaId) {
323   - this.localityAreaId = localityAreaId;
324   - }
325   -
326   - public Integer getUnitId() {
327   - return unitId;
328   - }
329   -
330   - public void setUnitId(Integer unitId) {
331   - this.unitId = unitId;
332   - }
333   -
334   - public List<Integer> getStatuses() {
335   - return statuses;
336   - }
337   -
338   - public void setStatuses(List<Integer> statuses) {
339   - this.statuses = statuses;
340   - }
341   -
342   - public Long getProducingAreaId() {
343   - return producingAreaId;
344   - }
345   -
346   - public void setProducingAreaId(Long producingAreaId) {
347   - this.producingAreaId = producingAreaId;
348   - }
349   -
350   - public List<String> getImgs() {
351   - return imgs;
352   - }
353   -
354   - public void setImgs(List<String> imgs) {
355   - this.imgs = imgs;
356   - }
357   -
358   - public String getProducingArea() {
359   - return producingArea;
360   - }
361   -
362   - public void setProducingArea(String producingArea) {
363   - this.producingArea = producingArea;
364   - }
365   -
366   - public String getCateName() {
367   - return cateName;
368   - }
369   -
370   - public void setCateName(String cateName) {
371   - this.cateName = cateName;
372   - }
373   -
374   - public Integer getQueryCateId() {
375   - return queryCateId;
376   - }
377   -
378   - public void setQueryCateId(Integer queryCateId) {
379   - this.queryCateId = queryCateId;
380   - }
381   -
382   - public List<Integer> getCateList() {
383   - return cateList;
384   - }
385   -
386   - public void setCateList(List<Integer> cateList) {
387   - this.cateList = cateList;
388   - }
389   -}
390 0 \ No newline at end of file