From dd6cb7d54a8b9a0c6671dda178c06e3a532b1c51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Sun, 13 Nov 2016 09:00:57 -0600 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=811?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../action/materials/DepotHeadAction.class | Bin 15996 -> 15996 bytes .../com/jsh/junitest/AmsTAsset.hbm.xml | 90 --------- .../com/jsh/junitest/common/ExtendsTest.class | Bin 385 -> 0 bytes .../com/jsh/junitest/common/ForTest.class | Bin 760 -> 0 bytes .../jsh/junitest/common/ImportExcelTest.class | Bin 3515 -> 0 bytes .../com/jsh/junitest/common/SumTest.class | Bin 2357 -> 0 bytes .../com/jsh/junitest/common/whileTest.class | Bin 745 -> 0 bytes .../com/jsh/junitest/json/CableStream.class | Bin 2133 -> 0 bytes .../com/jsh/junitest/json/Channel.class | Bin 3647 -> 0 bytes .../com/jsh/junitest/json/ChannelUtil.class | Bin 3856 -> 0 bytes .../com/jsh/junitest/json/IPStream.class | Bin 2167 -> 0 bytes .../com/jsh/junitest/json/JsonTest.class | Bin 1273 -> 0 bytes .../com/jsh/junitest/spring/SpringTest.class | Bin 429 -> 0 bytes .../jsh/action/materials/DepotHeadAction.java | 3 - src/com/jsh/junitest/AmsTAsset.hbm.xml | 90 --------- src/com/jsh/junitest/common/ExtendsTest.java | 10 - src/com/jsh/junitest/common/ForTest.java | 14 -- .../jsh/junitest/common/ImportExcelTest.java | 156 --------------- src/com/jsh/junitest/common/SumTest.java | 72 ------- src/com/jsh/junitest/common/whileTest.java | 18 -- src/com/jsh/junitest/json/CableStream.java | 127 ------------ src/com/jsh/junitest/json/Channel.java | 185 ------------------ src/com/jsh/junitest/json/ChannelUtil.java | 75 ------- src/com/jsh/junitest/json/IPStream.java | 127 ------------ src/com/jsh/junitest/json/JsonTest.java | 28 --- src/com/jsh/junitest/spring/SpringTest.java | 37 ---- 26 files changed, 1032 deletions(-) delete mode 100644 WebRoot/WEB-INF/classes/com/jsh/junitest/AmsTAsset.hbm.xml delete mode 100644 WebRoot/WEB-INF/classes/com/jsh/junitest/common/ExtendsTest.class delete mode 100644 WebRoot/WEB-INF/classes/com/jsh/junitest/common/ForTest.class delete mode 100644 WebRoot/WEB-INF/classes/com/jsh/junitest/common/ImportExcelTest.class delete mode 100644 WebRoot/WEB-INF/classes/com/jsh/junitest/common/SumTest.class delete mode 100644 WebRoot/WEB-INF/classes/com/jsh/junitest/common/whileTest.class delete mode 100644 WebRoot/WEB-INF/classes/com/jsh/junitest/json/CableStream.class delete mode 100644 WebRoot/WEB-INF/classes/com/jsh/junitest/json/Channel.class delete mode 100644 WebRoot/WEB-INF/classes/com/jsh/junitest/json/ChannelUtil.class delete mode 100644 WebRoot/WEB-INF/classes/com/jsh/junitest/json/IPStream.class delete mode 100644 WebRoot/WEB-INF/classes/com/jsh/junitest/json/JsonTest.class delete mode 100644 WebRoot/WEB-INF/classes/com/jsh/junitest/spring/SpringTest.class delete mode 100644 src/com/jsh/junitest/AmsTAsset.hbm.xml delete mode 100644 src/com/jsh/junitest/common/ExtendsTest.java delete mode 100644 src/com/jsh/junitest/common/ForTest.java delete mode 100644 src/com/jsh/junitest/common/ImportExcelTest.java delete mode 100644 src/com/jsh/junitest/common/SumTest.java delete mode 100644 src/com/jsh/junitest/common/whileTest.java delete mode 100644 src/com/jsh/junitest/json/CableStream.java delete mode 100644 src/com/jsh/junitest/json/Channel.java delete mode 100644 src/com/jsh/junitest/json/ChannelUtil.java delete mode 100644 src/com/jsh/junitest/json/IPStream.java delete mode 100644 src/com/jsh/junitest/json/JsonTest.java delete mode 100644 src/com/jsh/junitest/spring/SpringTest.java diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotHeadAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/materials/DepotHeadAction.class index fb89f80bc2f818c96d40d826e0f9e3cf5c6d05d4..60e0855521d09a936b98c65bcb28abc88d7bdf06 100644 GIT binary patch delta 1057 zcmWNQeN5I>9K}E93Qns@p@|7RGY|%XFQla413{svL4ZhTW#kS$+Sz=j?m$&iS5muQgn2IMNt1)<+1p z5{56>67ynQBG)sG@gy;cWTKf#BC|;2Hqx0x7OCVh*Yn4IwX?l1#7g1Nh0;i=fs; zQ}1GV#v6$5Q(6n1d~*cq>cUMj0OU{|qGiLR?H#)h;1umG?if15rgdJSK9f_99}U;zjKg3IL)7Y##Juxm%TP*lfyPO!r%PEzYNJStPnJ)8Ti8RwbZ+%MKs6ZlPWM#Gf_>@e%EpwJ;kg7Rk$cn1DlxUvyE8QyLr(PK}E0cY? zgOkeQbL-k=-N{wmWm<9+qXo*=LRtS5&?0qcu})}-zR}$pR-T)ze3zzsT&@aSi3(lC z3>CR*Ep-7EyDeJgT9xiPRO$|Bh4Zx1^=g&t(}S*G9K}E9>O)#B3M>+l1cXuYA~8~s$0SjFfj|*KLx*BcYa{@HlQR3fuA8|}lPK2|Rw#{?%4U^vs8k+n zRLEKtu}-C|S2+);k_WYp8r4#(I_lJT7gcI9;%Osx8PUpSJ#V<%@Bza|sMkpz(HRqgCUQ;x$ zE0H&p%$rK*EzMxi>>t+(PG~jnXg%+$iuY8{X*KYHo@7Yd3JUS^mxj^gUJl zV7f1}g&(aUmuTf@+WCbpex;Y+%-J8j&!3#-FFxaMyK%&-u5wuzbA^8xk>jdH3tca# zP{WbYMnoAgS)-I?zjEc#9^1DoL|wWjSdjXk(r)5Lg%PE3#9AosPy|yno_s}8tO=A^ zx2kj-4_jD{+kQwf!G^T>QT`;xSOdeALbOsz&{U>cjxsb2uPms_qQn}zOkS#Wx5Z%= zPg%b9>mE*OHs_SfMa|)N%{4uFiq$;jXuc}6Kz=P$hw}Bd3Uprg>R%PQNENwEEpmBU z>`GMZDpRz?)u_bzwbV7M)V0X#I<(yNsN4m$()Fvt4QjPJrZsLzYl8(D)t*HUndWLj zRl_)KFw3>3d!yN{BVC)AuFYiI(2H&88|>@TV{Db57Hy%!;(kzD>9sKQTNnnk!-CTs zykSPC(pv4>Hp28AarO$5^#U{1PNBu5LLK%hUZTn3641-+Qx|>O8~8H2ZETNK9VAJ; Wfktnc`U0POy`BL)IvSWTbJhRyzWR{> diff --git a/WebRoot/WEB-INF/classes/com/jsh/junitest/AmsTAsset.hbm.xml b/WebRoot/WEB-INF/classes/com/jsh/junitest/AmsTAsset.hbm.xml deleted file mode 100644 index 97f3fad1..00000000 --- a/WebRoot/WEB-INF/classes/com/jsh/junitest/AmsTAsset.hbm.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - 位置 - - - - - 标签：以空格为分隔符 - - - - - 资产的状态：0==在库，1==在用，2==消费 - - - - - 购买价格 - - - - - 购买日期 - - - - - 有效日期 - - - - - 保修日期 - - - - - 资产编号 - - - - - 资产序列号 - - - - - 描述信息 - - - - - 资产添加时间，统计报表使用 - - - - - - - - - - diff --git a/WebRoot/WEB-INF/classes/com/jsh/junitest/common/ExtendsTest.class b/WebRoot/WEB-INF/classes/com/jsh/junitest/common/ExtendsTest.class deleted file mode 100644 index 0fe095252f616b3d624a7da107bc38b6dee504f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 385 zcma)1O-sW-5Pg%TjZLGip1g_(et-*J6)#0kp%+W<+jONHn=I@m>fiDt^w1yRj}m8N zkm9MAH}l@i8{T|6S3?Y1@>9_{r2ZQ;*u8A8m!d&gHAb2{;|U4FueAD#nPJ;7VM( rm!H`CXvQ(4AG3%7W775s_L&h5{>)bmXYIeSzhxvo@M|3MdVtXn?dwl! diff --git a/WebRoot/WEB-INF/classes/com/jsh/junitest/common/ForTest.class b/WebRoot/WEB-INF/classes/com/jsh/junitest/common/ForTest.class deleted file mode 100644 index 090889996dffb192b0a15b4047a2a11757cb16fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 760 zcmah`%Wl(95Ir}x<0QDWxJhXXp)I8)X#-Xg!Gb_GmAY~flB-A&tDE4qPGh@r91wec zgcTb$umA~(egGfCCs58c5#lAWnfIJIGxO!!r*i-;+%b_8SR2NnGn$+@qiGbR{v>r6 z2;<1vkCQ{XCUk-2Ea@C2GW1`>$*H3k4SKdQU*#i=X)=Xee4RkQbPD zgUEk84F`U5CMX|!6c0+wjB+wCHjv1(%F_pX~1Eu1xj8#O@{t{ppI+J-gZ~@k`uxBY#>LA|DZJKIn;vM*!hUU zyDVLzRA~lriPDjbo7CLR9oBxdYzGh$X`ntX7^$ok?xx4)b#`%3+>%M`# zVpLlP?{T&90o7NUs8;mX7hmbyn+&L_8r0O)46TSVy)DjeP~YSHN1UvftY<598Bt8i l*kRQ+8EtWu+o*B1I^#>oU9dE7LYOQOnIvn0U1oD=di5BzNZKLS#ZxlR^kcOTynksz_%d7=w|KAwedM2DRu1vQ58p?@a!SHV>0~ z_Srw*+2`APpO60Yo8JLw#rq0;0-I8HCNi8KiVPPl(=qZ+go2E1MdF#PopbIVO&RGP ziWLL|ZX4E*>yfl>4Mw{AhmDjY5Hh63A>A1g2q)(DlTOaG24ey%I&3TN=$6x~rwc|9 zA%W_B(MZNVZW@te$F`5A^8$eZ-O;(>IVd=0I&x6Y(mIqh2QA$x!riu|(Gumu zWb6SW9m(2}_I%!OVteQ**p^D0JmMY!e{)MOV|GwUL0I5(E^Iey!n8(=f&F@Zi1Agd z!fFk*s1~SfbB#lwx&{?h60K<&U4=})k?Ya>(?l3f*eN~TtLIF)c7-bZSj}M0kjZnl z%p&}hbW6ZlJ#Xw|UKFeo*lgzpBYIX(4H-O_85zpwk46f4Bj+7;e=^zmu$>#}x9t%H z>&s^{?MSDYHsV&c;P6HaJ)@!tcgQns6sT=pn!=V|6^;0!)Yv3&dr5v*M_)ZBvxbU3JgVTx!V7R4gNDcO zIP-U0Hihn^l8fZclJ=n@i93S$x`3~#NiO;|q%gp8)U#Q`;>Wh-IK0GB3200rJ*r_4 zvRg^ox?m(;w>vGqol+B%frmAWNUNY@ds4{{^2m~fRN>M<9yhDu7)Z%V<5)qLoozvl zc}+9cazygQ(NMr~=3q$Ace&JHUpf-RC_Bs4wb!SwzA*LV#N;#Ar(S(d0{DhJ`8NgD zESISA`GWX1`7n9*6^ZUUlB64hcuJu0@2{PnI)8TR@~P>!CnjIKFm>U~-zJKaA3QyI z<3>}|&Fm@Z|Ma4SmI43IgsONJXBC_gSX-_V*>JjSr_(N219E(19n-cnJSXd=+D%l_ z(NiNmIX%U3@Llq9S#a_0dGOB3Am`_mV!V6Sbr9cUn%yxpef5p0D<90Jttp7_laWnR zm#lIz?9CN<+3#dOUsO}ev}Lc=@t#em zWVPB$r#o=UbxNmxHZ_6ui(M{m1Jtafrd#?xlOO`J-UT+?(ok}omMgP4qrKp8x~19& z21rz4%7$TEj!~M>6mgQR^B|Vy$CB%$r@5{TQ~#R21>*6?qyEhc1z4`aPH{d z{eN4!rtpDr0OP{C~VfIn^e+SNy3i6hJf=&G0$o*#2@S#~5 zCeVXFQ1c_s?LXrY{Dl^OrOiJ$mn+dqL{EttoDwY@3OjIC?8Nip0k-P{Y_~`8lFPjF zq^wUE_yK-MtTmXy%eX)y)#G1y1wSJ8M*I^O8QV|1f5MOPDo+=~A90x$6+|=6bCN7X z{XTw5dxo2U;3=KM-R?@KMl`{sANggOZRKO(d4qpYR9cD=N;pyWLhxq(97=Gjryg z&&;`VwwM3@d<4KUbZC$Wv%6CLk={&Cq&JsLWaF7^gbn?vWTZ3KznP~R0)#5x8QGPN z^~d+6(t9Gpvo@BA6Vw$6j$28P>l?NZ0&7#sNU z-#9jU;@l4xheyx9aP#$Zw=Nww;o@GA-b~)SzOZ}YaDR{1hAm=6t%X^b%>{}L48)V& zgqr#d4bv7E4{X&@$HiMT{^`3ScCLt>M_7EP-T!Bg`w0eP-nw*neB?D9^?bcNT{Jd) za{TP6u_Nz|9XvdCJkR>*ftPN+`C&1ag%%pIh@fXvTpX?fVMhIQ)K(KsSfU|9sJKH# zEi4rU(FR13`;s~y;1Z4$@CKHc&On0@w20M@-8RL9R1+*=!w&#uO6AcfLSxC znZ1cj53lUW#R&G~#E%S3&Z9o#)CGdn?##xz_H2v|_zj|= znQ=Q)xpY^2eL{4R#oLH3Y!X+2I`G%dT@6UAapSSncoyN2cvKc%fPUV0n=FN!jR>-| zin;}xXN1s1umS{7&O6?4!k5gb?5G{lfDnohs`F<@R1-pX{^*E0D%%{*u~_QD?-;(> z^!1?gGg~ZSwtaJm7q-i7@=DnY$ewZrwKa{d(zK&Z$hTqSWjX^jAE3NKuF^Pi>h_I~ z5FUmbEw8+Q>c){F)Rf;hggLcBna_$F5ZVIPYFHUU!w?o1x&IQ}EEFMBM`vzDU<+2& z$I*OQ1H)y7o*2miw#Eb&_Uqs`$yD#cz2%=Fk$%B@gqdnQiN^fSy4kUEzoJDi+fQVUw7y=avNu|j$dZPN2tDecE9=_po9$FN3v3+tqJ*!DiwOW)%$ zzmvb_Uk>h8rWT#NRXT)+(aaqkl@6i>t^71>lU~LO)?{p#@@Qi%fEeasC2IMdg(p~Zq!)`3Wq6Wv*$d}3UxBKDG_(`{ t0Tq&T8z*6wY$Z>n@SH;EKc0X44~YLAin|p&Qzh@uyKwC`^63&b{R2VwJ%IoK diff --git a/WebRoot/WEB-INF/classes/com/jsh/junitest/common/whileTest.class b/WebRoot/WEB-INF/classes/com/jsh/junitest/common/whileTest.class deleted file mode 100644 index 6e3fbe3007ea4231b0b69e713d4fc38caee96614..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 745 zcmah{-A)rh6#mY(W!rU;QfL8-N4USs;JpmCRE4bo$vz@ zo%_A_sg|LO6|8bwai$6NZXQ;#|2k2T?&(B|uw$b^So;g8Ie7j&Q^8OsWvmk{Asp0k z#|+bC8gIrkE0bq;+I^F8*Tp^D=XHq5L`Flxrgz-FkvymF7(~m(Hg*VQ9dkQem$2&H zgmCUI9@^L=to&mJ7oKU%o|v(Mh(Lo)+bKq(6;1~WCcZ8ZIc(L8nR!14op zaUJ8pthTI5;8|un3uy+UP4mn&TBcJsUR9e`EyzNK!Gu_~U87=ow%M}J$%{eCK0%Li z&!y}-^-TuZ8tpgE8RR3IhfZMCEf4o|{-<`;ZFy#ZK?a5Rg?obk2LjJ@{FkR~(pcV^ zU9-eXT1v+v(Mm1X3@DaxcU-USGl&W*4c8+HyR4wmFmNi~>Yi8@%#8R=0a4{V;Y|JoQ{%;>KXMf!a4zV}mg<=F*bY~D4+~AOf z0hIYtmM^F(BF$kCF&=81 z1P~ekffTeLMHQr^1zFI86jhMt2vSY}p%XwL_p~63D#&Xsh@l5rR6*V%$Z-M)9YF%Q zuLW6FLEdRW9_T@qRgm`x@*x3)?f`*2)Pk(4ASYUoH9g3x3SuKjGXaDyA%U#JV|=Q& zW;pXBy^4))(sWJN01-^guVgLkX;qzqZVWz4s;;9D#&L9`H}!apCJNy JDn1y`{s9ojI4l4F diff --git a/WebRoot/WEB-INF/classes/com/jsh/junitest/json/Channel.class b/WebRoot/WEB-INF/classes/com/jsh/junitest/json/Channel.class deleted file mode 100644 index 9450fbdbb7989ee258b99b00326439473c2ac16f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3647 zcmc(h&r=*l6vw}_><<>k5S9&b)fgip>=0OiU{*miqA}nGNI;BMY1Ob9m!X!OxC~T9 zJ$TWB7d?2L(0Ipy0=%^-QTI~9<*HF+4t#-*QzY-*sYe+%pq;y^saqqSDJRKQCZvGb?SZ& zSp!93b-l`l({}Bq`-#2XbPS~2+q9#0w58^?8uJGF>r!#m-XpJq;;`YjUE$JOw|%GK zweK3p`iC{I;TcHVZO5j;zk7$a4XWFAytYrmrhA7J9D8qtxDE7nzlIbCzT2$S+Vf@=#lYMNMVF3bgl=}hrSLBr=ov3> z(S4V^+fE;P@RW(iQKEBeZp&Fc*xPp6n=;Uanpd}*TQ&ushyr8U-*NX1oKLt)kX5?J zy>T^^G6RZ5Bu)7q{BxyubUf#;Xz;h<@ z=;PV*Ci>CKvvCuqv{@z|leUW{PGNvor%ardt1p-sM1gHHCeBFPB@@Fa7#NN|4l17D zfn*wvzf2Wc7%wXq5y@nwmrUf)Yap{P-Gtt&)dRpd0N{Hx0_89tM-9cm4 z#SfT%-%?yyVx+PXBNdexsiee61tmr*Coxhnk;agi7imA0l$cXNh4!;lUIuq$`h0>` zXK6HO%vcZcJDBCOd%$N;Q6B-W(b>xsf)(l; zZ_`ONLcUJtuVNHyn7}%waRZleQ}BHx&kp#2st6umtjb+U+@{K1iOygfhcGQ>9K?*6 zaTv2=#(~U<8HbRAUFEJsnsYQC4%7xw47`SMmevfsNIWvE6&ht&e@FEf+LRJk%L?Ny zZAf3ne6V?uygB??4r4W*ln)5^L!lr+vf-t(;^pwc3wR~aQb9)IAlq7yMasFnMFeCd z4$>fyodghmx(xD~HX@^Okfs*oiasKvagdJ*q@4i5$!Cz)wGkPMgB)r>mh=%Bi-UYh zAfF|G@Y`dMH?$Ec$3Z^Vg1o7ZNI4Gj1%Z5-0K!k7L9XI0`s5y zH!=|i`IV~`c9?`|)t9RsSwfxguOU8ly-6uMEM7)-Vo+1kD%ubin@;~45}9Q6k+>P-c8<2b6)2_@=}g!)qgs%-5lD)%Ce>ZbO= zPsR~{)*`;6fAEv>^xh}52MK80P8noN3o;!C`ArM*t{!AM4)Tyd{zw4f9?l@QD4{95 F_a73zlO_NF diff --git a/WebRoot/WEB-INF/classes/com/jsh/junitest/json/ChannelUtil.class b/WebRoot/WEB-INF/classes/com/jsh/junitest/json/ChannelUtil.class deleted file mode 100644 index eb5c5511ca9162b29ea00954de6a8dfd8be373f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3856 zcma)8>wgs08GcSK>|_}P7KlWIhR7w5m`xS}n8j3xMi)0EvRtYtI@wH;iF@npEQO?0 zZSh`HsrA}wi}%(`rPL*emsVRp^iOJkKkIYO%$al;b$$5}GmKg^=%~jMf#pdnXC5qNhfVviF`O|4BFTK($Q(6nORha( zoilC~1#U`SHIX%jfHfrV}lWy3ig- z4IXqc)X{_+1j3_sKI@~}9?Z-YvY3VK;~H+HxmA#W+-^9AjJQF^kI*cjkC~1PrE(Hz z3;L~qG}o_Ej)&2LO(EPQux3F89h@Z?g=k9&|0k#kU>R z@MF464CSa)l(zeH?3cD-Wvj#*ZfE6*p?xDGwpmnK{W|W%T?9#K9kDZuWKRDFxD5*o zCSgqK7{EbpQ^J_YEmm$Kj3FEf;U0mNRmiAsj+wSZA;s>U&9L`TRewasQ5<7c%xy@4 z+8C_dSCzHj%L)p1-pQx)8Cm>s9rydd4S8}6Cz!BRuvIHOgy9g3SzPvK@&>s~W5nlD zNftq*Ka7VkDytZil=KG~RCcNcOUDErc567qz;oDh6=ek+H6bfEXy;1=cq{Tc3bFuM z`{C0Cb17^%A#j#mSDgrQ80aYBB)5w(!mMXCoxi{DlRNH|j?&qmayAHDKW~J%TU|g{{4tW|m|0JG?L1{KQGpt(AkciZ z$;h6WJ?aUMH|}F|lDvi~E3ho(80m)xjDqK6P4yV)lShdQkw7BYd>%k^PlCk)1{`s+ zYj}=f)6%&=TtoQH;>Tq*i!i3;RQoL(Lz$0HO3CkZyeKz{-0CXQ_@suHxz&}^m#;ED>3gW8QOULas;TUmn@enm^c+YgRt(6IoZr`hoUu@pf(Rdw98heHj}m?y0+ityJ39Q{PnIR2SJ^M*9ppXRxb` z9wq4wNN!V-K1#~CL%k=;xO)bJWgJ$^p9GZeQ<4Xi@+>N(<)wwGc+RC_2ABC=Zmb9SFE`xE z$Y;s68GL>$^5p;<{U67wo2-$}fjg+y&m!+)vI%zI0hM&KYmBe)4RvZcI%OyEd}3e8 OLTdQ_FMg@PzrP1lTJeMc diff --git a/WebRoot/WEB-INF/classes/com/jsh/junitest/json/IPStream.class b/WebRoot/WEB-INF/classes/com/jsh/junitest/json/IPStream.class deleted file mode 100644 index 1a6e2e1a1871edce7f1f9dfc0927400ba9aa98fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2167 zcmaKsT~pIQ6oyYq+msRn+JfIADq28^)(=n+`Os=4qa6!ec%z}jl1`g2X>imT{Y^Tf zOZ3QyU9!8kQ zA*ScHmlP-*_+H?(ysiRcvDN0j=Lfi)GaB1Iu9f0zf$y-`>;Z}tD96?eH?Z5bkCEBn z;{onlFdFYXzh|LNH5xAd?cIfN#Sqe7MwR=kwtbyb5wD54s@j@6a8BNvlpfw*|_D@i|IelonS z!4PPuB{;4fPq=X@+2tI*t`aG0+jzn?Y8=_#)?gS;V8e)$X(!^Yk(6x7ZVMYtVT&4! zPwHAcHN=7G8|pAdAcqzg+>GT%RvD$bQkJ}2-^$5FvCH~SM#eq*xJ_{_7(JeIEQZv zoQDheOa_04$*)3iO&UA}m%`u`%pgNs&CdOR$>XhyY<2;2U1SauTorClXp}!uUxq6Z zkZBQQSqgFusxpvi5o8TP)>A;J0R%Dwvl5Uw5u`2!xdHPskU0@#6G6-r5S=wiftzqk z0#Xw}8d8uua90LW6G65SWG4lLjv!U!p0qU!BFJkg$bETh7DSLY2=X=sgzf-=JdlDc zi6DDYkcV=RB@x6ykWLE7N(k~u3bHDKxKfaHImoIA(npXW1!N-xc??gmF5>mAiy$AQ dAkV-EgA>=cE`oeUkS{49^ckYoJZB$_&3^;jJ!Jp@ diff --git a/WebRoot/WEB-INF/classes/com/jsh/junitest/json/JsonTest.class b/WebRoot/WEB-INF/classes/com/jsh/junitest/json/JsonTest.class deleted file mode 100644 index df2ada5de7b397896306ede6a41e5a075687c1ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1273 zcmaJ=T~8B16g|@xcd3gl<+FTL5In*Zk_mdJU1AG~X*#oW@0mO2oICUD{PZV)alBXHV~Ay}qMmp5^?cbhT;aI1 zuuOfKh7DRN2rzV4b9&C^MR8==2fEBGaz`*+n>A?L9D_fe*klMST3Hc%JkIOs z)%0#&WZWP^Xjak2(BxV!F9gwnE(M(ot$BXP^#V8d^rY#EJz;C;MwCH0zThFS7pGj;=#E6Db+^3%LQc0LuhQ3Cn z4aG_C5OfU>@KBm=)shVD@p?gCeHD+$6i0ke@t8c%@q$CQAcjc|Q+P@#o~7d&n0Zzt zc2rPT1GaVKG~*ebE1=61u2X#MxT2`x1?H)aC4KLxnQU148oA*T2f>Tg{^&ux#FBzn z3~kjCjTjBDr9(M zE4<|0>)^UowliYMkT<{O;!%xBZWsg!qL&Ex=!;$pjS8)Fni(A+{Rh8q`~S(pknQS8$hLfa>3O^rk%Vf6>vE9lueLyTerEB?8!Sn>eVfoLEy zc!r_v$ek11>#tzAf-#Av_;@uw(HI|%1}b>6_1Vw*!@)0qPDdisqZ0oevm+HORIn&X z`yok>6GaeZmF9LL+lL70ZpSb^$OUv_2VLM4%OeUKJ@|;;s=$ew2v4AjGTtCbLi-54 pjJM=i3@Q4p&^g1H#42S2NYhy%_|7q?AfzD1e$ycgYZUh3-CtkTBe(zn diff --git a/WebRoot/WEB-INF/classes/com/jsh/junitest/spring/SpringTest.class b/WebRoot/WEB-INF/classes/com/jsh/junitest/spring/SpringTest.class deleted file mode 100644 index c02fb541c82782242d09b5036667d5211d1bf3ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 429 zcmah_%SyvQ6g@Xh8yln1R>ZB+MOARXZHt?NtKg=k8&}gfwiEM^Nm9SdmEgh;=tqfn zLO~J1#oWg^_spC-o6q+T0M|J3;1JH@A`?lu5=ouwN|lu;pN-C!V%nq`BOYABNyCdr zBQy0aNZf%FN^o)&cgo>tY`vBUXIL$Ij7j R;oygmaDc;Ru*cCs{|i{@Tm1k4 diff --git a/src/com/jsh/action/materials/DepotHeadAction.java b/src/com/jsh/action/materials/DepotHeadAction.java index 4205c95e..9a16de8d 100644 --- a/src/com/jsh/action/materials/DepotHeadAction.java +++ b/src/com/jsh/action/materials/DepotHeadAction.java @@ -15,12 +15,9 @@ import org.springframework.dao.DataAccessException; import com.jsh.base.BaseAction; import com.jsh.base.Log; -import com.jsh.exception.AmsException; -import com.jsh.model.po.Basicuser; import com.jsh.model.po.Building; import com.jsh.model.po.Depot; import com.jsh.model.po.DepotHead; -import com.jsh.model.po.DepotItem; import com.jsh.model.po.Logdetails; import com.jsh.model.po.Person; import com.jsh.model.po.Supplier; diff --git a/src/com/jsh/junitest/AmsTAsset.hbm.xml b/src/com/jsh/junitest/AmsTAsset.hbm.xml deleted file mode 100644 index 97f3fad1..00000000 --- a/src/com/jsh/junitest/AmsTAsset.hbm.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - 位置 - - - - - 标签：以空格为分隔符 - - - - - 资产的状态：0==在库，1==在用，2==消费 - - - - - 购买价格 - - - - - 购买日期 - - - - - 有效日期 - - - - - 保修日期 - - - - - 资产编号 - - - - - 资产序列号 - - - - - 描述信息 - - - - - 资产添加时间，统计报表使用 - - - - - - - - - - diff --git a/src/com/jsh/junitest/common/ExtendsTest.java b/src/com/jsh/junitest/common/ExtendsTest.java deleted file mode 100644 index 4a043e3a..00000000 --- a/src/com/jsh/junitest/common/ExtendsTest.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jsh.junitest.common; - -import junit.framework.TestCase; - -public class ExtendsTest extends TestCase -{ - public void testExtends() - { - } -} diff --git a/src/com/jsh/junitest/common/ForTest.java b/src/com/jsh/junitest/common/ForTest.java deleted file mode 100644 index 7c8bef84..00000000 --- a/src/com/jsh/junitest/common/ForTest.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.jsh.junitest.common; - -import junit.framework.TestCase; - -public class ForTest extends TestCase -{ - public void testrrr() - { - String[] aa= {"111","222","333"}; - for(String str:aa) - System.out.println(str); - System.out.println("bbb"); - } -} diff --git a/src/com/jsh/junitest/common/ImportExcelTest.java b/src/com/jsh/junitest/common/ImportExcelTest.java deleted file mode 100644 index 284651ff..00000000 --- a/src/com/jsh/junitest/common/ImportExcelTest.java +++ /dev/null @@ -1,156 +0,0 @@ -package com.jsh.junitest.common; - -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.Map; - -import org.apache.poi.hssf.usermodel.HSSFSheet; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.Row; - -import com.jsh.model.po.Asset; - -public class ImportExcelTest -{ - - /** - * 文件路径 - */ - private static final String excelPath = "D:/movie/qq.xls"; - - /** - * 解析后的data - */ - private static Map data = new LinkedHashMap(); - - - /** - * 解析数据格式 - */ - public static void paseData() - { - int total = 0; - try - { - //创建对Excel工作簿文件的引用 - HSSFWorkbook workbook = new HSSFWorkbook(new FileInputStream(excelPath)); - //创建对工作表的引用,获取第一个工作表的内容 - HSSFSheet sheet = workbook.getSheetAt(0); - /** - * ===================================== - * 1、此处要增加报盘文件的验证，如果不是报盘文件需要进行特殊的处理,3列 - * 2、报盘文件内容为空处理 - * 3、如果是修改过的报盘文件内容 - */ - Iterator itsheet = sheet.rowIterator(); - while(itsheet.hasNext()) - { - System.out.println(); - Row row = itsheet.next(); - - //excel表格第几行数据 从1开始 0 是表头 - int rowNum = row.getRowNum(); - /** - * 表头跳过不读 - */ - if(0 == rowNum) - continue; - total ++; - Iterator it = row.cellIterator(); -// PreAuthExcelTip preAuth = new PreAuthExcelTip(); -// preAuth.setAuthState(authState); -// preAuth.setWrongRow(rowNum); - Cell cell = null; - String preAuthMacAddr = ""; - //判断行号 - int i = 0; - while(it.hasNext()) - { - cell = it.next(); - i = cell.getColumnIndex(); - - System.out.print(cell.getCellType() + " " + cell.getStringCellValue()); - if(1 == i) - { - String contentValue = cell.getStringCellValue(); - if(null == contentValue || "".equals(contentValue)) - break; -// preAuth.setSnNo(cell.getStringCellValue()); - } - if(2 == i) - { - String contentValue = cell.getStringCellValue(); - if(null == contentValue || "".equals(contentValue)) - break; - preAuthMacAddr = contentValue; -// preAuth.setMacAddr(PreAuthUtil.changeMacFormt(preAuthMacAddr)); - } - } - System.out.println("此行总共有" + i + "列"); - //报盘文件为3列，否则不是报盘文件 -// if(i != 2) -// { -// PreAuthUtil.showMessageDialog("导入文件格式不合法，请重新选择文件进行操作！"); -// return null; -// } -// //MAC地址合法添加到正确的MAC地址数组 -// if(PreAuthUtil.isMacAddress(preAuthMacAddr)) -// { -// if(allMacAddress.contains(preAuthMacAddr)) -// { -// repeatPreAuth.add(preAuth); -// } -// else -// { -// allMacAddress.add(preAuthMacAddr); -// rightPreAuth.add(preAuth); -// } -// } -// else -// { -// wrongPreAuth.add(preAuth); -// } - } - -// if((null==rightPreAuth || rightPreAuth.size()==0)&& (null == wrongPreAuth|| wrongPreAuth.size() ==0)&&(null == repeatPreAuth ||repeatPreAuth.size() ==0)) -// { -// PreAuthUtil.showMessageDialog("报盘文件内容为空，请重新选择！"); -// return map; -// } -// //处理完读取文件，返回处理结果 -// map.put("rightMacAddr", rightPreAuth); -// map.put("wrongMacAddr", wrongPreAuth); -// map.put("repeatMacAddr", repeatPreAuth); - } - catch (FileNotFoundException e) - { - System.out.println("预授权读取文件异常 : " + e ); - e.printStackTrace(); -// PreAuthUtil.showMessageDialog("预授权读取excel文件异常:找不到指定文件！"); -// return map; - } - catch (IOException e) - { - System.out.println("预授权读取文件IO异常 : " + e ); - e.printStackTrace(); -// PreAuthUtil.showMessageDialog("读取excel文件异常，请确认文件格式是否正确！"); -// return map; - } - - System.out.println("excel表格总共有 " + total + " 条记录!"); - } - - /** - * @param args - */ - public static void main(String[] args) - { - // TODO Auto-generated method stub - new ImportExcelTest().paseData(); - } - -} diff --git a/src/com/jsh/junitest/common/SumTest.java b/src/com/jsh/junitest/common/SumTest.java deleted file mode 100644 index 7556abbf..00000000 --- a/src/com/jsh/junitest/common/SumTest.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.jsh.junitest.common; - -import junit.framework.TestCase; - -public class SumTest extends TestCase -{ - public void testSum() - { - //================宋芳==================== - int[] songfang = {6,6,6,-4,-4,-6,3,12,6,-6,6,-12,3,-6,12}; - int songfangSum = 0; - int songying = 0; - int songshu = 0; - for(int i = 0 ;i < songfang.length;i ++) - { - songfangSum += songfang[i]; - if(songfang[i] > 0) - songying ++; - else - songshu ++; - } - - System.out.println("宋芳斗地主局数：" + songfang.length + ",赢" + songying + "局，输" + songshu +"局,统计玩牌的计分是：" + songfangSum); - //================宋芳==================== - - //===============王维======================== - int[] wangwei = {-3,-3,-3,8,2,12,-6,-6,6,3,-3,6,-6,3,-6}; - int wangweiSum = 0; - int wangweiying = 0; - int wangweishu = 0; - for(int i = 0 ;i < wangwei.length;i ++) - { - wangweiSum += wangwei[i]; - if(wangwei[i] > 0) - wangweiying ++; - else - wangweishu ++; - } - System.out.println("王维斗地主局数：" + wangwei.length + ",赢" + wangweiying + "局，输" + wangweishu +"局,统计玩牌的计分是：" + wangweiSum); - //===============王维======================== - - //===============王鹏======================== - int[] wangpeng = {-3,-3,-3,-4,2,-6,3,-6,-12,3,-3,6,3,3,-6}; - int wangpengSum = 0; - int wangpengying = 0; - int wangpengshu = 0; - for(int i = 0 ;i < wangpeng.length;i ++) - { - wangpengSum += wangpeng[i]; - if(wangpeng[i] > 0) - wangpengying ++; - else - wangpengshu ++; - } - System.out.println("王鹏斗地主局数：" + wangwei.length + ",赢" + wangpengying + "局，输" + wangpengshu +"局,统计玩牌的计分是：" + wangpengSum); - //===============王鹏======================== - - int[] jishenghua={3,-6,2,5,-9,4,7,-8,-6,-1,4}; - int jishenghuaSum=0; - int jishenghuaYing=0; - int jishenghuaShu=0; - for(int i=0;i0) - jishenghuaYing++; - else - jishenghuaShu++; - } - System.out.println("季圣华斗地主局数："+jishenghua.length+",赢"+jishenghuaYing+"局，输"+jishenghuaShu+"局,统计玩牌的计分是："+jishenghuaSum); - } -} diff --git a/src/com/jsh/junitest/common/whileTest.java b/src/com/jsh/junitest/common/whileTest.java deleted file mode 100644 index 088c9eb7..00000000 --- a/src/com/jsh/junitest/common/whileTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.jsh.junitest.common; - -import net.sf.json.JSONArray; -import junit.framework.TestCase; - -public class whileTest extends TestCase -{ - public void testWhile() - { - int i = 0; - for(;;i ++) - { - while(i == 10) - System.out.println("aa" + i); - break; - } - } -} diff --git a/src/com/jsh/junitest/json/CableStream.java b/src/com/jsh/junitest/json/CableStream.java deleted file mode 100644 index 365e81e4..00000000 --- a/src/com/jsh/junitest/json/CableStream.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.jsh.junitest.json; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class CableStream implements Serializable -{ - /** - * ID - */ - private Long id; - - /** - * 频点频率 - */ - private Integer cablehz; - - /** - * 符号率 - */ - private Integer symbolrate; - - /** - * 调制方式 - */ - private Integer cableMode; - - /** - * 传输编号 - */ - private Integer transNum; - - /** - * 服务编号 - */ - private Integer serviceNum; - - /** - * 码率 - */ - private Float rate; - - /** - * 规格 - */ - private Short cablenorms; - - public Long getId() - { - return id; - } - - public void setId(Long id) - { - this.id = id; - } - - public Integer getCablehz() - { - return cablehz; - } - - public void setCablehz(Integer cablehz) - { - this.cablehz = cablehz; - } - - public Integer getSymbolrate() - { - return symbolrate; - } - - public void setSymbolrate(Integer symbolrate) - { - this.symbolrate = symbolrate; - } - - public Integer getCableMode() - { - return cableMode; - } - - public void setCableMode(Integer cableMode) - { - this.cableMode = cableMode; - } - - public Integer getTransNum() - { - return transNum; - } - - public void setTransNum(Integer transNum) - { - this.transNum = transNum; - } - - public Integer getServiceNum() - { - return serviceNum; - } - - public void setServiceNum(Integer serviceNum) - { - this.serviceNum = serviceNum; - } - - public Float getRate() - { - return rate; - } - - public void setRate(Float rate) - { - this.rate = rate; - } - - public Short getCablenorms() - { - return cablenorms; - } - - public void setCablenorms(Short cablenorms) - { - this.cablenorms = cablenorms; - } -} \ No newline at end of file diff --git a/src/com/jsh/junitest/json/Channel.java b/src/com/jsh/junitest/json/Channel.java deleted file mode 100644 index 3eeeba37..00000000 --- a/src/com/jsh/junitest/json/Channel.java +++ /dev/null @@ -1,185 +0,0 @@ -package com.jsh.junitest.json; - -import java.io.Serializable; -import java.util.List; - -@SuppressWarnings("serial") -public class Channel implements Serializable -{ - /** - * 频道ID - */ - private Long id; - - /** - * 频道名称 - */ - private String channelName ; - - /** - * 分类 - */ - private Long category; - - /** - * 台标路径 - */ - private String tvLogo; - - /** - * 地区 - */ - private Long area; - - /** - * 频道类型 0==直播 1==虚拟 - */ - private Short type; - - /** - * json字符串 - */ - private String ipStreamJson; - - /** - * ip流列表 - */ - private List ipStream; - - /** - * json字符串 - */ - private String cableStreamJson; - - /** - * cable流列表 - */ - private List cableStream; - - - public Channel() - { - super(); - } - - - - public Channel(String channelName, Long category, String tvLogo, - Long area, Short type, String ipStreamJson, - List ipStream, String cableStreamJson, - List cableStream) - { - super(); - this.channelName = channelName; - this.category = category; - this.tvLogo = tvLogo; - this.area = area; - this.type = type; - this.ipStreamJson = ipStreamJson; - this.ipStream = ipStream; - this.cableStreamJson = cableStreamJson; - this.cableStream = cableStream; - } - - - - public Long getId() - { - return id; - } - - public void setId(Long id) - { - this.id = id; - } - - public String getChannelName() - { - return channelName; - } - - public void setChannelName(String channelName) - { - this.channelName = channelName; - } - - public Long getCategory() - { - return category; - } - - public void setCategory(Long category) - { - this.category = category; - } - - public String getTvLogo() - { - return tvLogo; - } - - public void setTvLogo(String tvLogo) - { - this.tvLogo = tvLogo; - } - - public Long getArea() - { - return area; - } - - public void setArea(Long area) - { - this.area = area; - } - - public Short getType() - { - return type; - } - - public void setType(Short type) - { - this.type = type; - } - - public List getIpStream() - { - return ipStream; - } - - public void setIpStream(List ipStream) - { - this.ipStream = ipStream; - } - - public List getCableStream() - { - return cableStream; - } - - public void setCableStream(List cableStream) - { - this.cableStream = cableStream; - } - - public String getIpStreamJson() - { - return ipStreamJson; - } - - public void setIpStreamJson(String ipStreamJson) - { - this.ipStreamJson = ipStreamJson; - } - - public String getCableStreamJson() - { - return cableStreamJson; - } - - public void setCableStreamJson(String cableStreamJson) - { - this.cableStreamJson = cableStreamJson; - } -} diff --git a/src/com/jsh/junitest/json/ChannelUtil.java b/src/com/jsh/junitest/json/ChannelUtil.java deleted file mode 100644 index 16bbb540..00000000 --- a/src/com/jsh/junitest/json/ChannelUtil.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.jsh.junitest.json; - -import java.util.ArrayList; -import java.util.List; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -public class ChannelUtil -{ - /** - * 解析页面json字符串为IPStream对象列表 - * @param ipStreamStr json字符串 - * @return IPStream对象列表 - */ - public static List parseJson2IPStream(String ipStreamStr) - { - List ipList = new ArrayList(); - JSONArray ipJson = JSONObject.fromObject(ipStreamStr).getJSONArray("ipJsonData"); - if(null != ipJson) - { - for(int i = 0;i < ipJson.size(); i ++) - { - JSONObject tempJson = JSONObject.fromObject(ipJson.get(i)); - IPStream ip = new IPStream(); - ip.setIPformat(Short.parseShort(tempJson.getString("ipFomate"))); - ip.setIPnorms(Short.parseShort(tempJson.getString("IPnorms"))); - ip.setIPUrl(tempJson.getString("IPAddress")); - ip.setPort(tempJson.getInt("port")); - ip.setProtocol(Short.parseShort(tempJson.getString("protocol"))); - ip.setRate(Float.parseFloat(tempJson.getString("iprate"))); - ip.setType(Short.parseShort(tempJson.getString("inOrout"))); - ipList.add(ip); - } - } - return ipList; - } - - /** - * 解析页面json字符串为cableStream对象列表 - * @param cableStreamStr json字符串 - * @return cableStream对象列表 - */ - public static List parseJson2CableStream(String cableStreamStr) - { - List cableList = new ArrayList(); - JSONArray cableJson = JSONObject.fromObject(cableStreamStr).getJSONArray("cableJsonData"); - if(null != cableJson) - { - for(int i = 0;i < cableJson.size(); i ++) - { - JSONObject tempJson = JSONObject.fromObject(cableJson.get(i)); - CableStream cable = new CableStream(); - cable.setCablehz(tempJson.getInt("cablehz")); - cable.setCableMode(tempJson.getInt("cableMode")); - cable.setCablenorms(Short.parseShort(tempJson.getString("cablenorms"))); - cable.setRate(Float.parseFloat(tempJson.getString("cablerate"))); - cable.setServiceNum(tempJson.getInt("serviceNum")); - cable.setSymbolrate(tempJson.getInt("symbolrate")); - cable.setTransNum(tempJson.getInt("transNum")); - cableList.add(cable); - } - } - return cableList; - } - - public static void main(String[] args) - { - String ipStreamStr = "{ipJsonData : [{\"iprate\":\"512.00\",\"IPnorms\":\"0\",\"ipFomate\":\"0\",\"inOrout\":\"0\",\"port\":\"512\",\"IPAddress\":\"11.03.12.23\",\"protocol\":\"0\",\"ipJsonIndex\":0}]}"; - ChannelUtil.parseJson2IPStream(ipStreamStr); - - String cableStreamStr = "{cableJsonData:[{\"cablenorms\":\"0\",\"cablerate\":\"54\",\"serviceNum\":\"45\",\"transNum\":\"57\",\"cableMode\":\"64\",\"symbolrate\":\"56\",\"cablehz\":\"45\",\"cableJsonIndex\":0},{\"cablenorms\":\"0\",\"cablerate\":\"548\",\"serviceNum\":\"236\",\"transNum\":\"256\",\"cableMode\":\"64\",\"symbolrate\":\"56\",\"cablehz\":\"85\",\"cableJsonIndex\":1}]}"; - ChannelUtil.parseJson2CableStream(cableStreamStr); - } -} diff --git a/src/com/jsh/junitest/json/IPStream.java b/src/com/jsh/junitest/json/IPStream.java deleted file mode 100644 index 53a86fa0..00000000 --- a/src/com/jsh/junitest/json/IPStream.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.jsh.junitest.json; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public class IPStream implements Serializable -{ - /** - * ID - */ - private Long id; - - /** - * 协议 - */ - private Short protocol; - - /** - *IP地址 - */ - private String IPUrl; - - /** - * 端口 - */ - private Integer port; - - /** - * 类型--输入输出 0==输入 1==输出 - */ - private Short type; - - /** - * 视频格式 - */ - private Short IPformat; - - /** - * 视频规格 0==标清 1==高清 - */ - private Short IPnorms; - - /** - * 码率 - */ - private Float rate; - - public Long getId() - { - return id; - } - - public void setId(Long id) - { - this.id = id; - } - - public Short getProtocol() - { - return protocol; - } - - public void setProtocol(Short protocol) - { - this.protocol = protocol; - } - - public String getIPUrl() - { - return IPUrl; - } - - public void setIPUrl(String iPUrl) - { - IPUrl = iPUrl; - } - - public Integer getPort() - { - return port; - } - - public void setPort(Integer port) - { - this.port = port; - } - - public Short getType() - { - return type; - } - - public void setType(Short type) - { - this.type = type; - } - - public Short getIPformat() - { - return IPformat; - } - - public void setIPformat(Short iPformat) - { - IPformat = iPformat; - } - - public Short getIPnorms() - { - return IPnorms; - } - - public void setIPnorms(Short iPnorms) - { - IPnorms = iPnorms; - } - - public Float getRate() - { - return rate; - } - - public void setRate(Float rate) - { - this.rate = rate; - } -} diff --git a/src/com/jsh/junitest/json/JsonTest.java b/src/com/jsh/junitest/json/JsonTest.java deleted file mode 100644 index 14dfb052..00000000 --- a/src/com/jsh/junitest/json/JsonTest.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.jsh.junitest.json; - -import junit.framework.TestCase; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -public class JsonTest extends TestCase -{ - public void testJson() - { - JSONObject outer = new JSONObject(); - outer.put("total", 8); - JSONArray json = new JSONArray(); -// {"total":28,"rows":[ -// {"productid":"AV-CB-01","attr1":"Adult Male","itemid":"EST-18"} -// ]} - - for(int i = 0 ;i < 10 ;i ++) - { - JSONObject jo = new JSONObject(); - jo.put("name", "andy" + i); - jo.put("sex", "false" + i); - json.add(jo); - } - outer.put("rows", json); - System.out.println(outer.toString()); - } -} diff --git a/src/com/jsh/junitest/spring/SpringTest.java b/src/com/jsh/junitest/spring/SpringTest.java deleted file mode 100644 index 9f1cae78..00000000 --- a/src/com/jsh/junitest/spring/SpringTest.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.jsh.junitest.spring; - -import junit.framework.TestCase; - -public class SpringTest extends TestCase -{ - public static void main(String[] args) - { - -// @SuppressWarnings({ "unchecked", "rawtypes" }) -// public BaseService() -// { -// // //加载 已经加载过的 spring配置文件内容 -// // WebApplicationContext wac = -// // ContextLoader.getCurrentWebApplicationContext(); -// // // wac.getBean(beanID); -// // ApplicationContext factory = new -// // ClassPathXmlApplicationContext("spring/*-applicationContext.xml"); -// // ApplicationContext factory = new ClassPathXmlApplicationContext(new -// // String[]{"spring/basic-applicationContext.xml", -// // "spring/dao-applicationContext.xml"}); -// // this.baseDao = (BaseIDAO) factory.getBean("baseDao"); -// // // this.baseDao = -// // ((BaseIDAO)BeanFactoryUtil.getBeanByClassPathAndBeanName("spring/dao-applicationContext.xml", -// // "baseDao")); -// BeanFactoryUtil util = BeanFactoryUtil.getInstance(); -// -// this.baseDao = ((BaseIDAO) util.getBean("baseDao")); -//// ApplicationContext factory = new ClassPathXmlApplicationContext(new -//// String[]{"spring/basic-applicationContext.xml", -//// "spring/dao-applicationContext.xml"}); -//// this.baseDao = (BaseIDAO) factory.getBean("baseDao"); -// Class c = getEntityClass(); -// setPoJoClass(c); -// } - } -}