bXw`4#*%!$6T0Xjee zRoZuc`%hqQv;(r78Ow)YeX9~42}d^XNIqd;N-;Ctr=UV^SE2mtD&tE%$4_oEF1S6( zWqtKf6tZ;vtF-?S1dp+xLbX+nrNx{-4WtU_GV&-&D;6vYJR7JLutx)FjEZH2TA1m1 zmvrjb9`_&?HLVI;;a!=`^HE*si2iRIs$&DsuVW2647-i+>{V}Dqjb0FUj5BbY57$@ z?MQPh=plExB8xXHF;xLH_rs9nj+VCSYGM0^ z&gj})rCZZ0ZxcDMGyM4!$@#B@GQ$QD>WDi$IabzP>v}uun@E1H+~i96#VO^gVFkhP zWjK?=rkNdAWwUID^U{qwxNvNN#=9*YQOQP*QC;?hl17-QcjDn4D%)mXeh)sy=Zq&F z-eXuVyYJxx3fi({ i)wpsVVV0;edjjs++A|xavKuBA+N|U-(YP(514aad;kHn4~XBzv* zkU)ZW{wTyHsc6u|3la}J 8s2`qJ|#K0P =&2^#0}^(o0iXu?XqrWcOgW+3D0_88wsbn8s*C zV18n-*>3j^_J?)2iMoji<6Nf-4>a>eDrw&mxYXJ>Bv5VZK-AzafraTAcZ|`d4y&Z{ z{6HCz= _S76XX080%3EfE|HOrE;^paqC})a~iu*97--NP10Bx zJSY~{q}*yli#}*=P?^wF1!5!>CNV+=*DMWf+1jOhX<{=5tteAj)`jDeOQ%t^5amo| zXY>XAb;VXwM(xK~{J%yHtiW0mZoxW%<<`Z)$(nAVi}$miM!qmZhJBPxnC2`zWJYFq zqO97nObGbhe?9y-&CWolhKr8OvRV1VBaydS4W9h=QWVw1Vce5Rf=|N`%a_0!;Dq4= zHiI{D86|-lq6*XzJ0(1ec&>!!5igeT6~tFd_!{EtC42)t6V%;Cc?ToBz^DZO&KFpD mw{-6l&~JI%`zW(40KW$)n}roTghx65IF~JWivKEd8$SW#NtufP literal 0 HcmV?d00001 diff --git a/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/controller/BizBidSharedRecordController.class b/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/controller/BizBidSharedRecordController.class new file mode 100644 index 0000000000000000000000000000000000000000..4fb7070b4b3e14e941b5371d45bbdefbcf172f54 GIT binary patch literal 6426 zcmeHLZBraY5bix*77h{!nxIKEn-~=|-kCBcRt`}PgQ8190inu|b9)nRlD*w^b{0we zIsOQ%v`WAGqb#4 nd$E7?&&}O`t^4rx *?rPI=a{yv}w?y$rQzB!B+J_<1zP?MHdBl?whsF<+kv+MVH;>exAFdHH$8- zC4mxcz8q|eSTuaT5CoxON`ygdQQ2MNahOPtgY>+pvzRY3uf-q6Ty_wqflx4j8Ds83 zqQV~qc8agzIS~joZ_&Wa?50J7i(!-7G-=U9cT4xA4CM$-Sz|XJ1`^o*Hg7tRV 7b;_d~E$%eA=W9_q5%Zp~E$& >BdoMy;l z2SRY#OnEIw0fg^FkaQjdN(W;RRP@?0{kb5sorrc6O68;s6D54dV_FwZgFAbY=p)>D zAw;3vGVysSNuXAfT>eWWA~db`#1wD?s_TdfU>p@X%u!DxULIYDgn?p>|B!&=3X38U z6xm*$-Euqfg(s8~ClQx$20^T3;;B$NnFpMibwunWL6bic0S@USjNm^@e3hrJI4eo4 z^a!XN7U)x*G0w3pkM4Oq!xj$qs)mUjmuR3XbgG6qko*J4DD#y4?jtYN)$pkD*UlY6 zi6D1wz;^`%d^m1@FfvS7WvaEwq+oFS2GVsU&E^Cdtuo1qPIg{CyCzx>n@ o6Hx8 zQGL!j&+XW|HVC~udUE?aWgDr7q0e#p4j0&|Yss)aH#GaLqO8ck_V{+vm-!hGPHZ~!qv_!>Lhou2$;muZ4tAE$9Tk6eAm?IzWkTde7%d%{KRyPvch zTyAKGYSEM%dd%N*u)CduswI&AKXL!HyAAFK_7+z k-af!$bX{x( zOeGQ<+c*)EIae=Xt_W?uHV=riZr;w(F|^J61bAoMTu4R#_5C-iH0p50WzQAsteX#T zm{-;SDJ?!mBr+v^f71MOAqhjan+BfR2+dffr6b&y^6NG@iQG;Mlz9ahNM9ufxtm;% z=Q^$rHwgXYF2tfM`>l2ZDSeN@4h!Ug5~uX-nVwV9e;Q{GCBPZWJT{Ki2vw}oPyYiO zewDoJt4KVb9Us^5|FPr+)u|+EG6g?=z1M29B3!?5SC2rJH*t%`-PKOo1B<_9SwFvE zi|?>Ecw&S9=+WuRo>d_rucsBzC85)$tNm$6w=R+v15u*YRnuI#1i^Yp2X(ZAiftjW z(iHg$NX@1>7)V|(Hlb2Fo=3CkOQdW0p3F9Fsv{fN^-MN>h3v1ec3{&IYQ+a1A)CIz z0(F$O>D!({bCy72IV&QLal_UzA*QQ@QZ5SNCH#hH7+*HNbUTvvj#4?-H-^4Je2>!^ zywBq67G_&$%fHdY_fzM7q1XOM=Uu>Cb0Iv_c#mgP^aj0|_Fbe);B*=POY|02L3FN! z*8shP_q%xB!?OpV7nlLOUjT5U0ALm~rfJ{;766920Z-j%wibOrA9m1hr05e`3`N*_ zRT=h21=x2F!Nx?5jYeam$*`;RaR>WmialmQ2z%Ijd+y?XQh=5T5OiT#{B>tJRm*uC;2Sa0h}2O(_^r45TWy7JMme?#5*6-R`ls32px| zK|$aBqr}-uw5f?ki$3JInaqAO-#0sRU%r0$1ON}=o(EG54l)x4iI6Hd6g?4yItjv# zRHCb-drw3h2iUS{fJYWp6tv_?OGa5o7>o>t+C)JlbWoQkbs6pE?pL{cN2Dnl4`vuF z=FqWF?chc05JStLxE01yNxRKpx>DU|F!NYP=s}6W!fEsqW3(y49GgCPtqf*5?qS5K zu2jatO09TmbSuUr+vMfaUI%%EVeCrdsR-YRHu80f_J &kG@ zp8z$K#WtD=D*ZF0G8Ey$JY0kY28FG`U@ljhr=!?sR&%4e(3A?Fcas*HJwemQV5zA? z5$_8lojq`RZL~3Un!!q?Ioh6Dwdw9bjX`Nwww175LrC|36S_4HWt#xzC{z8o5jE6X z&0up(+0B8TwI46labOHKUUij~2{u$uW|GL{5~D@)$jxHDbTS5BGxt;O*`A2IRQTG@ z2lr?;&YUUl>aGd#sdS31jtbJBwS18 0DV7^5)G8xkQQ2n_jWA*7 z*n=C?q|uZf+$8mea6Pz1 |K2DHrS(*pD? z!YmZX_Q<+B@RmP9@y$~CJ r3WM9ecWwNirHF}?cmE5yB X_~$yTk?pX7ZfyZLtiuM}rc9M@>hCPa literal 0 HcmV?d00001 diff --git a/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/dao/mapper/BizBidSharedRecordMapper.xml b/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/dao/mapper/BizBidSharedRecordMapper.xml new file mode 100644 index 0000000..ed9b47a --- /dev/null +++ b/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/dao/mapper/BizBidSharedRecordMapper.xml @@ -0,0 +1,66 @@ + + + + + \ No newline at end of file diff --git a/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/entity/BizBidSharedRecord.class b/bin/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/entity/BizBidSharedRecord.class new file mode 100644 index 0000000000000000000000000000000000000000..285db3456f05d01f244b48465ffa6f59e70d3df1 GIT binary patch literal 8485 zcmeHNNpl-T6n+ + ++ + + + + + + + + + + + + + + + select id,record_id, record_role, record_name, record_staff,record_account, create_by, + create_date, update_by, update_date,tenant_id,tenant_name,last_update_time, delete_flag from biz_bid_shared_record + + + + + + + + ++ update biz_bid_shared_record + set + delete_flag="deleted" + where ID=#{id,jdbcType=BIGINT} + +Q8JkTGAhCok2?1|O6yzjWwnG8|Mx(aX$t=n&uGm!^ zIB?*=fdd!*2vtx8cm553fa2>OX-0}W9w}0iOI$UQy64T;?|uE=>+U!H=f6MxBBBo| z%+QcVU-_O{v<>bQ?-*M~(RA&iS?7)sI$Zp=4a+LBYS1XM`vG%m#VX&a@|s^aJXZ6V z>3X#ya{?Z07w7rTJg-&cofUZ}L&F+PN?gluHjCG)cbFNV%V!=ptaax3+;!GUiyCQH zG@4j&9X~LfVBN4nHUcHZpQh0euW7WeTy~w!a~d6A2{E9}O3oJddDUWbj^hSK04QIh zsq$QdFS|8nUH9Au^MY+WGO{HQHOfXBmjE|aPV}k-9+%K#(ft+IVt~Sk+z;^hXoYV& zMi6>{I3_#K?|%9M1jov&p5gc$jG#4MUNxZJMb506P=ehDoJP51khpQxuz}qiz7iN4 z8=xbSn=?%p25XctL(c;;^eLB|fNe4lsM&_G$trvYkLNa7u+Wkj%g?q+4KIL^485$; zfyC@3&vU&jy{gfrHOFJVYi+Tbj#+PTOVX(~JQoJoXZ74@b41-V1lxL*>G2bRs~dW- z-C(&K&Cu)Pl&4v+cb+>uxS-MD{BE*l*P%(7JM3y`SD7by5_963a0>&@fnl4S!$F;6 zGH#b2qoabyoZm*?cs}M%XgUUBug5fxK{9EL;GXcOEcliVnx*$OT1+QY2=C1%Tn0l4 z@X>sP-BM;nhL^Z=2*V~b+H~YB!Jv!jDn#OGN(g(C0Vm>?h!TzV!~W=QGioFeQQVvm zoZzQ2TCz0X9ZvvAQ*nQXQt%c*n9xBGb~5^{R6^XJ=&+!@9Ytkganw#MZU$;Hdb49P zMvQ|ODX&RW+;tFA6`2UPqC^;SOz3m@*(+JPuF-Vr{2|8Jz0j~=Z%2$pY4+UgEx1RU zb6mqP9 O4w*1l>Hlq=O7FE=d!e}W&hoKbYG+d;dgt_%rg;no*Z4RGu>uE z-L2_$!>^0%oS)U*4Vgyu-7BeXhlm2VIfJ_E>D+E0Gh;bG?)5{t&^20^PjG7542hjy zMgh#(@LXFDV5wLeR7QDh1D>yA{SZ<%_kB2EBps!uTsu)QelvmwG(s0%tTOV6EAfbW zik$UynG);5)74;*4*B$_q0<|i8@@gXZtm{X@m8w!iQWq4N90a!Ec#SI>;?vv7CR@P zZ+65+@Im5R`^!G9j;FO}<_GLnJ&!+V0v3%RWv`;qsRs|1t5~->4wqS+ewM_R3;X@n zx-GYCC3FOC HVX5#3xF~eO4|>`<(IavOyYhC9@K}Pm zb$IGCm|I!2Q{&|9^_b!PKJlXr+^PJ4vy1?*G1C&YDZOEscX4LdXHd{6w3W09qNG(2 zC9OhK(kkpOX%(W9){I_rnXij_hiwFAU2ap^{RWCy?E|1N0Z{G~M3yV`F %n!bBTA&=nL>*4^iXH9Fg zRZmP2ljSOrSX1QY4WBK^ifM{qR2$$sq864S+ETGq@=Os=FFnOZcZnF~rj%jh+Gv_w zTs2J*6e%S|q$|aGr0*GK3h7 L(fDNT~r%i*j*ZtSyvS6#TE~>t+8?( z*l3NIb!29s#IFUUNF1zaO&DR|t}s8ef@PzDT3X35@hSnng;n4(XP)7i_3aFCpd`VY zp}Q!_H!aPOt #|*jR7q;{nx`$T)?LnL&RO;GZheUn^q2;LZA-0=7O%pbdc<+&; zV>Ckh(8{1SL|I%p8bf;=ZP7m=`w!6MuD<7K3epGV{X _mJKdsnYKMOwz^th)?;kr)U$ f(skO#7V1dnic%v;=CO^Q8 zQ+B1wg;PfJ(wa2KqI%53=I#J_hBEgF@>0n6qK|x?yrT(Tk>?e8UeSnGG|ej-^IGSb z!HR3+cp;n|a7PjFup|bP5vY!Ys&wQNkNzdzh=VFhV;!&2hEC;N3hi@9k^ij0FOC%P zZ(X__QQ`QhPQl>LaKYVCiD7g4iO;!^sLGw=^2eC}--QqwaB&eXL5sos_PC{2Hj qe5O2&wX-Kc{VNzeoT$iX z2(**Q?mIKZm9CaXS40@Kd#=z5D+fmb+@a!4Cl x4!4E+kr|l?9Mv52+9unK}Io~<{axVV-_5DWxxC6H=C=du@ jpovKn&NF!_;H&l?knzv%6DR}dcxz5=tP0DD&DRNzme>( zCHsy3b{%&uC=!@X3 wV-`hR5jg3l5&L^f1m@PdQi~3+%btiu zGvN263^mgtlre$*?!B%KUkmgUW%n%$Df9|~iTQ;M0>%5G&n-AWVCuU+50na338qN# z%QLBX90on^Q{*8ML4ryn6{49=e3w?r>upYb?gfSl8Zqw`YjIjbX?ui0+c0Pw2JJqB zcA7zZz@TjytWiJYF~xJx4%1$nYBa;&L`c-A8T@SsEu?L{w}0Dc|1@YnRGKD`T`dCY zF+(VAayn$=2f PNhQRE+`@IS_ zv=XwlWUAzpD Zy7IBPq%7j@A=KwEucP) zOu{}KEu5LLgyRH`WvJkLKdx>kYk `6F} g77B1-aDt25RxaW9%lH7?#HWh<&BG#G1skq^1C}e*_W%F@ literal 0 HcmV?d00001 diff --git a/bin/src/main/resources/application-dev.yml b/bin/src/main/resources/application-dev.yml new file mode 100644 index 0000000..7d976f2 --- /dev/null +++ b/bin/src/main/resources/application-dev.yml @@ -0,0 +1,194 @@ +server: + port: 18018 + servlet: + context-path: / + +# 对应 apollo 配置中心的应用名 +app: + id: biz-service-ebtp-extend + +# Apollo 配置信息 +apollo: + meta: http://10.242.31.158:6001/ + bootstrap: + namespace: application + enabled: true + eagerLoad: + enabled: true + +spring: + aop: + auto: true #开启spring的aop配置 + proxy-target-class: true + + application: + name: biz-service-ebtp-extend + + shardingsphere: + datasource: + names: ds0 + ds0: + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + username: root + password: root + jdbc-url: jdbc:mysql://10.242.31.158:3033/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:mysql://10.242.31.158:3033/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + filters: stat,wall,log4j + maxActive: 20 + initialSize: 1 + maxWait: 60000 + minIdle: 1 + timeBetweenEvictionRunsMillis: 60000 + minEvictableIdleTimeMillis: 300000 + validationQuery: select 'x' + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + poolPreparedStatements: true + maxOpenPreparedStatements: 20 + connection-properties: druid.stat.merggSql=ture;druid.stat.slowSqlMillis=5000 + props: + sql: + show: true + + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + serialization: + write-dates-as-timestamps: false + + # 天宫Kafka增加了安全认证,需要配置安全属性 + kafka: + bootstrap-servers: 10.125.164.192:32005,10.125.164.193:32005,10.125.164.194:32005 + template: + default-topic: jl_test + + # 生产者配置参数 + producer: + client-id: core-service-ebtp-crypt + properties: + security.protocol: SASL_PLAINTEXT + sasl.mechanism: SCRAM-SHA-256 + sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="jltest" password="Unicom#123"; + + # 消费者配置参数 + consumer: + group-id: core-service-ebtp-crypt-consumer + auto-offset-reset: latest + properties: + security.protocol: SASL_PLAINTEXT + sasl.mechanism: SCRAM-SHA-256 + sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="jltest" password="Unicom#123"; + + # 天宫 redis 需要使用哨兵进行访问 + redis: + sentinel: + master: eshop-redis + nodes: 10.125.164.124:32718, 10.125.164.118:32716, 10.125.164.121:32716 + password: Unicom#135 + + lettuce: + # jedis: + pool: + maxTotal: 50 + minIdle: 1 + maxWaitMillis: 5000 + maxIdle: 5 + testOnBorrow: true + testOnReturn: true + testWhileIdle: true + token: + database: 0 + host: 125.32.114.204 + port: 16379 + password: redis@CC1234 + timeout: 6000 + uuid: + database: 1 + host: 125.32.114.204 + port: 16379 + password: redis@CC1234 + timeout: 6000 + cache: + database: 2 + host: 125.32.114.204 + port: 16379 + password: redis@CC1234 + timeout: 6000 + +# 天宫Eureka配置 +eureka: + client: + service-url: + defaultZone: http://10.242.31.158:5001/eureka,http://10.242.31.158:5002/eureka,http://10.242.31.158:5003/eureka + instance: + prefer-ip-address: true + hostname: ${spring.cloud.client.ip-address} + instance-ip: ${spring.cloud.client.ip-address}:${server.port} + +mybatis-plus: + configuration: + # 是否开启自动驼峰命名规则映射:从数据库列名到Java属性驼峰命名的类似映射 + map-underscore-to-camel-case: true + auto-mapping-behavior: full + # 这个配置会将执行的sql打印出来,在开发或测试的时候可以用 + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + mapper-locations: classpath*:com/chinaunicom/mall/ebtp/**/mapper/*Mapper.xml + global-config: + # 逻辑删除配置 + db-config: + # logic-delete-field: flag # 全局逻辑删除的实体字段名(since 3.3.0,配置后可以忽略不配置步骤2) @TableLogic + logic-delete-value: deleted # 逻辑已删除值 + logic-not-delete-value: normal # 逻辑未删除值 + +# --------------feign ------------ +feign: + httpclient: + enabled: false + okhttp: + enabled: true + client: + config: + default: + connect-timeout: 20000 + read-timeout: 20000 + +hystrix: + command: + default: + execution: + timeout: + enabled: true + isolation: + strategy: SEMAPHORE + thread: + timeoutInMilliseconds: 200000 #熔断超时时间 + circuitBreaker: + sleepWindowInMilliseconds: 20000 + forceClosed: true +ribbon: + ReadTimeout: 20000 #请求处理的超时时间 + ConnectTimeout: 20000 #请求连接超时时间 + MaxAutoRetries: 0 #对当前实例的重试次数 + MaxAutoRetriesNextServer: 1 #切换实例的重试次数 1 + +mconfig: + workerId: 1 + datacenterId: 1 + remote: + approval: true #是否需要提交公告审批 + media: true #是否需要发送到媒体 + + #中国联通电子商城外网接入平台 相关参数 + token: + userName: zbgg + password: eip_13579 + file-wjpt-storage-path: http://111.198.162.67:8081/enr/api/base/file/cgDownload/ #测试地址 + #获取file地址 + file: + address: http://125.32.114.204:8760/api/core-service-ebtp-updownload/v1/download/oid/ + #提交审批相关字段 + approve: + wfSectionNo: 002 + wfSectionName: 采购审批 diff --git a/bin/src/main/resources/application.yml b/bin/src/main/resources/application.yml new file mode 100644 index 0000000..caf4dfc --- /dev/null +++ b/bin/src/main/resources/application.yml @@ -0,0 +1,3 @@ +spring: + profiles: + active: dev \ No newline at end of file diff --git a/bin/src/main/resources/file.conf b/bin/src/main/resources/file.conf new file mode 100644 index 0000000..d591bab --- /dev/null +++ b/bin/src/main/resources/file.conf @@ -0,0 +1,66 @@ +transport { + # tcp udt unix-domain-socket + type = "TCP" + #NIO NATIVE + server = "NIO" + #enable heartbeat + heartbeat = true + # the client batch send request enable + enableClientBatchSendRequest = true + #thread factory for netty + threadFactory { + bossThreadPrefix = "NettyBoss" + workerThreadPrefix = "NettyServerNIOWorker" + serverExecutorThread-prefix = "NettyServerBizHandler" + shareBossWorker = false + clientSelectorThreadPrefix = "NettyClientSelector" + clientSelectorThreadSize = 1 + clientWorkerThreadPrefix = "NettyClientWorkerThread" + # netty boss thread size,will not be used for UDT + bossThreadSize = 1 + #auto default pin or 8 + workerThreadSize = "default" + } + shutdown { + # when destroy server, wait seconds + wait = 3 + } + serialization = "seata" + compressor = "none" +} +service { + #transaction service group mapping + vgroupMapping.biz-service-ebtp-expenses-fescar-service-group = "default" + #only support when registry.type=file, please don't set multiple addresses + default.grouplist = "127.0.0.1:8091" + #degrade, current not support + enableDegrade = false + #disable seata + disableGlobalTransaction = false +} + +client { + rm { + asyncCommitBufferLimit = 10000 + lock { + retryInterval = 10 + retryTimes = 30 + retryPolicyBranchRollbackOnConflict = true + } + reportRetryCount = 5 + tableMetaCheckEnable = false + reportSuccessEnable = false + } + tm { + commitRetryCount = 5 + rollbackRetryCount = 5 + } + undo { + dataValidation = true + logSerialization = "jackson" + logTable = "undo_log" + } + log { + exceptionRate = 100 + } +} \ No newline at end of file diff --git a/bin/src/main/resources/logback.xml b/bin/src/main/resources/logback.xml new file mode 100644 index 0000000..62285f5 --- /dev/null +++ b/bin/src/main/resources/logback.xml @@ -0,0 +1,89 @@ + + + + diff --git a/bin/src/main/resources/registry.conf b/bin/src/main/resources/registry.conf new file mode 100644 index 0000000..bd724ed --- /dev/null +++ b/bin/src/main/resources/registry.conf @@ -0,0 +1,79 @@ +registry { + # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa + type = "eureka" + + nacos { + application = "seata-server" + serverAddr = "localhost" + namespace = "" + username = "" + password = "" + } + eureka { + serviceUrl = "http://10.242.31.158:5001/eureka,http://10.242.31.158:5002/eureka,http://10.242.31.158:5003/eureka" + weight = "1" + } + redis { + serverAddr = "localhost:6379" + db = "0" + password = "" + timeout = "0" + } + zk { + serverAddr = "127.0.0.1:2181" + sessionTimeout = 6000 + connectTimeout = 2000 + username = "" + password = "" + } + consul { + serverAddr = "127.0.0.1:8500" + } + etcd3 { + serverAddr = "http://localhost:2379" + } + sofa { + serverAddr = "127.0.0.1:9603" + region = "DEFAULT_ZONE" + datacenter = "DefaultDataCenter" + group = "SEATA_GROUP" + addressWaitTime = "3000" + } + file { + name = "file.conf" + } +} + +config { + # file、nacos 、apollo、zk、consul、etcd3、springCloudConfig + type = "file" + + nacos { + serverAddr = "localhost" + namespace = "" + group = "SEATA_GROUP" + username = "" + password = "" + } + consul { + serverAddr = "127.0.0.1:8500" + } + apollo { + appId = "seata-server" + apolloMeta = "http://192.168.1.204:8801" + namespace = "application" + } + zk { + serverAddr = "127.0.0.1:2181" + sessionTimeout = 6000 + connectTimeout = 2000 + username = "" + password = "" + } + etcd3 { + serverAddr = "http://localhost:2379" + } + file { + name = "file.conf" + } +} diff --git a/src/main/resources/seata.conf b/bin/src/main/resources/seata.conf similarity index 100% rename from src/main/resources/seata.conf rename to bin/src/main/resources/seata.conf diff --git a/bin/src/main/resources/swagger-configuration.properties b/bin/src/main/resources/swagger-configuration.properties new file mode 100644 index 0000000..6624bf1 --- /dev/null +++ b/bin/src/main/resources/swagger-configuration.properties @@ -0,0 +1,7 @@ +unifast.swagger.basePackage=com.chinaunicom.mall.ebtp.extend +unifast.swagger.title=\u6d4b\u8bd5\u63a5\u53e3\u6587\u6863 +unifast.swagger.contactName=\u5409\u6797\u9879\u76ee\u7ec4 +unifast.swagger.contactUrl=http://chinaunicom.com +unifast.swagger.contactEmail=chinaunicom@chinaunicom.com +unifast.swagger.version=0.0.1 +unifast.swagger.description=\u7840\u540e\u53f0\u529f\u80fd\u6846\u67b6 \ No newline at end of file diff --git a/deployment-gz.yaml b/deployment-gz.yaml index ae3756b..cf47903 100644 --- a/deployment-gz.yaml +++ b/deployment-gz.yaml @@ -29,6 +29,9 @@ spec: labels: # 模板名称 app: biz-service-ebtp-extend + annotations: + prometheus.io/port: '18018' + prometheus.io/jl-pod: 'true' # 定义容器模板,该模板可以包含多个容器 spec: @@ -71,6 +74,8 @@ metadata: app: biz-service-ebtp-extend annotations: lb.cke.tg.unicom/target-vports: 18018-18018 + prometheus.io/port: '18018' + prometheus.io/jl-svc: 'true' spec: ports: - port: 18018 diff --git a/pom.xml b/pom.xml index f696803..c947128 100644 --- a/pom.xml +++ b/pom.xml @@ -20,13 +20,7 @@+ + + ${logback.appname} + + ++ + + ++ ++ +%d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{50} - %msg%n ++ + + ++ + + +ERROR + +DENY + +ACCEPT +${logback.logdir}/info.${logback.appname}.log + ++ + + +${logback.logdir}/info.${logback.appname}.%d{yyyy-MM-dd}.log + +3 + +true + + ++ +UTF-8 +%d [%thread] %-5level %logger{64} %line - %msg%n ++ + + + ++ + +Error +${logback.logdir}/error.${logback.appname}.log + ++ + + +${logback.logdir}/error.${logback.appname}.%d{yyyy-MM-dd}.log + +3 + +true + + ++ +UTF-8 +%d [%thread] %-5level %logger{128} %line - %msg%n ++ + ++ + + + com.chinaunicom.mall.ebtp uboot-core -0.0.2-SNAPSHOT -- +- -com.chinaunicom.ebtp -mall-ebtp-cloud-security-starter -0.0.1-SNAPSHOT @@ -34,49 +28,45 @@ -mall-ebtp-cloud-attachment-sdk - - -com.chinaunicom.ebtp -mall-ebtp-cloud-eureka-starter -- -com.chinaunicom.ebtp -mall-ebtp-cloud-feign-starter -- com.chinaunicom.ebtp mall-ebtp-cloud-apollo-starter - com.chinaunicom.ebtp -mall-ebtp-cloud-jpa-starter -+ mysql mysql-connector-java - - org.apache.shardingsphere sharding-jdbc-spring-boot-starter - - -com.chinaunicom.ebtp -mall-ebtp-cloud-seata-starter -- - -com.chinaunicom.ebtp -mall-ebtp-cloud-swagger-starter -- +com.chinaunicom.ebtp -mall-ebtp-cloud-redis-starter -+ + +com.deepoove +poi-tl +1.9.1 ++ + +org.apache.poi +poi +4.1.2 ++ + +org.apache.poi +poi-ooxml +4.1.2 ++ +org.apache.poi +poi-ooxml-schemas +4.1.2 +@@ -89,6 +79,7 @@ diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java index 4cdccbc..0468653 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java @@ -1,14 +1,19 @@ package com.chinaunicom.mall.ebtp.extend; -import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; +import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.cloud.netflix.eureka.EnableEurekaClient; import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; +import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; + +import io.micrometer.core.instrument.MeterRegistry; + @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, DruidDataSourceAutoConfigure.class @@ -22,5 +27,10 @@ public class BizServiceEbtpExtendApplication { public static void main(String[] args) { SpringApplication.run(BizServiceEbtpExtendApplication.class, args); } + + @Bean + public MeterRegistryCustomizertrue +always configurer() { + return (registry) -> registry.config().commonTags("application", "biz-service-ebtp-extend"); + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/controller/BizBidNoticeController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/controller/BizBidNoticeController.java index 5266a1a..73a2cf2 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/controller/BizBidNoticeController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/controller/BizBidNoticeController.java @@ -25,7 +25,7 @@ import io.swagger.annotations.ApiParam; @RestController @Api(tags = "通知公告管理") -@RequestMapping("/api/biz-service-ebtp-extend/v1/bizbidnotice") +@RequestMapping("/v1/bizbidnotice") public class BizBidNoticeController { @Resource @@ -126,7 +126,7 @@ public class BizBidNoticeController { */ @ApiOperation("发布数据") @PostMapping("/fabu/{id}") - public BaseResponse fabu(@ApiParam(value = "主键id", required = true) @PathVariable Long id) { + public BaseResponse fabu(@ApiParam(value = "主键id", required = true) @PathVariable String id) { return BaseResponse.success(ibizBidNoticeService.fabu(id)); } @@ -140,7 +140,7 @@ public class BizBidNoticeController { */ @ApiOperation("发布数据") @PostMapping("/qxfabu/{id}") - public BaseResponse qxfabu(@ApiParam(value = "主键id", required = true) @PathVariable Long id) { + public BaseResponse qxfabu(@ApiParam(value = "主键id", required = true) @PathVariable String id) { return BaseResponse.success(ibizBidNoticeService.qxfabu(id)); } @@ -154,7 +154,7 @@ public class BizBidNoticeController { */ @ApiOperation("置顶数据") @PostMapping("/top/{id}") - public BaseResponse top(@ApiParam(value = "主键id", required = true) @PathVariable Long id) { + public BaseResponse top(@ApiParam(value = "主键id", required = true) @PathVariable String id) { return BaseResponse.success(ibizBidNoticeService.top(id)); } @@ -168,7 +168,7 @@ public class BizBidNoticeController { */ @ApiOperation("取消置顶数据") @PostMapping("/qxtop/{id}") - public BaseResponse qxtop(@ApiParam(value = "主键id", required = true) @PathVariable Long id) { + public BaseResponse qxtop(@ApiParam(value = "主键id", required = true) @PathVariable String id) { return BaseResponse.success(ibizBidNoticeService.qxtop(id)); } @@ -182,7 +182,7 @@ public class BizBidNoticeController { */ @ApiOperation("查询数据") @GetMapping("/select/{id}") - public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable Long id) { + public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id) { return BaseResponse.success(ibizBidNoticeService.getById(id)); } @@ -195,7 +195,7 @@ public class BizBidNoticeController { */ @ApiOperation("删除数据") @PostMapping("/delete/{id}") - public BaseResponse delete(@ApiParam(value = "主键id", required = true) @PathVariable Long id) { + public BaseResponse delete(@ApiParam(value = "主键id", required = true) @PathVariable String id) { return BaseResponse.success(ibizBidNoticeService.deleteOff(id)); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/BizBidNoticeMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/BizBidNoticeMapper.java index de94fd2..0cb0f3b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/BizBidNoticeMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/BizBidNoticeMapper.java @@ -10,7 +10,7 @@ import com.chinaunicom.mall.ebtp.extend.bizbidnotice.entity.BizBidNotice; public interface BizBidNoticeMapper extends IBaseMapper { - public int deleteOff(Long id); + public int deleteOff(String id); public List getList(@Param("noticeTitle")String noticeTitle,@Param("noticeName") String noticeName, @Param("createDate")LocalDateTime createDate,@Param("noticeRelease") String noticeRelease, @Param("pageIndex") Integer getPageNo,@Param("pageSize") Integer pageSize); @@ -20,11 +20,11 @@ public interface BizBidNoticeMapper extends IBaseMapper { public List getAllListByTitle(@Param("noticeTitle")String noticeTitle,@Param("pageIndex") Integer getPageNo,@Param("pageSize") Integer pageSize); - public Boolean fabu(@Param("id")Long id); + public Boolean fabu(@Param("id")String id); - public Boolean qxfabu(@Param("id")Long id); + public Boolean qxfabu(@Param("id")String id); - public Boolean top(@Param("id")Long id); + public Boolean top(@Param("id")String id); - public Boolean qxtop(@Param("id")Long id); + public Boolean qxtop(@Param("id")String id); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/mapper/BizBidNoticeMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/mapper/BizBidNoticeMapper.xml index 8f15396..186091e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/mapper/BizBidNoticeMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/dao/mapper/BizBidNoticeMapper.xml @@ -77,28 +77,28 @@ where notice_id=#{notice_id} limit #{pageIndex},#{pageSize} - + update biz_bid_notice set notice_release="open" where id=#{id} -+ update biz_bid_notice set notice_release="close" where id=#{id} -+ update biz_bid_notice set notice_top="0" where id=#{id} -+ update biz_bid_notice set notice_top="1" @@ -125,7 +125,7 @@ -+ update biz_bid_notice set delete_flag="deleted" diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/entity/BizBidNotice.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/entity/BizBidNotice.java index 504084d..132d7a5 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/entity/BizBidNotice.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/entity/BizBidNotice.java @@ -29,7 +29,7 @@ public class BizBidNotice extends BaseEntity implements Serializable { */ @ApiModelProperty(value = "ID") @TableId(value = "id", type = IdType.AUTO) - private Long id; + private String id; /** * @@ -93,11 +93,11 @@ public class BizBidNotice extends BaseEntity implements Serializable { this.pageSize = pageSize; } - public Long getId() { + public String getId() { return id; } - public void setId(Long id) { + public void setId(String id) { this.id = id; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/IBizBidNoticeService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/IBizBidNoticeService.java index 899eb57..3f7c76e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/IBizBidNoticeService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/IBizBidNoticeService.java @@ -13,7 +13,7 @@ import com.chinaunicom.mall.ebtp.extend.bizbidnotice.entity.BizBidNotice; */ public interface IBizBidNoticeService extends IBaseService { - public int deleteOff(Long id); + public int deleteOff(String id); public List getlist(BizBidNotice bizBidNotice); @@ -23,11 +23,11 @@ public interface IBizBidNoticeService extends IBaseService { public List getAllListByTitle(BizBidNotice bizBidNotice); - public Boolean fabu(Long id); + public Boolean fabu(String id); - public Boolean qxfabu(Long id); + public Boolean qxfabu(String id); - public Boolean top(Long id); + public Boolean top(String id); - public Boolean qxtop(Long id); + public Boolean qxtop(String id); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/impl/BizBidNoticeServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/impl/BizBidNoticeServiceImpl.java index 236b7a6..89496a6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/impl/BizBidNoticeServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidnotice/service/impl/BizBidNoticeServiceImpl.java @@ -23,7 +23,7 @@ public class BizBidNoticeServiceImpl extends BaseServiceImpl get(@ApiParam(value = "主键id", required = true) @PathVariable Long id){ + public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id){ BizBidShared bizBidShared = ibizBidSharedService.getById(id); @@ -112,7 +112,7 @@ public class BizBidSharedController{ */ @ApiOperation("删除数据") @PostMapping("/delete/{id}") - public BaseResponse delete(@ApiParam(value = "主键id", required = true) @PathVariable Long id) { + public BaseResponse delete(@ApiParam(value = "主键id", required = true) @PathVariable String id) { return BaseResponse.success(ibizBidSharedService.deleteOff(id)); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/dao/BizBidSharedMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/dao/BizBidSharedMapper.java index d27607d..7bac004 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/dao/BizBidSharedMapper.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/dao/BizBidSharedMapper.java @@ -15,5 +15,7 @@ public interface BizBidSharedMapper extends IBaseMapper { List getList(@Param("sharedName")String sharedName, @Param("sharedRole")String sharedRole,@Param("LocalDateTime") LocalDateTime localDateTime,@Param("pageIndex") Integer current,@Param("pageSize") Integer pageSize); + int deleteOff(String id); + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/dao/mapper/BizBidSharedMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/dao/mapper/BizBidSharedMapper.xml index 8d7b42b..3710820 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/dao/mapper/BizBidSharedMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/dao/mapper/BizBidSharedMapper.xml @@ -45,7 +45,7 @@ - + update biz_bid_shared set delete_flag="deleted" diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/entity/BizBidShared.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/entity/BizBidShared.java index aa58d8b..539b70c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/entity/BizBidShared.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/entity/BizBidShared.java @@ -35,7 +35,7 @@ public class BizBidShared extends BaseEntity implements Serializable { */ @ApiModelProperty(value = "ID") @TableId(value = "id", type = IdType.AUTO) - private Long id; + private String id; /** * @@ -95,11 +95,11 @@ public class BizBidShared extends BaseEntity implements Serializable { this.pageSize = pageSize; } - public Long getId() { + public String getId() { return id; } - public void setId(Long id) { + public void setId(String id) { this.id = id; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/IBizBidSharedService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/IBizBidSharedService.java index cb429ff..01997a5 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/IBizBidSharedService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/IBizBidSharedService.java @@ -13,7 +13,7 @@ import com.chinaunicom.mall.ebtp.extend.bizbidshared.entity.BizBidShared; */ public interface IBizBidSharedService extends IBaseService { - public int deleteOff(Long id); + public int deleteOff(String id); public List getlist(BizBidShared bizBidNotice); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/impl/BizBidSharedServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/impl/BizBidSharedServiceImpl.java index 966d372..3096908 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/impl/BizBidSharedServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidshared/service/impl/BizBidSharedServiceImpl.java @@ -23,7 +23,7 @@ public class BizBidSharedServiceImpl extends BaseServiceImpl > getList(@PathVariable("id") String id,@ApiParam(value = "对象数据", required = true)@RequestBody @Valid BizBidSharedRecord bizBidShared){ + public BaseResponse > getList(@PathVariable("id") String id, + @ApiParam(value = "对象数据", required = true) @RequestBody @Valid BizBidSharedRecord bizBidShared) { bizBidShared.setRecordId(id); return BaseResponse.success(ibizBidSharedRecordService.getlist(bizBidShared)); } - + /** * 插入新数据 * * @param bizBidSharedRecord - * + * * @return */ @ApiOperation("插入新数据") @PostMapping("/add") - public BaseResponse
insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid BizBidShared bizBidShared){ - Long userId = iBaseCacheUserService.getCacheUser().getUserId(); - BizBidSharedRecord bizBidSharedRecord=new BizBidSharedRecord(); + public BaseResponse insert( + @ApiParam(value = "对象数据", required = true) @RequestBody @Valid BizBidShared bizBidShared) { + BizBidSharedRecord bizBidSharedRecord = new BizBidSharedRecord(); bizBidSharedRecord.setId(null); - bizBidSharedRecord.setCreateBy(userId); bizBidSharedRecord.setRecordId(bizBidShared.getId().toString()); boolean save = ibizBidSharedRecordService.save(bizBidSharedRecord); - + return BaseResponse.success(save); } - + /** * 修改数据 * * @param bizBidSharedRecord - * + * * @return */ @ApiOperation("修改数据") @PutMapping("") - public BaseResponse update(@ApiParam(value = "对象数据", required = true) @RequestBody BizBidSharedRecord bizBidSharedRecord){ + public BaseResponse update( + @ApiParam(value = "对象数据", required = true) @RequestBody BizBidSharedRecord bizBidSharedRecord) { return BaseResponse.success(ibizBidSharedRecordService.saveOrUpdate(bizBidSharedRecord)); } - } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/dao/mapper/BizBidSharedRecordMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/dao/mapper/BizBidSharedRecordMapper.xml index ed9b47a..a7c42e2 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/dao/mapper/BizBidSharedRecordMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/dao/mapper/BizBidSharedRecordMapper.xml @@ -57,7 +57,7 @@ - + update biz_bid_shared_record set delete_flag="deleted" diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/entity/BizBidSharedRecord.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/entity/BizBidSharedRecord.java index 9a1937a..ea4fa88 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/entity/BizBidSharedRecord.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizbidsharedrecord/entity/BizBidSharedRecord.java @@ -31,7 +31,7 @@ public class BizBidSharedRecord extends BaseEntity implements Serializable { * */ @ApiModelProperty(value = "ID") - private Long id; + private String id; /** * @@ -94,11 +94,11 @@ public class BizBidSharedRecord extends BaseEntity implements Serializable { this.pageSize = pageSize; } - public Long getId() { + public String getId() { return id; } - public void setId(Long id) { + public void setId(String id) { this.id = id; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEarlyWarn.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEarlyWarn.java new file mode 100644 index 0000000..4f84e02 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEarlyWarn.java @@ -0,0 +1,71 @@ +package com.chinaunicom.mall.ebtp.extend.export.bean; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * + * 有效供应商少于3家提醒说明 + *
+ * + * @author dino + * @since 2021-01-14 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="BidEarlyWarn对象", description="有效供应商少于3家提醒说明") +@TableName(value = "biz_rsms_bid_early_warn",autoResultMap = true) +public class BidEarlyWarn extends BaseEntity implements Serializable { + + private static final Long serialVersionUID = 1L; + + @TableId + @ApiModelProperty(value = "编号") + @JsonSerialize(using = ToStringSerializer.class) + private String id; + + @ApiModelProperty(value = "是否继续:1是0否") + @TableField(value = "is_continue") + private Integer continueStatus; + + @ApiModelProperty(value = "说明") + private String remarks; + + @ApiModelProperty(value = "附件ID") + private String fileId; + + @ApiModelProperty(value = "项目id") + @JsonSerialize(using = ToStringSerializer.class) + private String projectId; + + @ApiModelProperty(value = "标包id") + @JsonSerialize(using = ToStringSerializer.class) + private String sectionId; + + @ApiModelProperty(value = "评审室Id") + @JsonSerialize(using = ToStringSerializer.class) + private String assessRoomId; + + @ApiModelProperty(value = "评审室序号") + private Integer assessRoomSort; + + @ApiModelProperty(value = "轮次ID") + @JsonSerialize(using = ToStringSerializer.class) + private String reviewTurnId; + + @ApiModelProperty(value = "轮次数") + private Integer reviewTurnSort; + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalDetail.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalDetail.java new file mode 100644 index 0000000..0505d1b --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalDetail.java @@ -0,0 +1,179 @@ +package com.chinaunicom.mall.ebtp.extend.export.bean; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + *+ * 评标详细评审表 + *
+ * + * @author dino + * @since 2020-11-19 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="BidEvalDetail对象", description="评标详细评审表") +@TableName(value = "biz_rsms_bid_eval_detail",autoResultMap = true) +public class BidEvalDetail extends BaseEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId + @ApiModelProperty(value = "编号") + @JsonSerialize(using = ToStringSerializer.class) + private String id; + + @ApiModelProperty(value = "报名表id(biz_bid_register)") + @JsonSerialize(using = ToStringSerializer.class) + private String supplierRegisterId; + + @ApiModelProperty(value = "评标主表ID(biz_eval_rvw)") + @JsonSerialize(using = ToStringSerializer.class) + private String bidEvalId; + + @ApiModelProperty(value = "评标类别表ID(biz_rsms_bid_eval_category)") + @JsonSerialize(using = ToStringSerializer.class) + private String bidEvalCategoryId; + + @ApiModelProperty(value = "评审配置类别表ID(biz_rsms_review_config_category)") + @JsonSerialize(using = ToStringSerializer.class) + private String categoryId; + + @ApiModelProperty(value = "详审项类别:0:报价;1:商务;2:技术;4:工程报价 ;5:服务。初审项类别:0:形式评审;1:资格审查项;2:响应性评审;3:商务审查项;4: 技术审查项;5: 服务审查项;6: 其他审查项") + private String category; + + @ApiModelProperty(value = "评分细则表ID(biz_rsms_review_config_detail)") + @JsonSerialize(using = ToStringSerializer.class) + private String detailId; + + @ApiModelProperty(value = "详细评分标准ID(biz_rsms_bid_eval_standard)") + @JsonSerialize(using = ToStringSerializer.class) + private String standardId; + + @ApiModelProperty(value = "结果值:初审1:合格;2不合格。详审:合计") + private String resultValue; + + @ApiModelProperty(value = "评分详情") + private String detailValue; + + @ApiModelProperty(value = "权重") + private Float weights; + + @ApiModelProperty(value = "备注") + private String remarks; + + + + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSupplierRegisterId() { + return supplierRegisterId; + } + + public void setSupplierRegisterId(String supplierRegisterId) { + this.supplierRegisterId = supplierRegisterId; + } + + public String getBidEvalId() { + return bidEvalId; + } + + public void setBidEvalId(String bidEvalId) { + this.bidEvalId = bidEvalId; + } + + public String getBidEvalCategoryId() { + return bidEvalCategoryId; + } + + public void setBidEvalCategoryId(String bidEvalCategoryId) { + this.bidEvalCategoryId = bidEvalCategoryId; + } + + public String getCategoryId() { + return categoryId; + } + + public void setCategoryId(String categoryId) { + this.categoryId = categoryId; + } + + public String getCategory() { + return category; + } + + public void setCategory(String category) { + this.category = category; + } + + public String getDetailId() { + return detailId; + } + + public void setDetailId(String detailId) { + this.detailId = detailId; + } + + public String getStandardId() { + return standardId; + } + + public void setStandardId(String standardId) { + this.standardId = standardId; + } + + public String getResultValue() { + return resultValue; + } + + public void setResultValue(String resultValue) { + this.resultValue = resultValue; + } + + public String getDetailValue() { + return detailValue; + } + + public void setDetailValue(String detailValue) { + this.detailValue = detailValue; + } + + public Float getWeights() { + return weights; + } + + public void setWeights(Float weights) { + this.weights = weights; + } + + public String getRemarks() { + return remarks; + } + + public void setRemarks(String remarks) { + this.remarks = remarks; + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalDetailDTO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalDetailDTO.java new file mode 100644 index 0000000..86f911a --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalDetailDTO.java @@ -0,0 +1,105 @@ +package com.chinaunicom.mall.ebtp.extend.export.bean; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.List; + +/** + *+ * 评标详细评审表 + *
+ * + * @author dino + * @since 2020-11-19 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="BidEvalDetailDTO对象", description="评标详细评审表DTO") +public class BidEvalDetailDTO extends BidEvalDetail implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "评审轮次ID") + @JsonSerialize(using = ToStringSerializer.class) + private String reviewTurnId; + + @ApiModelProperty(value = "轮次数") + private Integer reviewTurnSort; + + @ApiModelProperty(value = "评审室Id") + @JsonSerialize(using = ToStringSerializer.class) + private String assessRoomId; + + @ApiModelProperty(value = "评审室序号") + @JsonSerialize(using = ToStringSerializer.class) + private Integer assessRoomSort; + + @ApiModelProperty(value = "评审类型(1:初审,2:详细评审)") + private String reviewType; + + @JsonInclude(value = JsonInclude.Include.NON_EMPTY) + @ApiModelProperty(value = "供应商ID") + private ListsupplierRegisterIds; + + + public static long getSerialversionuid() { + return serialVersionUID; + } + + public String getReviewTurnId() { + return reviewTurnId; + } + + public void setReviewTurnId(String reviewTurnId) { + this.reviewTurnId = reviewTurnId; + } + + public Integer getReviewTurnSort() { + return reviewTurnSort; + } + + public void setReviewTurnSort(Integer reviewTurnSort) { + this.reviewTurnSort = reviewTurnSort; + } + + public String getAssessRoomId() { + return assessRoomId; + } + + public void setAssessRoomId(String assessRoomId) { + this.assessRoomId = assessRoomId; + } + + public Integer getAssessRoomSort() { + return assessRoomSort; + } + + public void setAssessRoomSort(Integer assessRoomSort) { + this.assessRoomSort = assessRoomSort; + } + + public String getReviewType() { + return reviewType; + } + + public void setReviewType(String reviewType) { + this.reviewType = reviewType; + } + + public List getSupplierRegisterIds() { + return supplierRegisterIds; + } + + public void setSupplierRegisterIds(List supplierRegisterIds) { + this.supplierRegisterIds = supplierRegisterIds; + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalInfo.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalInfo.java new file mode 100644 index 0000000..8ef5000 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalInfo.java @@ -0,0 +1,154 @@ +package com.chinaunicom.mall.ebtp.extend.export.bean; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * + * 评标主表 + *
+ * + * @author dino + * @since 2020-11-18 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="BidEvalInfo对象", description="评标主表") +@TableName(value = "biz_rsms_bid_eval_info",autoResultMap = true) +public class BidEvalInfo extends BaseEntity implements Serializable { + + private static final Long serialVersionUID = 1L; + + @TableId + @ApiModelProperty(value = "编号") + @JsonSerialize(using = ToStringSerializer.class) + private String id; + + @ApiModelProperty(value = "评审类型(1:初审,2:详细评审)") + private String reviewType; + + @ApiModelProperty(value = "初审或详审状态(1:未提交汇总;2:提交汇总;3:结束)") + private String reviewStatus; + + @ApiModelProperty(value = "初审或详审评审结果说明") + private String reviewResultComment; + + @ApiModelProperty(value = "项目id") + @JsonSerialize(using = ToStringSerializer.class) + private String projectId; + + @ApiModelProperty(value = "标包id") + @JsonSerialize(using = ToStringSerializer.class) + private String sectionId; + + @ApiModelProperty(value = "评审室Id") + @JsonSerialize(using = ToStringSerializer.class) + private String assessRoomId; + + @ApiModelProperty(value = "评审室序号") + @JsonSerialize(using = ToStringSerializer.class) + private Integer assessRoomSort; + + @ApiModelProperty(value = "轮次ID") + @JsonSerialize(using = ToStringSerializer.class) + private String reviewTurnId; + + @ApiModelProperty(value = "轮次数") + private Integer reviewTurnSort; + + + public static Long getSerialVersionUID() { + return serialVersionUID; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getReviewType() { + return reviewType; + } + + public void setReviewType(String reviewType) { + this.reviewType = reviewType; + } + + public String getReviewStatus() { + return reviewStatus; + } + + public void setReviewStatus(String reviewStatus) { + this.reviewStatus = reviewStatus; + } + + public String getReviewResultComment() { + return reviewResultComment; + } + + public void setReviewResultComment(String reviewResultComment) { + this.reviewResultComment = reviewResultComment; + } + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getSectionId() { + return sectionId; + } + + public void setSectionId(String sectionId) { + this.sectionId = sectionId; + } + + public String getAssessRoomId() { + return assessRoomId; + } + + public void setAssessRoomId(String assessRoomId) { + this.assessRoomId = assessRoomId; + } + + public Integer getAssessRoomSort() { + return assessRoomSort; + } + + public void setAssessRoomSort(Integer assessRoomSort) { + this.assessRoomSort = assessRoomSort; + } + + public String getReviewTurnId() { + return reviewTurnId; + } + + public void setReviewTurnId(String reviewTurnId) { + this.reviewTurnId = reviewTurnId; + } + + public Integer getReviewTurnSort() { + return reviewTurnSort; + } + + public void setReviewTurnSort(Integer reviewTurnSort) { + this.reviewTurnSort = reviewTurnSort; + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalInfoDTO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalInfoDTO.java new file mode 100644 index 0000000..50496ca --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/BidEvalInfoDTO.java @@ -0,0 +1,34 @@ +package com.chinaunicom.mall.ebtp.extend.export.bean; + + +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + *+ * 评标主表 + *
+ * + * @author dino + * @since 2020-11-18 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="BidEvalInfoDTO对象", description="评标主表DTO") +public class BidEvalInfoDTO extends BidEvalInfo implements Serializable { + + private static final Long serialVersionUID = 1L; + + @ApiModelProperty(value = "初审提交说明") + @JsonInclude(value = JsonInclude.Include.NON_EMPTY) + private BidEarlyWarn earlyWarn; + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ExportParame.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ExportParame.java new file mode 100644 index 0000000..52cbb2e --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ExportParame.java @@ -0,0 +1,57 @@ +package com.chinaunicom.mall.ebtp.extend.export.bean; + +import io.swagger.annotations.ApiModelProperty; + +/** + * 参数 + */ +public class ExportParame { + + private String assessRoomId; + private String reviewTurnId; + + private String projectId; + @ApiModelProperty(value = "标段id") + private String sectionId; + private String reviewType; + + public String getAssessRoomId() { + return assessRoomId; + } + + public void setAssessRoomId(String assessRoomId) { + this.assessRoomId = assessRoomId; + } + + public String getReviewTurnId() { + return reviewTurnId; + } + + public void setReviewTurnId(String reviewTurnId) { + this.reviewTurnId = reviewTurnId; + } + + public String getProjectId() { + return projectId; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public String getSectionId() { + return sectionId; + } + + public void setSectionId(String sectionId) { + this.sectionId = sectionId; + } + + public String getReviewType() { + return reviewType; + } + + public void setReviewType(String reviewType) { + this.reviewType = reviewType; + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ProjectSection.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ProjectSection.java new file mode 100644 index 0000000..d262698 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ProjectSection.java @@ -0,0 +1,248 @@ +package com.chinaunicom.mall.ebtp.extend.export.bean; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import com.chinaunicom.mall.ebtp.common.config.CustomLocalDateTimeTypeHandler; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * 项目标段信息实体类 BizProjectSection + * + * @author daixc + * @date 2020/10/25 + */ +@Data +@Accessors(chain = true) +@ApiModel("项目标段信息") +@TableName(value = "biz_project_section", autoResultMap = true) +public class ProjectSection extends BaseEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键") + @JsonSerialize(using = ToStringSerializer.class) + private String id; + + /** + * 招标项目表主键 + */ + @ApiModelProperty(value = "招标项目表主键") + @JsonSerialize(using = ToStringSerializer.class) + private String projectId; + + /** + * 标段包业务编号:招标项目业务编号/1 + */ + @ApiModelProperty(value = "标段包业务编号:招标项目业务编号/1") + @Length(max = 50,message = "业务编号最长为50字符") + private String bidSectBizNum; + + /** + * 标包序号 + */ + @ApiModelProperty(value = "标包序号") + private String bidSectCode; + + /** + * 标段(包)名称 + */ + @ApiModelProperty(value = "标段(包)名称") + @Length(max = 200,message = "标段(包)名称最长为200字符") + private String bidSectName; + + /** + * 标段(包)内容 + */ + @ApiModelProperty(value = "标段(包)内容") + @Length(max = 2000,message = "内容描述最长为2000字符") + private String bidSectContent; + + /** + * 标段(包)分类代码字典编码 + */ + @ApiModelProperty(value = "标段(包)分类代码字典编码") + private String bidSectTypeDict; + + /** + * 标包预算 + */ + @ApiModelProperty(value = "标包预算") + @Length(max = 20,message = "标包预算最长为20位") + private BigDecimal bidSectContractPrice; + + /** + * 标包预算币种字典编号 + */ + @ApiModelProperty(value = "标包预算币种字典编号") + private String contractPriceCurrencyDict; + + /** + * 询价方式 + */ + @ApiModelProperty(value = "询价方式") + private String selectionMethod; + + /** + * 评审规则(合格制|数量有限制) + */ + @ApiModelProperty(value = "评审规则(合格制|数量有限制)") + private String reviewRules; + + /** + * 标段合同估算价单位字典编码 + */ + @ApiModelProperty(value = "标段合同估算价单位字典编码") + private String priceUnitDict; + + /** + * 投标人资格条件 + */ + @ApiModelProperty(value = "投标人资格条件") + @Length(max = 1000,message = "投标人资格条件最长为1000字符") + private String bidderQual; + + /** + * 报价类型 + */ + @ApiModelProperty(value = "报价类型") + private String quotationMethodDict; + + /** + * 谈判开启时间 + */ + @ApiModelProperty(value = "谈判开启时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class) + private LocalDateTime tenderOpeningTime; + + + /** + * 资审入围方式(合格制 | 有限数量制) + */ + @ApiModelProperty(value = "资审入围方式(合格制 | 有限数量制)") + private String ptcpMode; + + /** + * 入围数量(废弃) + */ + @ApiModelProperty(value = "入围数量") + private Integer ptcpCount; + + /** + * 业务模块 + */ + @ApiModelProperty(value = "业务模块") + private Integer businessModule; + /** + * 业务状态 + */ + @ApiModelProperty(value = "业务状态") + private Integer status; + + /** + * 标书附件集id + */ + @ApiModelProperty(value = "标书附件集id") + private String attDatasetId; + + + /** + * 资格审查方法1.资格预审 2.资格后审 + */ + @ApiModelProperty(value = "资格审查方法1.资格预审 2.资格后审") + private String checkMethodDict; + + /** + * 选择流程 + */ + @ApiModelProperty(value = "选择流程") + private String chooseProcess; + + /** + * 评审报告附件集id + */ + @ApiModelProperty(value = "评审报告附件集id") + private String reviewReportId; + + /** + * 标段编号(采购系统方案编号) + */ + @ApiModelProperty(value = "标段编号") + private String sectionNumber; + + /** + * 评审方法(1:最低价法;2:综合评估法) + */ + @ApiModelProperty(value = "评审方法(1:最低价法;2:综合评估法)") + private String evalMethodDict; + + /** + * 采购类型,1-货物,2-工程,3-服务,4-其他 + */ + @ApiModelProperty(value = "采购类型,1-货物,2-工程,3-服务,4-其他") + private String procurementTypeDict; + + + /** + * 项目数据推送工信部返回的工信部包编号 + */ + @ApiModelProperty(value = "项目数据推送工信部返回的工信部包编号") + private String miitSectionId; + + + /** + * 货币单位(1-元 2-万元) + */ + @ApiModelProperty(value = "货币单位(1-元 2-万元)") + private String monetaryUnit; + + /** + * 备注说明,用于本标段各种情况的说明,累加制 + */ + @ApiModelProperty(value = "备注说明,用于本标段各种情况的说明,累加制") + private String remarks; + + /** + * 父标包序号,当重新招标或二次公告、变更采购方式时用于记录原先的包序号 + */ + @ApiModelProperty(value = "父标包序号,当重新招标或二次公告、变更采购方式时用于记录原先的包序号") + @JsonSerialize(using = ToStringSerializer.class) + private String parentSectionId; + + /** + * 标段项目方案ID + */ + @ApiModelProperty(value = "标段项目方案ID") + private String projectPlanId; + + /** + * 标段子项目ID + */ + @ApiModelProperty(value = "标段子项目ID") + private String subprojectId; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ProjectSectionVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ProjectSectionVO.java new file mode 100644 index 0000000..e2b1748 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ProjectSectionVO.java @@ -0,0 +1,141 @@ +package com.chinaunicom.mall.ebtp.extend.export.bean; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.List; + +/** + * 项目标段信息VO实体类 BizProjectSection + * + * @author daixc + * @date 2020/10/25 + */ +@Data +@Accessors(chain = true) +@ApiModel("项目标段信息VO类") +@TableName(autoResultMap = true) +public class ProjectSectionVO extends ProjectSection implements Serializable { + + /** + * 分页数据 + */ + @ApiModelProperty(value = "分页对象信息") + private BasePageRequest basePageRequest; + + /** + * 是否被选中 0 是 1 否 + */ + @ApiModelProperty(value = "是否被选中 0 不选中 1 选中") + private Integer isExceptionCheck; + + /** + * 流程ID + */ + @ApiModelProperty(value = "流程ID") + @JsonSerialize(using = ToStringSerializer.class) + private String flowId; + + /** + * 招标方式字典编号 + */ + @ApiModelProperty(value = "招标方式字典编号") + private String bidMethodDict; + + /** + * 招标项目名称 + */ + @ApiModelProperty(value = "招标项目名称") + private String projectName; + + /** + * 查询ID集合 + */ + @ApiModelProperty(value = "查询ID集合") + private ListsectionIds; + + /** + * 资格审查方式|招募方式(评审次数)|竞争性谈判(参与方式) + */ + @ApiModelProperty(value = "资格审查方式|招募方式(评审次数)|竞争性谈判(参与方式)") + private String examinationMethodDict; + + /** + * 候审流程ID + */ + @ApiModelProperty(value = "候审流程ID") + @JsonSerialize(using = ToStringSerializer.class) + private String qualFlowId; + + + public BasePageRequest getBasePageRequest() { + return basePageRequest; + } + + public void setBasePageRequest(BasePageRequest basePageRequest) { + this.basePageRequest = basePageRequest; + } + + public Integer getIsExceptionCheck() { + return isExceptionCheck; + } + + public void setIsExceptionCheck(Integer isExceptionCheck) { + this.isExceptionCheck = isExceptionCheck; + } + + public String getFlowId() { + return flowId; + } + + public void setFlowId(String flowId) { + this.flowId = flowId; + } + + public String getBidMethodDict() { + return bidMethodDict; + } + + public void setBidMethodDict(String bidMethodDict) { + this.bidMethodDict = bidMethodDict; + } + + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + + public List getSectionIds() { + return sectionIds; + } + + public void setSectionIds(List sectionIds) { + this.sectionIds = sectionIds; + } + + public String getExaminationMethodDict() { + return examinationMethodDict; + } + + public void setExaminationMethodDict(String examinationMethodDict) { + this.examinationMethodDict = examinationMethodDict; + } + + public String getQualFlowId() { + return qualFlowId; + } + + public void setQualFlowId(String qualFlowId) { + this.qualFlowId = qualFlowId; + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigCategory.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigCategory.java new file mode 100644 index 0000000..2089c61 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigCategory.java @@ -0,0 +1,58 @@ +package com.chinaunicom.mall.ebtp.extend.export.bean; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * + * 评审配置-类别表 + *
+ * + * @author dino + * @since 2020-10-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@TableName(value = "biz_rsms_review_config_category",autoResultMap = true) +@ApiModel(value="ReviewConfigCategory对象", description="评审类别表") +public class ReviewConfigCategory extends BaseEntity implements Serializable { + + private static final Long serialVersionUID = 1L; + + @ApiModelProperty(value = "编号") + @TableId + @JsonSerialize(using = ToStringSerializer.class) + private String id; + + @ApiModelProperty(value = "评审配置表ID") + @JsonSerialize(using = ToStringSerializer.class) + private String configId; + + @ApiModelProperty(value = "类别名称") + private String name; + + @ApiModelProperty(value = "类别:0:报价;1:商务;2:技术;5:服务。初审项类别:0:形式评审;1:资格审查项;2:响应性评审;7:符合性审查") + private String category; + + @JsonInclude(value = JsonInclude.Include.NON_NULL) + @ApiModelProperty(value = "权重") + private BigDecimal weights; + + @JsonInclude(value = JsonInclude.Include.NON_NULL) + @ApiModelProperty(value = "总分数") + private BigDecimal totalScore; + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigCategoryDTO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigCategoryDTO.java new file mode 100644 index 0000000..de308e9 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigCategoryDTO.java @@ -0,0 +1,36 @@ +package com.chinaunicom.mall.ebtp.extend.export.bean; + +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.List; + + +/** + *+ * 评审配置-类别表 + *
+ * + * @author dino + * @since 2020-10-23 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +public class ReviewConfigCategoryDTO extends ReviewConfigCategory implements Serializable { + + private static final Long serialVersionUID = 1L; + + /** + * 详审项集合 + */ + @ApiModelProperty(value = "详审项集合") + @JsonInclude(value = JsonInclude.Include.NON_EMPTY) + private ListdetailList; + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigDetail.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigDetail.java new file mode 100644 index 0000000..632c577 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigDetail.java @@ -0,0 +1,127 @@ +package com.chinaunicom.mall.ebtp.extend.export.bean; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * + * 评分细则(初审和详审) + *
+ * + * @author dino + * @since 2020-11-06 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName(value = "biz_rsms_review_config_detail",autoResultMap = true) +@ApiModel(value="ReviewConfigDetail对象", description="评分细则(初审和详审)") +public class ReviewConfigDetail extends BaseEntity implements Serializable { + + private static final Long serialVersionUID = 1L; + + @JsonSerialize(using = ToStringSerializer.class) + @ApiModelProperty(value = "编号") + @TableId + private String id; + + @JsonSerialize(using = ToStringSerializer.class) + @ApiModelProperty(value = "类别表ID") + private String categoryId; + + @ApiModelProperty(value = "是否可偏离项:1是0否") + @TableField(value = "is_deviation") + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private Integer deviationStatus; + + @ApiModelProperty(value = "审查标准") + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private String rvwStandard; + + @ApiModelProperty(value = "评分项名称") + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private String scoreItem; + + @ApiModelProperty(value = "权重") + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private BigDecimal weights; + + @ApiModelProperty(value = "最低分") + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private BigDecimal lowScore; + + @ApiModelProperty(value = "最高分") + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private BigDecimal highScore; + + @ApiModelProperty(value = "评分方式") + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private String scoreMethod; + + @ApiModelProperty(value = "一致性:1是0否") + @TableField(value = "is_consistency") + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private Integer consistencyStatus; + + @ApiModelProperty(value = "有效报价") + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private String effectiveType; + + @ApiModelProperty(value = "是否包含(最低价)") + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private BigDecimal includeLowPrice; + + @ApiModelProperty(value = "是否包含类别(最低价):1是0否") + @TableField(value = "is_include_low") + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private Integer includeLowStatus; + + @ApiModelProperty(value = "是否包含(最高价)") + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private BigDecimal includeHighPrice; + + @ApiModelProperty(value = "是否包含类别(最高价):1是0否") + @TableField(value = "is_include_high") + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private Integer includeHighStatus; + + @ApiModelProperty(value = "评标基准价") + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private String baseType; + + @ApiModelProperty(value = "平均报价*乘数") + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private BigDecimal avgPriceMultiplier; + + @ApiModelProperty(value = "报价分") + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private String priceType; + + @ApiModelProperty(value = "报价分*乘数") + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private BigDecimal priceMultiplier; + + @ApiModelProperty(value = "报价分*乘数2") + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private BigDecimal priceMultiplierSecond; + + @ApiModelProperty(value = "最低分2") + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private BigDecimal lowScoreSecond; + + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigDetailDTO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigDetailDTO.java new file mode 100644 index 0000000..733bd8c --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigDetailDTO.java @@ -0,0 +1,61 @@ +package com.chinaunicom.mall.ebtp.extend.export.bean; + +import com.chinaunicom.mall.ebtp.extend.export.vo.BidEvalDetailVO; +import com.chinaunicom.mall.ebtp.extend.export.vo.BidEvalEarlyJudgesSummaryVO; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + *+ * 评审配置-评分细则 + *
+ * + * @author dino + * @since 2020-11-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +public class ReviewConfigDetailDTO extends ReviewConfigDetail implements Serializable { + + private static final Long serialVersionUID = 1L; + + /** + * excel导入时用来分组使用 + */ + @JsonInclude(value = JsonInclude.Include.NON_NULL) + @ApiModelProperty(value = "类别") + private String category; + + @JsonInclude(value = JsonInclude.Include.NON_EMPTY) + @ApiModelProperty(value = "评分标准集合") + private ListstandardList; + + @JsonInclude(value = JsonInclude.Include.NON_EMPTY) + @ApiModelProperty(value = "应答文件ID集合") + @NotNull + private List documentIdList; + + @ApiModelProperty(value = "前端索引") + @JsonInclude(value = JsonInclude.Include.NON_NULL) + private Integer key; + + @ApiModelProperty(value = "打分") + private Map scoreMap; + + @ApiModelProperty(value = "初审专家汇总") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map earlyMap; + + @ApiModelProperty(value = "初审汇总表用") + private Map earlyExpertMap; + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigStandard.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigStandard.java new file mode 100644 index 0000000..cd3e1ec --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/bean/ReviewConfigStandard.java @@ -0,0 +1,50 @@ +package com.chinaunicom.mall.ebtp.extend.export.bean; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * + * 详审项-评分标准 + *
+ * + * @author dino + * @since 2020-11-06 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName(value = "biz_rsms_review_config_standard",autoResultMap = true) +@ApiModel(value="ReviewConfigStandard对象", description="评分标准") +public class ReviewConfigStandard extends BaseEntity implements Serializable { + + private static final Long serialVersionUID = 1L; + + @JsonSerialize(using = ToStringSerializer.class) + @ApiModelProperty(value = "编号") + @TableId + private String id; + + @JsonSerialize(using = ToStringSerializer.class) + @ApiModelProperty(value = "详审项ID") + private String detailId; + + @ApiModelProperty(value = "评分因素") + private String standardName; + + @ApiModelProperty(value = "详细评分标准分数") + private BigDecimal standardDetailScore; + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/export/controller/ExportController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/controller/ExportController.java new file mode 100644 index 0000000..5fc7db5 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/export/controller/ExportController.java @@ -0,0 +1,1064 @@ +package com.chinaunicom.mall.ebtp.extend.export.controller; + +import java.io.File; +import java.io.IOException; +import java.io.OutputStream; +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.poi.ss.usermodel.BorderStyle; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.VerticalAlignment; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.streaming.SXSSFWorkbook; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.extend.export.bean.BidEvalDetailDTO; +import com.chinaunicom.mall.ebtp.extend.export.bean.BidEvalInfoDTO; +import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParame; +import com.chinaunicom.mall.ebtp.extend.export.bean.ProjectSectionVO; +import com.chinaunicom.mall.ebtp.extend.export.bean.ReviewConfigCategoryDTO; +import com.chinaunicom.mall.ebtp.extend.export.bean.ReviewConfigDetailDTO; +import com.chinaunicom.mall.ebtp.extend.export.services.ExportService; +import com.chinaunicom.mall.ebtp.extend.export.services.ExportServiceProject; +import com.chinaunicom.mall.ebtp.extend.export.vo.BidEvalDetailVO; +import com.chinaunicom.mall.ebtp.extend.export.vo.BidEvalEarlyJudgesSummaryVO; +import com.chinaunicom.mall.ebtp.extend.export.vo.JuryPrintVO; +import com.chinaunicom.mall.ebtp.extend.export.vo.MemberVO; +import com.chinaunicom.mall.ebtp.extend.export.vo.SupplierRegisterPriceScoreVO; +import com.chinaunicom.mall.ebtp.extend.export.vo.SupplierRegisterVO; +import com.deepoove.poi.XWPFTemplate; +import com.deepoove.poi.config.Configure; +import com.deepoove.poi.policy.HackLoopTableRenderPolicy; + +import io.swagger.annotations.Api; + + +@RestController +@Api(tags = "") +@RequestMapping("/api/biz-service-ebtp-extend/v1/export") +public class ExportController { + + @Resource + private ExportService exportService; + @Resource + private ExportServiceProject exportServiceProject; + + + + + + /** + * 1 + * 导出方法 + * 开标记录表 + */ + @RequestMapping(value = "/kbjl", method = RequestMethod.GET) + @ResponseBody + //TODO 暂未完成 + public void exportKbjlMessage(HttpServletRequest request, HttpServletResponse response) throws IOException { + + ArrayList