From 2d1b1d2066de44a6f1124fc9c6152edc24b71603 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Mon, 24 Apr 2023 11:18:57 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=B9=B6]=20=E2=80=98caihaohan?= =?UTF-8?q?=E2=80=99=E5=90=88=E5=B9=B6=E5=88=B0=20=E2=80=98lixuetao?= =?UTF-8?q?=E2=80=99=20=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../target/classes/application-dev.properties | 17 +++----- .../controller/ReportManageConroller.class | Bin 13084 -> 13646 bytes .../service/impl/IReportServiceImpl.class | Bin 13098 -> 18748 bytes .../mapper/mysql/ReportManageMapper.xml | 9 +++++ .../sys/service/iservice/IUserEoService.java | 23 ++++------- .../da/sys/controller/UserEOController.class | Bin 12659 -> 12280 bytes .../adc/da/sys/service/RoleEOService.class | Bin 6765 -> 4917 bytes .../classes/dozer/dozer-mappings-ddm.xml | 37 ------------------ 8 files changed, 22 insertions(+), 64 deletions(-) diff --git a/adc-da-main/target/classes/application-dev.properties b/adc-da-main/target/classes/application-dev.properties index b53670e..4231dbe 100644 --- a/adc-da-main/target/classes/application-dev.properties +++ b/adc-da-main/target/classes/application-dev.properties @@ -35,7 +35,7 @@ #spring.datasource.mysql.password = root spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://121.36.69.172:3307/report-library?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai +spring.datasource.url = jdbc:mysql://121.36.69.172:3307/report-library?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true spring.datasource.username = root spring.datasource.password = hzwlsoft.com @@ -86,11 +86,6 @@ MAIL_POP_PORT=110 #MAIL_USERNAME=64459@Any3.com #MAIL_PASSWORD=65316975Xiaoq - - - - - IPANDPORT=http://localhost:7061/ #redis @@ -133,10 +128,8 @@ huawei.OBS.fileMaxSize=10 #文件上传最大M数 logging.level.com.adc: debug - -# ======= ddm权限接口 集成 ========= -ddm-identity=changan_test -ddm-company=9 -ddm-ras-public-key= - +# ==== IAM???? +iam.url=https://iamuat.faw-vw.com/ +iam.appkey=xxxx +iam.appSecret=xxx diff --git a/adc-da-report/target/classes/com/adc/da/report/controller/ReportManageConroller.class b/adc-da-report/target/classes/com/adc/da/report/controller/ReportManageConroller.class index a36de78eb736d0e35f4719cb750f3f95ab17a1e9..8602114b488adcdf3bf4d5378015c6e65be021c8 100644 GIT binary patch literal 13646 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 Z$C88VFr*&)I6@A3cq9if!`$6b{{v_I8ZQ6< diff --git a/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class b/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class index 3f65627c61e62624332fa8e9aa600eb76ecea84a..17d325f994194947ac521614019c2512c16c1968 100644 GIT binary patch literal 18748 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 P{wcq%M?9|Ps|EiHa+93< literal 13098 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 WZd+}ttuEEJoEvrT{roBZ^#1@U1Xv3I diff --git a/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml index 00363a0..20c9ba3 100644 --- a/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml +++ b/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml @@ -162,4 +162,13 @@ ORDER BY year DESC + + + diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java index 719f31a..8ad346f 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java @@ -3,11 +3,7 @@ package com.adc.da.sys.service.iservice; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.vo.UserImportVO; import com.adc.da.sys.vo.UserVO; -import com.adc.da.sys.vo.ddm.DdmUserQueryVO; -import com.adc.da.sys.vo.ddm.DdmUserVO; -import com.adc.da.util.http.PageInfo; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -25,13 +21,13 @@ public interface IUserEoService { */ UserEO getUserByLoginName(String userName,String usid); - /** - * 根据邮箱和id查询用户数量 - * @param email - * @param usid - * @return - */ - int getUserCountByEmail(String email,String usid); +// /** +// * 根据邮箱和id查询用户数量 +// * @param email +// * @param usid +// * @return +// */ +// int getUserCountByEmail(String email,String usid); /** * 新增或者编辑用户 @@ -55,13 +51,10 @@ public interface IUserEoService { UserEO getUserByLoginNameNotDeleted(String userName); - public PageInfo getUserPage(DdmUserQueryVO query); + public void importExcelUser(List list); List> allList(String account, String roleName); - List getUserByMail(List mailList); - - List getUserByAccount(List mailList); } diff --git a/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class b/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class index f73f130f1803eda753f80a08fe8550d7cd7a524c..1423e5682a4e442721abf4f84fca35d6d9053806 100644 GIT binary patch delta 4618 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 KPaV`>`urPL$Kl=p delta 4903 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 literal 6765 zcmb_g33wc38GdJX(@l4$cN+{xOKB;K5NY6%a#11uNdDpyG{!_kG_Y5Ac5f%vmyi3mBoy2=^P?q<`@xBC- zxJowfPvQf(CW#N?L$Z80j*kfSwQ_u&5L_?I4YC}PR(7YHtYM~8M%pyoF_#a=$d0*tGe*CYu{!&l6zqi#O*K$fn226%{KDEz=7uQ}XKU zY~|WCdWNseDY{mntoXFj2E&w;mKd?jT#uR0TLld#g|#etcE*s!H9E>PyfJH&owL0* zLfNu>$Y=NZ!tS!6}FqiO2fi#CuL@a%z`cZ;4tRxvI*X*upq&oTJ5t_ zR)GG1zY}4jmPcRkM$78Sck25r=9>E`y{!gui>~y>0tp*yxK)3q8>p5KsfMMKMNcN4 z-(z{Zob-8S!OU8oRiKIUskz)Aw!K~AD;}NEqGHC#n7L77z$@6f(WloVVy6X53AU<> z8a8x0g;B%J3!j}L_+qE9$M6bf&NWjKrQz7zUO6^11h%nYnd!bQFFLy`g{<8m3w;`lp2m99Hp}3_l&x(Xdwt>s0WmSh4`;d0oS4$|obHleN=MkR&VYmc z|8md_Wa-j=#OqS?nTgWOB@-KMx5LU1PYtKkiTY4xmKwu_8niA}s-Q4;jQNdLC6@oX zthy(Tn69M;nGU}A1I%z3JN2DDSB+L^2K@ILtE$Uot!k2Qi2*h0Y_nCX7lS+d0)D4S z1(6W0*PdK4I0Mg);|n^zh%f2*GORf6*YOp6 zRma!xKpYS1_&UC!HDAXM z@UV^_;zt^epRVxgctqqsiXZFv2`n8ymBq$x9a(JG;b1#EvT&%Ig4TY|%DK{$nUSM* z&NY}*HhYa6NkYc)GaWz2FLeA;tooIXU*k7Aek&)xlegcC_`Udpjz8j08cql)TbqYE z{)~ro`~`p2@i)=&@A!v~e`0qW|I+bq{D*n2&secOPMB%YYYx{ZDrNs9FumkvS~eC!{SnJ z3K=2+bg7&Jk4Jag;s4f)}ZG=sICsH<#wmdNizg= z-;_q~6d%S~ILOtQArUS<>bHn*n!lC=0>4VM2E;1td2U!Cm()Xb8 z|7L($e4fc?1kb^9YtGKX^J>mEU}MeMCOm)A*?jKVV!3W6cY{xj&xSR3LAzavYv(G$ zL8Usl>OKLsU@Lc;bO^4S`ChqvCnC4;AcD%}O?5B70OycOE}MKt_*}mBFrwp#t-S*c zt3J+6v=^i1ESz;@FPG7{oFRDIrZhqd-HlL>JDbjxQv2gT{@h z&FKJ9CHd??ax##Th@c|Fx7-ZzO_up4(Tlzc-(K<+PbGPD9{c|rUq}5n^xf10kQz8(xgEu1BQ_nEF zjAR=bi(yltbM*}5>^z0Q zXVnV4=9vl1*AuuG1z(`nNT*3&W{#kld3kKly0zmtZXCy7F@Y1J7?$l)f4huZaj6`g zIDzF+^s1;*yOSbJ;3HT;9xFFAG&lIyPHt{!j*Vkga|3hy6b<8O8E$Tn;E$>dUPI3S z*D}|x!!fuXt8fDg{UKJ@8(E@mVwT>_oV$g=b*r+v&DXUYof)|B7!!?1qlkTsjWgLG zF6LX5JX)|HW3;n})$tO%oHd}7+dkDRNacUKl;46RbE(h{{zaG+bt>8c7Hz+x9pzJM z@GwnXeHd#FqCJ3v#fo_*$EvXPtSgl@zNo6UwglWl!m=)kLr*?>2=l9NS3p|IA`cuU zRCg1kBh>01f^jbuIm*&@p91DYDzlzh`6`CFB=v9^qG473G*!ChAoe(x$HAhtBBGZp z9wdGJoW2aNCJvkVJs%j`q?Du`r$*6s!ZnD;4j~r3l@z{16DmC)V9|Y0>9s~d)Ku1{ zDJZ;BVkJW&q)gCFm-D_9*G5Dh$6{@>->}&8q~=M{(c~u?i8k|na??7kHc1{*(*0%_ z&dMvoW#9_(+QGjFQuEu{%U??=o4K#_@^KiGE486GR}TWwfX(Z0rDFGbh37mnegj#) K(Z!osEb$bauc-k5 diff --git a/adc-da-sys/target/classes/dozer/dozer-mappings-ddm.xml b/adc-da-sys/target/classes/dozer/dozer-mappings-ddm.xml index 02aee34..2399ffb 100644 --- a/adc-da-sys/target/classes/dozer/dozer-mappings-ddm.xml +++ b/adc-da-sys/target/classes/dozer/dozer-mappings-ddm.xml @@ -6,43 +6,6 @@ - - - - com.adc.da.sys.entity.RoleEO - com.adc.da.sys.vo.ddm.DdmRoleVO - - - - id - rid - - - name - roleName - - - name - roleCode - - - remarks - rdesc - - - delFlag - enabled - - - menuEOIdList - menusstr - - - menuEOList - menus - - - com.adc.da.sys.entity.MenuEO