From 9b53881b40861128f95a274f5b7114330981d994 Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Sun, 27 Sep 2020 20:01:17 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=90=8E=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 35 ---------- .../financial/crms/CustomerControllerApi.java | 2 - .../impl/CustomerLoginServiceImpl.java | 2 +- .../src/main/resources/bootstrap.properties | 6 +- .../mapper/crmsauth/CustomerLoginMapper.xml | 2 +- .../target/classes/bootstrap.properties | 19 ++++++ .../DqFinancialCrmsAuthApplication.class | Bin 0 -> 1077 bytes .../crauth/config/AuthorizationServer.class | Bin 0 -> 6455 bytes .../crauth/config/SecurityConfig.class | Bin 0 -> 3713 bytes .../financial/crauth/config/TokenConfig.class | Bin 0 -> 716 bytes .../controller/CustomerLoginController.class | Bin 0 -> 929 bytes .../crauth/dao/CustomerLoginDao.class | Bin 0 -> 357 bytes .../crauth/service/CustomerLoginService.class | Bin 0 -> 157 bytes .../impl/CustomerLoginServiceImpl.class | Bin 0 -> 2402 bytes .../target/classes/logback-spring.xml | 47 ++++++++++++++ .../mapper/crmsauth/CustomerLoginMapper.xml | 10 +++ .../DqFinancialCrmsAuthApplicationTests.class | Bin 0 -> 586 bytes .../financial/crms/config/CorsConfig.java | 33 ++++++++++ .../crms/controller/CustomerController.java | 33 ++++++---- .../financial/crms/dao/CustomerDao.java | 2 +- .../service/impl/CustomerServiceImpl.java | 61 ++++++++++++------ .../mapper/crms/CompanyCustomerDao.xml | 4 +- .../resources/mapper/crms/CustomerDao.xml | 6 +- .../mapper/crms/PersonalCustomerDao.xml | 4 +- .../META-INF/dq-financial-crms.kotlin_module | Bin 0 -> 16 bytes .../crms/DqFinancialCrmsApplication.class | Bin 0 -> 1059 bytes .../financial/crms/config/CorsConfig.class | Bin 0 -> 1478 bytes .../financial/crms/config/IPageConfig.class | Bin 0 -> 715 bytes .../crms/controller/CustomerController.class | Bin 0 -> 6241 bytes .../crms/dao/CompanyCustomerDao.class | Bin 0 -> 748 bytes .../financial/crms/dao/CustomerDao.class | Bin 0 -> 1660 bytes .../crms/dao/PersonalCustomerDao.class | Bin 0 -> 757 bytes .../crms/feign/HrmsFeignService.class | Bin 0 -> 1669 bytes .../crms/service/CustomerService.class | Bin 0 -> 1557 bytes .../service/impl/CustomerServiceImpl.class | Bin 0 -> 21097 bytes .../mapper/crms/CompanyCustomerDao.xml | 4 +- .../classes/mapper/crms/CustomerDao.xml | 6 +- .../mapper/crms/PersonalCustomerDao.xml | 4 +- .../DqFinancialCrmsApplicationTests.class | Bin 0 -> 2800 bytes .../financial/hrms/config/CorsConfig.java | 33 ++++++++++ .../financial/hrms/service/DeptService.java | 2 + .../hrms/service/impl/DeptServiceImpl.java | 6 +- .../financial/hrms/config/CorsConfig.class | Bin 0 -> 1478 bytes .../hrms/controller/EmployeeController.class | Bin 4184 -> 4262 bytes .../framework/model/response/CommonCode.java | 4 ++ .../model/response/PromptSuccess.java | 32 +++++++++ .../model/response/ResponseResult.java | 4 ++ .../framework/model/response/CommonCode.class | Bin 2745 -> 3120 bytes .../model/response/PromptSuccess.class | Bin 0 -> 722 bytes .../model/response/ResponseResult.class | Bin 4428 -> 4579 bytes .../domain/crms/PersonalCustomerEntity.java | 6 +- .../domain/crms/ext/CustomerCompanyTO.java | 1 + .../domain/crms/ext/CustomerPersonalVO.java | 6 +- .../framework/domain/crms/ext/CustomerTO.java | 2 - .../domain/crms/request/CustomerRequest.java | 6 ++ .../framework/domain/hrms/ext/EmployeeVO.java | 2 - .../domain/crms/PersonalCustomerEntity.class | Bin 8305 -> 8305 bytes .../domain/crms/ext/CustomerCompanyTO.class | Bin 2290 -> 2290 bytes .../domain/crms/ext/CustomerPersonalVO.class | Bin 10355 -> 10419 bytes .../domain/crms/ext/CustomerTO.class | Bin 3934 -> 3934 bytes .../domain/crms/ext/ManagerName.class | Bin 0 -> 1374 bytes .../domain/crms/request/CustomerRequest.class | Bin 3090 -> 3283 bytes .../domain/crms/response/CrmsCode.class | Bin 0 -> 2585 bytes .../domain/hrms/ext/EmployeeVO.class | Bin 1823 -> 1823 bytes .../daqing/framework/utils/PageUtils.class | Bin 2369 -> 2369 bytes .../com/daqing/framework/utils/Query.class | Bin 2748 -> 2261 bytes .../src/main/resources/application.yml | 19 +++++- .../META-INF/dq-govern-gateway.kotlin_module | Bin 0 -> 16 bytes .../target/classes/application.yml | 34 ++++++++++ .../target/classes/bootstrap.properties | 9 +++ .../target/classes/jwt.properties | 1 + 71 files changed, 344 insertions(+), 103 deletions(-) delete mode 100644 .gitignore create mode 100644 dq-financial-crms-auth/target/classes/bootstrap.properties create mode 100644 dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/DqFinancialCrmsAuthApplication.class create mode 100644 dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/config/AuthorizationServer.class create mode 100644 dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/config/SecurityConfig.class create mode 100644 dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/config/TokenConfig.class create mode 100644 dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/controller/CustomerLoginController.class create mode 100644 dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/dao/CustomerLoginDao.class create mode 100644 dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/service/CustomerLoginService.class create mode 100644 dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/service/impl/CustomerLoginServiceImpl.class create mode 100644 dq-financial-crms-auth/target/classes/logback-spring.xml create mode 100644 dq-financial-crms-auth/target/classes/mapper/crmsauth/CustomerLoginMapper.xml create mode 100644 dq-financial-crms-auth/target/test-classes/com/daqing/financial/crauth/DqFinancialCrmsAuthApplicationTests.class create mode 100644 dq-financial-crms/src/main/java/com/daqing/financial/crms/config/CorsConfig.java create mode 100644 dq-financial-crms/target/classes/META-INF/dq-financial-crms.kotlin_module create mode 100644 dq-financial-crms/target/classes/com/daqing/financial/crms/DqFinancialCrmsApplication.class create mode 100644 dq-financial-crms/target/classes/com/daqing/financial/crms/config/CorsConfig.class create mode 100644 dq-financial-crms/target/classes/com/daqing/financial/crms/config/IPageConfig.class create mode 100644 dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class create mode 100644 dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CompanyCustomerDao.class create mode 100644 dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CustomerDao.class create mode 100644 dq-financial-crms/target/classes/com/daqing/financial/crms/dao/PersonalCustomerDao.class create mode 100644 dq-financial-crms/target/classes/com/daqing/financial/crms/feign/HrmsFeignService.class create mode 100644 dq-financial-crms/target/classes/com/daqing/financial/crms/service/CustomerService.class create mode 100644 dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class create mode 100644 dq-financial-crms/target/test-classes/com/daqing/financial/crms/DqFinancialCrmsApplicationTests.class create mode 100644 dq-financial-hrms/src/main/java/com/daqing/financial/hrms/config/CorsConfig.java create mode 100644 dq-financial-hrms/target/classes/com/daqing/financial/hrms/config/CorsConfig.class create mode 100644 dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java create mode 100644 dq-framework-common/target/classes/com/daqing/framework/model/response/PromptSuccess.class create mode 100644 dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/ManagerName.class create mode 100644 dq-framework-model/target/classes/com/daqing/framework/domain/crms/response/CrmsCode.class create mode 100644 dq-govern-gateway/target/classes/META-INF/dq-govern-gateway.kotlin_module create mode 100644 dq-govern-gateway/target/classes/application.yml create mode 100644 dq-govern-gateway/target/classes/bootstrap.properties create mode 100644 dq-govern-gateway/target/classes/jwt.properties diff --git a/.gitignore b/.gitignore deleted file mode 100644 index c85ae303..00000000 --- a/.gitignore +++ /dev/null @@ -1,35 +0,0 @@ -target/ -logs/ -.mvn/ -mvnw -mvnw.cmd -!**/src/main/** -!**/src/test/** - -src/main/resources/docs/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ - -### VS Code ### -.vscode/ diff --git a/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java b/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java index 20f60a65..6f35451c 100644 --- a/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java +++ b/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java @@ -10,8 +10,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; /** * @Author: gongsj. diff --git a/dq-financial-crms-auth/src/main/java/com/daqing/financial/crauth/service/impl/CustomerLoginServiceImpl.java b/dq-financial-crms-auth/src/main/java/com/daqing/financial/crauth/service/impl/CustomerLoginServiceImpl.java index 9c564a85..dfda02ee 100644 --- a/dq-financial-crms-auth/src/main/java/com/daqing/financial/crauth/service/impl/CustomerLoginServiceImpl.java +++ b/dq-financial-crms-auth/src/main/java/com/daqing/financial/crauth/service/impl/CustomerLoginServiceImpl.java @@ -32,7 +32,7 @@ public class CustomerLoginServiceImpl implements CustomerLoginService, UserDetai List authorities = new ArrayList<>(); authorities.add(new SimpleGrantedAuthority("ROLE_ADMIN")); System.out.println(customer); - UserDetails userDetails = new User(customer.getCode(),new BCryptPasswordEncoder().encode(customer.getPassword()),authorities); + UserDetails userDetails = new User(customer.getPhone(),new BCryptPasswordEncoder().encode(customer.getPassword()),authorities); return userDetails; } diff --git a/dq-financial-crms-auth/src/main/resources/bootstrap.properties b/dq-financial-crms-auth/src/main/resources/bootstrap.properties index 160ddf8b..3e67ab07 100644 --- a/dq-financial-crms-auth/src/main/resources/bootstrap.properties +++ b/dq-financial-crms-auth/src/main/resources/bootstrap.properties @@ -1,7 +1,7 @@ -#服务名称 -spring.application.name=dq-financial-crms -#配置中心地址 +#锟斤拷锟斤拷锟斤拷锟斤拷 +spring.application.name=dq-financial-crms-auth +#锟斤拷锟斤拷锟斤拷锟侥碉拷址 spring.cloud.nacos.config.server-addr=192.168.31.142:8848 spring.cloud.nacos.config.namespace=37d72d30-3178-4173-8b5e-269a23355ed9 #spring.cloud.nacos.config.group=prod diff --git a/dq-financial-crms-auth/src/main/resources/mapper/crmsauth/CustomerLoginMapper.xml b/dq-financial-crms-auth/src/main/resources/mapper/crmsauth/CustomerLoginMapper.xml index 13e9de18..ac1cc76d 100644 --- a/dq-financial-crms-auth/src/main/resources/mapper/crmsauth/CustomerLoginMapper.xml +++ b/dq-financial-crms-auth/src/main/resources/mapper/crmsauth/CustomerLoginMapper.xml @@ -4,7 +4,7 @@ \ No newline at end of file diff --git a/dq-financial-crms-auth/target/classes/bootstrap.properties b/dq-financial-crms-auth/target/classes/bootstrap.properties new file mode 100644 index 00000000..160ddf8b --- /dev/null +++ b/dq-financial-crms-auth/target/classes/bootstrap.properties @@ -0,0 +1,19 @@ + +#服务名称 +spring.application.name=dq-financial-crms +#配置中心地址 +spring.cloud.nacos.config.server-addr=192.168.31.142:8848 +spring.cloud.nacos.config.namespace=37d72d30-3178-4173-8b5e-269a23355ed9 +#spring.cloud.nacos.config.group=prod + +spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml +spring.cloud.nacos.config.ext-config[0].group=dev +spring.cloud.nacos.config.ext-config[0].refresh=true + +spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml +spring.cloud.nacos.config.ext-config[1].group=dev +spring.cloud.nacos.config.ext-config[1].refresh=true + +spring.cloud.nacos.config.ext-config[2].data-id=other.yml +spring.cloud.nacos.config.ext-config[2].group=dev +spring.cloud.nacos.config.ext-config[2].refresh=true \ No newline at end of file diff --git a/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/DqFinancialCrmsAuthApplication.class b/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/DqFinancialCrmsAuthApplication.class new file mode 100644 index 0000000000000000000000000000000000000000..63b951973efc44ed8465d5b489a1eb52e5d71396 GIT binary patch literal 1077 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 literal 0 HcmV?d00001 diff --git a/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/config/TokenConfig.class b/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/config/TokenConfig.class new file mode 100644 index 0000000000000000000000000000000000000000..5e113698a4c88c5c2fb6ffa9799e55bff399a792 GIT binary patch literal 716 zcmbV~%SuBr5QhKM+SYoh_si0q3K}WmMiEpH#HyfDaG9Q_HMJ+voSdp}r7Jex+tUkxHOv;#kI6iyipcnLI*%EK+@{jXZ87vMELIt^yQVG~ zN)@H$Q5x5zJrlJyWyUKe678z6%E!HA)?KKCVYL#OnAgR%(oNn_TIfiLHjk`G-35<~ zZm1?dGnZ2D27iO0=zMtUj3xH=!eYhPCQq&`5gJy+^2XRpp2#S*%H46}L1lhrO-I$G z<)OJt3q8kEdlwY-cDM4k)zdtF2HqBQRmZiK zj2z~XrI+Eq4Cp~1Pqsi2r<2jyzw`+95PlDk&4pwMMe>Kb1sEg`@#1HT#o literal 0 HcmV?d00001 diff --git a/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/controller/CustomerLoginController.class b/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/controller/CustomerLoginController.class new file mode 100644 index 0000000000000000000000000000000000000000..8d4b500dbf1aa1cd6abe2d94f05bfd4ce9c0c1b8 GIT binary patch literal 929 zcmbtS%We}f6g}=FnGn*nq~#GPuU(4--V_N5RDmJ^i{YULWy8wjxT%ZBPHj*7Td+c6 z!3XeBRqr$}xybJK72>wJ=^osHfZqdf1IA-Y2O%#F3}&+<2rZUjjVq9Rr!?O8o1I+^-@=Fxb}zsA62a~Jh|{y+f>@Q=ld7xeo5@J z{ySXGPo<3pQie4A97X-LGR84%{ojlkmd^(IF5go!;y!BhA*+>uej-vjn-p=fjBNeE zSFkVSEZ`EIjgw>tE%Mt_04|dU@)yw|R7HMBQAJL=3!ll%Q&;Aw$tiV-FdZT+)4uW% nETBu?%5UV7U*&p#kz1X~U8NGPofL8%)n#3ZZ;}or_7Xc^Z5k;S8$ZUG=oD0(~9Cv-$iy56fDm2HNK&4&{ujDgZ0(?JU8rgiLWB` zb3jM$9A0$E4z1TFxK0lS3mkG(iKda|7@8oKtLBSyxZ(C8Zq1X@tqTwNFQ&DT(+$?Zwa+ltF)0+QE z9j8oX#ur%DBVAQNUhjDRqSOMn@~*BrW%2KGtS&2o3wh61Yqe@g1@|Pi2@L18D=S4Ac;>sgn22^gs?T=B z6RO~;=PJjm?p0cW6=Kc`8MI`$qGkC$cQ4e<=o5y(`b7S*d@7xaq^k;%0hms;MH?!& z7I;zJadn`a8YPrfB)v-L7-@^~oND?ED;7TdvTX7X<0Wvj1=o>Z%epE(pW&*8M|g6K zO;o4&0TV+_Lp(*#48Bf%N~va!|P7L zgi0+3(vMV`$;;xPyQ!TBQ{ihmTGBPYe3Y{SH#*^H*Lhj6J1ROvCXj2}kWNZH zU!NFjCx;Dq@HnUAbncervOvrBI4J29v+qQx3iU8jRW@>6W5CAZ4&Z5LgH1DH>r}GJ z0*-5@by>hNS4ULw|3eY&Vp~1Fvd#gKjg)@d*wsF}!01G(U8^;oJX}0#hel zliig;K|QIFso43CGqZUa2;4cjy}A1GzIdh4E3&#$VN&zzOs9%?hZp}Sx-f=|5Txud zq~m-V^paj8?ILCK;dq5#4yhpRncRo?wZVRqquC4|ev6|WZ@}9W4$j}jRdhEF|Aij@ zfR)ML(RJ+wy1TG?fW+25de){7(7QEk?W6An`n&MpHzcQ?W8eVx7U?So805AKoDMz5 ztJC`!zMU9P{6b;fFa}(r384A`svV)?t5iG5aS87?jGBoRH;tkRc#j;WH=i{h;6tJu w;p=AtDau>oe-hXD3Ywx!11IK9bNxD35?pa`gR>q%F~&tV8{@4b$9)9+3)YCuUH||9 literal 0 HcmV?d00001 diff --git a/dq-financial-crms-auth/target/classes/logback-spring.xml b/dq-financial-crms-auth/target/classes/logback-spring.xml new file mode 100644 index 00000000..9d44c6c1 --- /dev/null +++ b/dq-financial-crms-auth/target/classes/logback-spring.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + utf8 + + + + + + + + ${LOG_HOME}/crms_auth.%d{yyyy-MM-dd}.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + 0 + + 512 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-crms-auth/target/classes/mapper/crmsauth/CustomerLoginMapper.xml b/dq-financial-crms-auth/target/classes/mapper/crmsauth/CustomerLoginMapper.xml new file mode 100644 index 00000000..ac1cc76d --- /dev/null +++ b/dq-financial-crms-auth/target/classes/mapper/crmsauth/CustomerLoginMapper.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/dq-financial-crms-auth/target/test-classes/com/daqing/financial/crauth/DqFinancialCrmsAuthApplicationTests.class b/dq-financial-crms-auth/target/test-classes/com/daqing/financial/crauth/DqFinancialCrmsAuthApplicationTests.class new file mode 100644 index 0000000000000000000000000000000000000000..d5a57e61ad9c115d1177e58d0e9e5b672bc35f11 GIT binary patch literal 586 zcmbtRO-lnY5S?s4R@>Fq>cyMKs$eeSMN!sDPm6*ry=T+3P2Ek}Y*zhSo&*p60DqJ? zNh=6m1Ov%rUgo`dNj^T`-T~kg_8L%uoe(-9>=LM7NG0thflBvqM4;N!V?m&mNF{E| zJQZfh(hQMKqB+Y(%t)87!K$6ff*}`qEkL{-NW^oINrEXI`pU7<4`{EEiAOJkV5YOD!tXwJAFA71xOSh7nYuM&Rn7 z*T$?z;P list = customerService.updateCustomerById(ids); + if (list == null){ + return new ResponseResult(CommonCode.INVALID_PARAM); + }else if (Objects.equals(list.get(0),PromptSuccess.getDeleteSuccess())){ + return ResponseResult.SUCCESS(); + }else if (Objects.equals(list.get(0),PromptSuccess.getDeleteFail())){ + return new ResponseResult(CommonCode.DELETE_FAIL); + } + else { + return new ResponseResult>().SUCCESS_DATA(list); + } - return new ResponseResult>().SUCCESS(customerService.updateCustomerById(ids)); } /** * 淇濆瓨涓汉绫诲瀷瀹㈡埛淇℃伅 */ @PostMapping("/savePersonal") - @Override public ResponseResult savePersonal(@RequestBody CustomerPersonalTO customerPersonalTO) { boolean result = customerService.saveCustomerPersonal(customerPersonalTO.getCustomerEntity(), customerPersonalTO.getPersonalCustomerEntity()); - return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); + return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.SAVE_FAIL); } /** * 淇濆瓨浼佷笟绫诲瀷瀹㈡埛淇℃伅 */ @PostMapping("/saveCompany") - @Override + @ApiOperation(value = "淇濆瓨浼佷笟绫诲瀷瀹㈡埛淇℃伅", response = CustomerCompanyTO.class) public ResponseResult saveCompany(@RequestBody CustomerCompanyTO customerCompanyTO) { boolean result = customerService.saveCustomerCompany(customerCompanyTO.getCustomerEntity(), customerCompanyTO.getCompanyCustomerEntity()); - return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); + return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.SAVE_FAIL); } /** * 鏇存柊涓汉绫诲瀷瀹㈡埛淇℃伅 */ @PostMapping("/updatePersonal") - @Override public ResponseResult updatePersonal(@RequestBody CustomerPersonalTO customerPersonalTO) { boolean result = customerService.updateCustomerPersonal(customerPersonalTO.getCustomerEntity(), customerPersonalTO.getPersonalCustomerEntity()); - return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); + return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.UPDATE_FAIL); } /** * 鏇存柊浼佷笟绫诲瀷瀹㈡埛淇℃伅 */ @PostMapping("/updateCompany") - @Override public ResponseResult updateCompany(@RequestBody CustomerCompanyTO customerCompanyTO) { boolean result = customerService.updateCustomerCompany(customerCompanyTO.getCustomerEntity(), customerCompanyTO.getCompanyCustomerEntity()); - return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); + return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.UPDATE_FAIL); } /** * 瀵煎嚭鏁版嵁鍒癳xcel */ - @Override @GetMapping("/excelExport") public void excelExportCustomer(HttpServletResponse response){ @@ -123,7 +132,6 @@ public class CustomerController implements CustomerControllerApi { /** * 瀵煎嚭excel妯℃澘 */ - @Override @GetMapping("/excelTemplate") public void excelTemplate(HttpServletResponse response){ @@ -134,7 +142,6 @@ public class CustomerController implements CustomerControllerApi { * 瀵煎叆excel鏁版嵁 */ @PostMapping("/excelImport") - @Override public void excelImportCustomer(MultipartFile file){ customerService.excelImportCustomer(file); diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java index cfc687d1..f8e8585f 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java @@ -25,7 +25,7 @@ public interface CustomerDao extends BaseMapper { CustomerEntity queryCustomerById(Long id); - void updateCustomerById(@Param("ids") List ids); + boolean updateCustomerById(@Param("ids") List ids); List queryCustomerNameById(@Param("ids") List ids); diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java index 5405652b..8220f2e7 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java @@ -15,13 +15,14 @@ import com.daqing.framework.domain.crms.PersonalCustomerEntity; import com.daqing.framework.domain.crms.ext.*; import com.daqing.framework.domain.crms.request.CustomerRequest; import com.daqing.framework.domain.crms.response.CrmsCode; +import com.daqing.framework.domain.hrms.EmployeeEntity; import com.daqing.framework.domain.hrms.ext.EmployeeTO; import com.daqing.framework.domain.hrms.ext.EmployeeVO; -import com.daqing.framework.domain.hrms.response.HrmsCode; import com.daqing.framework.exception.ExceptionCast; +import com.daqing.framework.model.response.CommonCode; +import com.daqing.framework.model.response.PromptSuccess; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.PageUtils; -import com.daqing.framework.utils.SnowflakeIdUtils; import com.daqing.framework.utils.excel.ExcelUtil; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -71,7 +72,7 @@ public class CustomerServiceImpl extends ServiceImpl customers = customerEntityIPage.getRecords(); // 鑾峰彇鎵鏈夌殑瀹㈡埛缁忕悊id - Long[] ids = customers.stream().map(CustomerEntity::getId).toArray(Long[]::new); + Long[] ids = customers.stream().map(CustomerEntity::getManager).toArray(Long[]::new); if (ids != null && ids.length != 0) { //TODO 杩滅▼璋冪敤鏌ヨ瀹㈡埛缁忕悊淇℃伅鐨勬帴鍙 @@ -100,22 +101,31 @@ public class CustomerServiceImpl extends ServiceImpl().SUCCESS(null); + return new ResponseResult(CommonCode.INEXISTENCE); + } + String name = PromptSuccess.getNoBeing(); + if (customer.getManager() != null){ + ResponseResult employee = hrmsFeignService.getEmployeeById(customer.getManager()); + if (employee.getData() != null){ + // 瀹㈡埛缁忕悊濮撳悕 + name = hrmsFeignService.getEmployeeById(customer.getManager()).getData().getName(); + } } - // 瀹㈡埛缁忕悊濮撳悕 - String name = hrmsFeignService.getEmployeeById(customer.getManager()).getData().getName(); // 鍒ゆ柇璇ュ鎴风殑绫诲瀷 if (Objects.equals(customer.getType(), CrmsConstant.CustomerType.PERSONAL_CUSTOMER.getType())) { PersonalCustomerEntity personalCustomerEntity = personalCustomerDao.queryPersonalCustomerById(id); - //灏佽涓汉绫诲瀷瀹㈡埛淇℃伅 + // 灏佽涓汉绫诲瀷瀹㈡埛淇℃伅 CustomerPersonalVO customerPersonalVO = this.setPersonal(customer, name, personalCustomerEntity); return new ResponseResult().SUCCESS(customerPersonalVO); } else { CompanyCustomerEntity companyCustomerEntity = companyCustomerDao.queryCompanyCustomerById(id); - //灏佽浼佷笟绫诲瀷瀹㈡埛淇℃伅 + // 灏佽浼佷笟绫诲瀷瀹㈡埛淇℃伅 CustomerCompanyVO customerCompanyVO = this.setCompany(customer, name, companyCustomerEntity); return new ResponseResult().SUCCESS(customerCompanyVO); } @@ -129,12 +139,18 @@ public class CustomerServiceImpl extends ServiceImpl updateCustomerById(Long[] ids) { - + if (ids == null || ids.length == 0){ + return null; + } //TODO 杩滅▼璋冪敤瀹℃壒妯″潡鍒ゆ柇鎵閫夊鎴锋槸鍚﹀湪瀹℃壒,杩斿洖姝ｅ湪瀹℃壒鐨勫鎴风殑id闆嗗悎Long[] idArray List idArray = new ArrayList<>();// 鍋囪涓鸿繑鍥炵殑姝ｅ湪瀹℃壒鐨勫鎴穒d闆嗗悎 if (idArray.size() == 0 || idArray == null) { - customerDao.updateCustomerById(Arrays.asList(ids)); - return new ArrayList<>(); + boolean customer = customerDao.updateCustomerById(Arrays.asList(ids)); + List success = new ArrayList<>(); + success.add(PromptSuccess.getDeleteSuccess()); + List fail = new ArrayList<>(); + fail.add(PromptSuccess.getDeleteFail()); + return customer ? success : fail; } else { return customerDao.queryCustomerNameById(idArray); } @@ -149,14 +165,14 @@ public class CustomerServiceImpl extends ServiceImpl pageCheckout(Integer page, Integer size) { - Integer count = this.count(new QueryWrapper().eq("del_or_not", CrmsConstant.NOT_DELETE));//鏌ヨ瀹㈡埛鏈夋晥鎬绘潯鏁 + // 鏌ヨ瀹㈡埛鏈夋晥鎬绘潯鏁 + Integer count = this.count(new QueryWrapper().eq("del_or_not", CrmsConstant.NOT_DELETE)); if (size == null || size < 1) { size = 10; } diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml index 46b05a0b..7ca13ac9 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml @@ -28,8 +28,8 @@ INSERT INTO crms_company_customer - (id,registered_capital,industry,years,region,shareholder,affiliated_company,emp_num,linkman,business_source,customer_id) - values (#{id},#{registeredCapital},#{industry},#{years},#{region},#{shareholder},#{affiliatedCompany},#{empNum},#{linkman}, + (registered_capital,industry,years,region,shareholder,affiliated_company,emp_num,linkman,business_source,customer_id) + values (#{registeredCapital},#{industry},#{years},#{region},#{shareholder},#{affiliatedCompany},#{empNum},#{linkman}, #{businessSource},#{customerId}); diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml index dc175407..36ac5037 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml @@ -70,10 +70,10 @@ - + INSERT INTO crms_customer - (id,code,type,manager,name,addr,phone,del_or_not,status,create_time,motify_time) - VALUES (#{id},#{code},#{type},#{manager},#{name},#{addr},#{phone},0,0,#{createTime},#{motifyTime}) + (code,type,manager,name,addr,phone,del_or_not,status,create_time,motify_time) + VALUES (#{code},#{type},#{manager},#{name},#{addr},#{phone},0,0,#{createTime},#{motifyTime}) diff --git a/dq-financial-crms/src/main/resources/mapper/crms/PersonalCustomerDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/PersonalCustomerDao.xml index f6812751..9222e27c 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/PersonalCustomerDao.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/PersonalCustomerDao.xml @@ -36,9 +36,9 @@ INSERT INTO crms_personal_customer - (id,customer_id,id_card,age,gender,marital_status,education,employer,position,working_years,social_security_num,living_situation + (customer_id,id_card,age,gender,marital_status,education,employer,position,working_years,social_security_num,living_situation ,residence_addr,business_source,emergency_linkman,emergency_linkman_relationship,emergency_linkman_phone) - VALUES (#{id},#{customerId},#{idCard},#{age},#{gender},#{maritalStatus},#{education},#{employer},#{position},#{workingYears}, + VALUES (#{customerId},#{idCard},#{age},#{gender},#{maritalStatus},#{education},#{employer},#{position},#{workingYears}, #{socialSecurityNum},#{livingSituation},#{residenceAddr},#{businessSource},#{emergencyLinkman},#{emergencyLinkmanRelationship}, #{emergencyLinkmanPhone}); diff --git a/dq-financial-crms/target/classes/META-INF/dq-financial-crms.kotlin_module b/dq-financial-crms/target/classes/META-INF/dq-financial-crms.kotlin_module new file mode 100644 index 0000000000000000000000000000000000000000..8fb60192d378759239a3ecbf60eac8c8de446e9c GIT binary patch literal 16 RcmZQzU|?ooU|@t|UH|}6022TJ literal 0 HcmV?d00001 diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/DqFinancialCrmsApplication.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/DqFinancialCrmsApplication.class new file mode 100644 index 0000000000000000000000000000000000000000..518270b3722c5358bfd4761a6858da7dceed4ed1 GIT binary patch literal 1059 zcmbVLO>fgc5S>laCN(K-Qz(?LlyXUP$X==lDX3EGl2d?+pm6AEz23On+Pm(0UEpVN z0&(C6@S_m3PMQQM^nfMrdS-Utn>RE5_4~(9062gb9+cs61)g~D6rNR}L15*TRMH+2 zSZeMM36y;u3IgkWsl?kn355B;f*3vZzUC|*G9#TmahC15%m{S)TqiVSS5ifEBo$L! zvY2v{Wc1{!cjNHUK1$PAa%QDgU1Up`R0Ou0XZ;Iy&1lRJU|`&-@dB2HGUNJMm@gB`lN)!wWK?1EUWx3T{tC5UyBj}*ebc}(&o6%Va zfcLEUj2P46P+uphRw#DBnd_oA6Ig>~SRrumKl4z5-5NZHJ?!jk7~TaJf?EQuMcpXG zjpfWq!BI9jPF2vH8!A6$S=L=JNBg&`_9sGJ z`*Q0Wkgr9!imM9)tidX-webP);0{`=Xs;oNyWApLucoZa^@0&^ pa2M7KKN1o&TsE7l=Sitin1~6sdUJ@~_?Y4F$UhCcY{*+=sIYc%iI|Z5c@F*_!A1VMH`)S+|<0 zS)uqGTKoiRtqbnymNko`F6imBv(4=Bea^7hm0g!`e^pg9k;WjyN;fXL|Nql3hM9BS z+gw|{G_YXe5f)86#uEmXGqHqa6GbgnuuQ9H<;eIHw3XSjVt1^DuH_j+{sODWkkak5 zTuyttS=keINW*WN)_vcl_A?m!+--=>D#J+TeYV_zpaBgAB3yG_|DdFVBWUj2r7@3W zx`6dNOL51E;KJEdvL-3X@M-K;s9!_zALuK=9sOobd2fht*LP^yl&HyoUQ0*68D4aW z+;w42X5JAbVzQLEpjUHg$rpE!qJJ#?iGlu1Fi3KUZWd`qx;J+O_AUB(m}FmMOksr1 zW)pyGxK1~!6gMb{cK(7M`U1E4Y({5$#%VHDDdLtKhvGLo0`X|r&M zE62FHlRrZLSMrWQXPiWWhUHdlGTsrFN+-Olw9v5DBi7{SjgVFVmmEBR0Ig!2kdN literal 0 HcmV?d00001 diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class new file mode 100644 index 0000000000000000000000000000000000000000..8ea5279ad5f41819492ccf8210df6febe3ac18e4 GIT binary patch literal 6241 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 literal 0 HcmV?d00001 diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CompanyCustomerDao.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CompanyCustomerDao.class new file mode 100644 index 0000000000000000000000000000000000000000..364a01cf32c40f498ff83191642542fe913633e9 GIT binary patch literal 748 zcmbVK%}xR_82rkw;vb4ceE|a(>%kkwL{JkAL?ej@Zy&oAiraSSb}@VK#XR@`K9uoe zNrbE?IW%o2oz8ToU*8{}0B{ENGVGP1R)&2Bhm%;?q+?WwI_bobGfLQYa_cj=Yjnpr zMIN9Y@~+XtRVHgU_+Zc&nx;$Ui`vv7x>6_Sk;zkB!<{%Ty6`GS-B@B)p zV@g(uCmG2>ATG5wj%*oCxgK|o9dZoO8woB`w;UG-_}nFFol;J}ZAy*WlNiiv^wDIi zByp;7@gwHxFrX9^|3^F}2Gl)`JblJ|fk6R^v@6lB$e;{B&>E~Sph^mDWFVq%5+w&) Pu$|63P^Gy9D!z??$;RHW3q_TnmQ)3$pvr~2&P*E`XQo4UPc%Q|N4W3< z`~!c+^2~H5At6ZV&c#f3-@eatPv0NEzI`X6EvlAjqfDD+dd6txES09)P}VW}T5SY6 z=1rkv73!47-KKELwxiT?`Nhe^DxGi~TPm@c&u7TGc~yV`Ck;ceKnE=g0B*%T(`bcXH+>#afs!6WmPkheQaJNiFSFL zfYL@on-&*s5u8Y_^6qjmP(UMrD4b1oM3e%sQeYU}%qdcY-0kj%jP|OHQ_>66khA zC#_x+|JeV+MK5c(S8%nIw$WT!Tzdb@J^!gw5zp9JuYF)Np~9?)(Yx)@Ty}Ep)uFuK zf-2s3Wz-(I=fw6gc7%aibLkjiSG4|>e@=s_@y z8w3$>Dqzf-v{W5a*!l(G`Ly#^W_0SD!}MMAR0hsJ@Ug?ezf#d|OT%}Cl?VCu-*`NG ztWy)n*D3=47K?IT3jI9m5u>$Xo)6J`^9p+Vyii>&n{!16FvXHUiO3JBQ0V@ELR921 zAi4*F5x;ayjz?me5y*~j0`s>#iD^Ys*iYj$Q=&4KYuOfGiDv0K*7*{CjOOs&urv>o z1zN-*GnvAZB!Xy(mU~_xTEUI?u$p_A%VPHISD<{0ZjV#GGgf(x?hb<8%Y)s&D0)B- aq2+@ohdhiGBl?7WF6q literal 0 HcmV?d00001 diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/PersonalCustomerDao.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/PersonalCustomerDao.class new file mode 100644 index 0000000000000000000000000000000000000000..ab7598c4191e64a27c0879baa4f980f01e0dcc88 GIT binary patch literal 757 zcmbVK%T59@6up(l2)i$x{gjD6*SQ7AR{t%`Z}s2lC1n>H9!I>HT2(8U?e zksyOLNh;MCCnC#Y(5$VjRexr17-gspeQ@i?TWN3Fz^5fT8GjCDyPs!1|s?}yUV@N%0a_`PDyewkX=6{q!rJTD>(Hpb z&@bvkKcF8~b=J-e2oeg&vex$aoSAcWcK-hR{RaRx;AI|O{aP*eO>}L`U%0 zNX7R>P4o|tKT~s{8DA0a{yw-c5HCCp=ps3S--&d~og!EG{@rU7kiQf-s*SAUct6r=ponK|c;z%GhX1CXBNpIc6 zmy9HvySKu24Hx`>>LZsNhp)gGi$3$_FMz^`-y8Elp(?1G;Y0dKh7hyCqdy&(0n zu-UqfLkD-IB9%*@=@9NB&6hfc9qHg3JIxrp8+*(grDK=t0R5(g@C5i#N%ZXqE4uCV zru2pHNTJs4>1ObDbQtzy+_5J=rMQ@%CSfv9lcr0@*E9nL8JfNT*(`%8$kLUgw;at# zTJm&f;10~tx<&lN zQc3r345W&9jI>Rv62s|1u|S!{7Ws?`L|e+zh*@5}V!iQYC`H8`K8-Fa>N1P|<08Tk z>TS_Yn9Vc>@aAg2ts&sH)tK(!En=-0c6vc#A9JG;788(-(a9aIOG$kvvBLI)s~t-C zOO6|#3Cx8>1#&O~YiYryYD{2xnDDleDNFhU;{U<7K(8_g9NksyJa=*R2w7K)S_X^` z)q@M(%e)uzc&C>tZA&l$FY-?7QN#6V%q=~#Hl^?J*UlAXO9dOB2uzoqhRN}8O<9H8 zY_yc_Qj@x>58l`r?@);yDN?2_-78nSBIX`<(t{D0_41I*G{%M{a6Z&YA3Dc8w0Z42 zOi2-`jLLq8Sz*#RGnDr%PmEBBk41!>HeC$3*t)u5%8V2p=K6J}tuh^QM-rR2G$4NkBPu*2lJ0XO%cHNjo&y9$C(M7FffU` zDcsGDLk-0=esusmnt^M@(IkQEUNsAI=m^t&tm|X2g6dW8u?9D) p>YHADYqa(4(bjk1?tsZX4{#qI3{(%j>d_@DB$m^A4C|ielRx3O)%gGb literal 0 HcmV?d00001 diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class new file mode 100644 index 0000000000000000000000000000000000000000..e9a3f040a0e1f30424dc5cae5e0208cf01a909df GIT binary patch literal 21097 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 F{{si$=F|WH literal 0 HcmV?d00001 diff --git a/dq-financial-crms/target/classes/mapper/crms/CompanyCustomerDao.xml b/dq-financial-crms/target/classes/mapper/crms/CompanyCustomerDao.xml index 46b05a0b..7ca13ac9 100644 --- a/dq-financial-crms/target/classes/mapper/crms/CompanyCustomerDao.xml +++ b/dq-financial-crms/target/classes/mapper/crms/CompanyCustomerDao.xml @@ -28,8 +28,8 @@ INSERT INTO crms_company_customer - (id,registered_capital,industry,years,region,shareholder,affiliated_company,emp_num,linkman,business_source,customer_id) - values (#{id},#{registeredCapital},#{industry},#{years},#{region},#{shareholder},#{affiliatedCompany},#{empNum},#{linkman}, + (registered_capital,industry,years,region,shareholder,affiliated_company,emp_num,linkman,business_source,customer_id) + values (#{registeredCapital},#{industry},#{years},#{region},#{shareholder},#{affiliatedCompany},#{empNum},#{linkman}, #{businessSource},#{customerId}); diff --git a/dq-financial-crms/target/classes/mapper/crms/CustomerDao.xml b/dq-financial-crms/target/classes/mapper/crms/CustomerDao.xml index dc175407..36ac5037 100644 --- a/dq-financial-crms/target/classes/mapper/crms/CustomerDao.xml +++ b/dq-financial-crms/target/classes/mapper/crms/CustomerDao.xml @@ -70,10 +70,10 @@ - + INSERT INTO crms_customer - (id,code,type,manager,name,addr,phone,del_or_not,status,create_time,motify_time) - VALUES (#{id},#{code},#{type},#{manager},#{name},#{addr},#{phone},0,0,#{createTime},#{motifyTime}) + (code,type,manager,name,addr,phone,del_or_not,status,create_time,motify_time) + VALUES (#{code},#{type},#{manager},#{name},#{addr},#{phone},0,0,#{createTime},#{motifyTime}) diff --git a/dq-financial-crms/target/classes/mapper/crms/PersonalCustomerDao.xml b/dq-financial-crms/target/classes/mapper/crms/PersonalCustomerDao.xml index f6812751..9222e27c 100644 --- a/dq-financial-crms/target/classes/mapper/crms/PersonalCustomerDao.xml +++ b/dq-financial-crms/target/classes/mapper/crms/PersonalCustomerDao.xml @@ -36,9 +36,9 @@ INSERT INTO crms_personal_customer - (id,customer_id,id_card,age,gender,marital_status,education,employer,position,working_years,social_security_num,living_situation + (customer_id,id_card,age,gender,marital_status,education,employer,position,working_years,social_security_num,living_situation ,residence_addr,business_source,emergency_linkman,emergency_linkman_relationship,emergency_linkman_phone) - VALUES (#{id},#{customerId},#{idCard},#{age},#{gender},#{maritalStatus},#{education},#{employer},#{position},#{workingYears}, + VALUES (#{customerId},#{idCard},#{age},#{gender},#{maritalStatus},#{education},#{employer},#{position},#{workingYears}, #{socialSecurityNum},#{livingSituation},#{residenceAddr},#{businessSource},#{emergencyLinkman},#{emergencyLinkmanRelationship}, #{emergencyLinkmanPhone}); diff --git a/dq-financial-crms/target/test-classes/com/daqing/financial/crms/DqFinancialCrmsApplicationTests.class b/dq-financial-crms/target/test-classes/com/daqing/financial/crms/DqFinancialCrmsApplicationTests.class new file mode 100644 index 0000000000000000000000000000000000000000..9e78cf07b9df7e7b9d2cd04517d1163839d54dfb GIT binary patch literal 2800 zcmb7Gi&hgy82&aO3vrc*msV}Pq6M@rB3dz)79&*JDAXXn)Hc)pr=UN9P25zR&@LVSe!xF(qL~wv^ zgxh5|Qu>4tJZ=qK%qVSp6)V?^>_xFEAL$+C_i6sC1`6eMu_bKHU~6r>I+g{!-Dm+X zy~LYMb=z2H2<7*x9loW7;xyG4k}R&r44|#CYm1(!uT;fw#;4(N1Ct}&{dt24osWa9 zY|pZm)V6`E|62`l-j`}Es4fcan35q=mahbH=*T%&=XQ9HBwf*gHE^SQ(FTFC6}`8e zz*jm-m87ii@H`F5iH!W^X)p)tXMc0|rz|XB(ZuH#9-?Al36Cr+>*X+xn0RdA3p_FLrG>BX zH6yFNj8rHZ%@9X}efXw;r~G_dz^H}qAWW=Sa8NZNE!41TV$Fh!rv|1vLASc3*|2+L zgqD+H_XJ1N!pgdI*f9qpsdW1;gb$c!14l=iRh}?al%6$3T~mj4Mdz8ZRT&yElPoOM zSivLnqaAW72NN}@)u)qgiLInryD(}C36f9>C6_n=IiX(f=w5@=z(Bi~4E)f|Viyp5 zH_2q%162@Mp+p2HaX1Gy*9(eo>Mf8t#Z?{L*Ws6f5Flz*2yi<0EW zDV*k)EYSj*e~cE+P8x~z3Kf8<_`MxwqPau0q*nqxRB?fFLtoMd}#;P z{mUu1`Z2+;_ObtG436!fup0{z5oCK literal 0 HcmV?d00001 diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/config/CorsConfig.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/config/CorsConfig.java new file mode 100644 index 00000000..25645947 --- /dev/null +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/config/CorsConfig.java @@ -0,0 +1,33 @@ +package com.daqing.financial.hrms.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +import org.springframework.web.filter.CorsFilter; + +/** + * 瀹炵幇鍩烘湰鐨勮法鍩熻姹 + * + * @auther River + * @date 2020/9/25 15:09 + */ +@Configuration +public class CorsConfig { + + @Bean + public CorsFilter corsFilter() { + final UrlBasedCorsConfigurationSource urlBasedCorsConfigurationSource = new UrlBasedCorsConfigurationSource(); + final CorsConfiguration corsConfiguration = new CorsConfiguration(); + /*鏄惁鍏佽璇锋眰甯︽湁楠岃瘉淇℃伅*/ + corsConfiguration.setAllowCredentials(true); + /*鍏佽璁块棶鐨勫鎴风鍩熷悕*/ + corsConfiguration.addAllowedOrigin("*"); + /*鍏佽鏈嶅姟绔闂殑瀹㈡埛绔姹傚ご*/ + corsConfiguration.addAllowedHeader("*"); + /*鍏佽璁块棶鐨勬柟娉曞悕,GET POST绛*/ + corsConfiguration.addAllowedMethod("*"); + urlBasedCorsConfigurationSource.registerCorsConfiguration("/**", corsConfiguration); + return new CorsFilter(urlBasedCorsConfigurationSource); + } +} diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java index e889d69a..c80b9576 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java @@ -25,5 +25,7 @@ public interface DeptService extends IService { boolean deleteByIds(Long[] ids); List listDepartmentAndEmployeeTree(); + + List getDepartmentAndEmployee(Long id); } diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java index 5779712a..df39dadb 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java @@ -158,7 +158,6 @@ public class DeptServiceImpl extends ServiceImpl implements public List listDepartmentAndEmployeeTree() { return this.getListDepartmentAndEmployeeTree(deptDao.listDepartment(), 0L); } - private List getListDepartmentAndEmployeeTree(List list, Long parentId){ return list.stream() .filter(dept -> parentId.equals(dept.getParentId())) // 杩囨护鍑洪儴闂╥d涓烘墍閫塱d鐨勯儴闂ㄤ俊鎭(涔熶负閫掑綊鐨勭粨鏋滄潯浠讹紝鎵句笉鍒版墍瀵瑰簲鐨勯儴闂╥d) @@ -169,4 +168,9 @@ public class DeptServiceImpl extends ServiceImpl implements .sorted(Comparator.comparingInt(menu -> (menu.getSort() == null ? 0 : menu.getSort()))) // 鏍规嵁鎵閫夋帓搴忎俊鎭繘琛屾帓搴 .collect(Collectors.toList()); } + + @Override + public List getDepartmentAndEmployee(Long id) { + return null; + } } \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/config/CorsConfig.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/config/CorsConfig.class new file mode 100644 index 0000000000000000000000000000000000000000..5999cda2358cf4952773e315ff0b766bf606ace3 GIT binary patch literal 1478 zcmb7EZBG+H5Pr54TF+BTc~MjZ5w&k{fQUj7g+}9tB8eyoe%to8W$}8adspy>_(Svy z7)ksA{wU+@T|?0pB5g9WJAG#6nV0Ra-#>l=Sio}w1DHzSo`IOw_YK4`W#9oa`jkx~ zr*&S7f)>+B%xJ8Yz^s9*m`h+jfrkuzE7Fz0Dnm~uyUh?UdA4BaFH2XvZZ;}Hz2y~$ zEa|dW<<2%&Qr}y~c(5ydhUs$EYgjh_B;C4IlP-6wk~`L}YWP;wb8E70l|1E_!ef!a zsM77FbONEsIg>4Ws&4ro6}i_GZ-@g=eXtHhg<@$;=p4bxdAzBdb?yth9kQu-AU$`> zYpNU#=i8KZoR=RP~{r{hSG0dFn z-salsWdaK(9%0eMV?1GCITK4*Hc`}K1wNcZNBz`lh)50mT*jVX-K z*^B_VhU;{rN^ygNXy-5Jp)as}jM&Z*ddkO$lkVLp#J{8O5Q#!Md5BA)G(vefpEe7J zxN?lEJNYB@e}Ne+=5CaOBuC~o5>rZ9#ao#rqevYCi7w%8;wPncW8Dn+O< V!o>&|@t+_aqr$bEJh9#d{s3gkoa+Dp literal 0 HcmV?d00001 diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class index 3ae3e99b67092a1089b5e9ee3bb6f3390da08b1c..c623421454aef39cc712789caca858b88854cb11 100644 GIT binary patch delta 667 zcmZXQ&rTCz6vcltr5Rej4oU)IB7~-zD2Y}Jf{02{M8&Cpuv8JX4p4QVOwlP7_O9K` zBN%mUSn0wC&=+vw!Y3i#Z%W#Ti+ktZJLjD5-t%kdQ@Z?P@7s4^l$|6!6cZd~p^Fj^ zEgmK5ps3TLo;fY%H^|DQH=OD`c50o1VvL$%lbXeA#Tx=eoh`)-4aFR96%O0G?>c8=Mm+r4^pxXHCqTxV7exFJ*}wC3by`=oqy(yjJM`}X7oJST1x qyB)jf#y=k1{*RzNa43YoyB9NeME|b5XmT%Fx<{(}($BXRfAANVHe%`k delta 592 zcmZWl$udJx5Ir{ukGOeARgeW06{=JWi3l-<7$PzlLJ&dB^Blt;_<{Ea6l*Fw3-+q) zEtGGtu~quMq>>Vg+pqh)bGrNVeeJs?@%r=h48VmeJ&cGHqa4#Em_by+tR6Z55!ios1BCJVRm#`sW^D%L!N%d<#b;Vm8+t^`nDi6%0ylJZq z9J|=#*vA2boltwDK!Ti>IpjFPp@d_O6P$9KA;~d_a}GZ)I0Cp#y%hPhOs5p`TZ>r> zhGu%UBx-Z1m3%R@Q11^Ou5zH2Dwzz_p&lAE(BA?EhvGGu%uX~>$r&-)=usaBeOzc) zz6_PhwINi~A>cSz5^j|%32vu4p-ZK$*K}toJ^7Sg^eLxu*zG|-kusw_q^_VR6Eu+3 zdh@k|r2UqowzO6T#}J0ez=+tGWNE~gv*b}Njpi(6PU9i6pRRFJ8j{o3_;Z7?e*$rX d0D_9GEM^T+|1eF|U|e0=NZAC{li9_megQNWPW=D? diff --git a/dq-framework-common/src/main/java/com/daqing/framework/model/response/CommonCode.java b/dq-framework-common/src/main/java/com/daqing/framework/model/response/CommonCode.java index 259467a7..12b33839 100644 --- a/dq-framework-common/src/main/java/com/daqing/framework/model/response/CommonCode.java +++ b/dq-framework-common/src/main/java/com/daqing/framework/model/response/CommonCode.java @@ -16,6 +16,10 @@ public enum CommonCode implements ResultCode { SUCCESS(true, 10000, "鎿嶄綔鎴愬姛锛"), FAIL(false, 11111, "鎿嶄綔澶辫触锛"), + INEXISTENCE(false,10004,"鎶辨瓑,褰撳墠瀹㈡埛淇℃伅宸蹭笉瀛樺湪!"), + UPDATE_FAIL(false,10005,"鏇存柊淇℃伅澶辫触!"), + SAVE_FAIL(false,10006,"鏂板淇℃伅澶辫触!"), + DELETE_FAIL(false,10007,"鍒犻櫎澶辫触!"), UNAUTHENTICATED(false, 10001, "姝ゆ搷浣滈渶瑕佺櫥闄嗙郴缁燂紒"), UNAUTHORISE(false, 10002, "鏉冮檺涓嶈冻锛屾棤鏉冩搷浣滐紒"), INVALID_PARAM(false, 10003, "闈炴硶鍙傛暟锛"), diff --git a/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java b/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java new file mode 100644 index 00000000..4e293dbf --- /dev/null +++ b/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java @@ -0,0 +1,32 @@ +package com.daqing.framework.model.response; + +/** + * 鎻愮ず淇℃伅 + * + * @auther River + * @date 2020/9/27 11:56 + */ +public class PromptSuccess { + + private static final String DELETE_SUCCESS = "鍒犻櫎鎴愬姛!"; + + private static final String DELETE_FAIL = "鍒犻櫎澶辫触!"; + + private static final String NO_BEING = "璇ュ憳宸ュ凡涓嶅瓨鍦"; + + public static String getDeleteSuccess(){ + + return PromptSuccess.DELETE_SUCCESS; + } + + public static String getDeleteFail(){ + + return PromptSuccess.DELETE_FAIL; + } + + public static String getNoBeing(){ + + return PromptSuccess.NO_BEING; + } + +} diff --git a/dq-framework-common/src/main/java/com/daqing/framework/model/response/ResponseResult.java b/dq-framework-common/src/main/java/com/daqing/framework/model/response/ResponseResult.java index c897e97e..10afea2e 100644 --- a/dq-framework-common/src/main/java/com/daqing/framework/model/response/ResponseResult.java +++ b/dq-framework-common/src/main/java/com/daqing/framework/model/response/ResponseResult.java @@ -56,6 +56,10 @@ public class ResponseResult { return new ResponseResult<>(true, 10000, t, "鎿嶄綔鎴愬姛锛"); } + public ResponseResult SUCCESS_DATA(T t){ + return new ResponseResult<>(false,20000,t,"鎿嶄綔澶辫触!"); + } + public static ResponseResult FAIL() { return new ResponseResult(CommonCode.FAIL); } diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/response/CommonCode.class b/dq-framework-common/target/classes/com/daqing/framework/model/response/CommonCode.class index 2f3adc83252c986700346f328a7478cbdc6acabf..a66c7457a5a047e145fbf6d4d08efcfbcb85bc20 100644 GIT binary patch literal 3120 zcmbVNTUS$85dIDcw4XmwE{SL8`VYsKgLzEVt$WHP{wIh#1TT6QaFWv_-U{ zv=$WwwJzJ`Lsbk4wrI7l{T(L2lmDQrv-gP-A?=dp;mquB&o_H!&&lH~_Z>bsBVOu>}Vi=wTl(`}j2QYmtg>5r>!zXbB98=wUL%ki#O5u*D~A@u`T< z*y3{$U$FI;%;i@iDnxwE@T1IUuZV3TjxqJPi0vZ2Vd}Rcc8KU>>Io55BKnznQiMsw zDW-lWVyB4HOdSwm7IB8DXGK(t7-Z`AA}lHheOE>Nz}Dw9_)&u)0UEj4Y_`aXCTp#LG;6(O zk5z86)SE4|YHqAHHCft}y;RxM@?1}=w$xf)>|{3Ao0^+;S?ZgtX0oqlOpY|ztTOpY zx7N3qYOU36jV7C^PJm9f*jg;MHjB;HV57i;A*a(73iGyo5SBX(iQm zISxC@JPt}o?g>y{6tiX(d2O~(!sUAxpK;1zhbQEsLpK1vZt=s3S4|&^N zfhI@0hY$_-+pu3iwP9h@MT-wqs`Wb^o)$;I%?^m2qV`c$1*i-~?8dGy@*Ide(BcbuD;Il5+bdp)VRHpT9v%@jk5=}F0!~+ro7F6H zZWc;eqv=q~o{Bmh&f|iB(#4IF4mMoWp$6~junSflcH=#|v-usoGvxMkxB@!tg_9;G zE(9HhaY=_}*y-90vFX^RLmOJy)@5q4lI3hn2-}A}3>%@0N|wjwgQI5o7kiN#cW3VX%=fl2cun-w-RP~8C6PzxA}0qT zx35S0C!aq4DcXA{G8umQU?6hqVr1mz3LUmH>+I;|d(rb_F$3<3wst66=f@(~ugu%3 zVq58v{%f#IsHE4->C?m-{BpdG`<=1)S^_U|k;{%?MKu^S;1Z2&8@}`93 z-LNMhi}S87eTaAG-Czdy zXQT!rPRt+ESW~Dt#@a&JWsQ-HkGO}ADNlMm6I|7TA}xyxd9FzG%qAc&DAMYLWO|Gf zkQWrGI00EiJDdtx*bNOO13^0lwOuMusk7GVr6rSieH?`xTB=rM6?aN+aA+BamM5#S z*5*hnIJA;OZ>A8GE3M+tY7VW@5R@ma<&c3xMIu4@l95Bj94gT>W|p*$W2GD`(=)0h zt>;)d$KKL2Znm_6V;ecPNuR2c-j?3s&}O~%5v8CCqfoZ1!&oNUlfzgk+f%|=E!#C= z7-YK`MzL(y6I4oquyPUvZX}T!#%6gO0&5RtnoDW&fh=T0!W#N+K@PnLxm5H#1dxwD ZYLZJRz-=tSpGc?nQyQZKF5)F&|37XX`G^1j delta 1238 zcmaJb{tVrgriIz(oj9J$8w4hxdpv|uB(^n zHjY&aH0(sPh8Em6;;qi~7PM+8fk(lb1>?cD_mAeEPJf?y_G@-nLn%DQtTo$QM)=j5 zomwtsKORpkgvaN{Mi$1Wq^yFj(`_Z@N_fI;wqhkz1o}a!-nE<Dfvx&7^#}_q~sPX#uwG&OVBf4AuWuocd&Hm**0@R zp000@RF0%_?L;N&d6LSPRDm$-F1=7P?s%Iq8I$96w}+ujQ(Agubgq|05|9WTxpY>; YNrO&8Cz3IMSQ^#R!1m(+sZBWe2Vha86#xJL diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/response/PromptSuccess.class b/dq-framework-common/target/classes/com/daqing/framework/model/response/PromptSuccess.class new file mode 100644 index 0000000000000000000000000000000000000000..ac2567bafcdc3fbbc1e0dba12cd83b6417e345f0 GIT binary patch literal 722 zcmb7>OG_J36vzKJnIw}KUr}416?fW&LvdLtXq<>JL}4^rxtZLiW9MOKZrZOP1)=UN z6xxM>Zp11=q>Fw4KS!tNmnc0MgDky}3%~-Vb4X(>gK-rTDkfD- zW$=ulZ$&rsO?}(kDi(FqWGEOr{5{tk?$tF@2DVp!$3t%_iiR~_;c4Bz5Tg$H((dpHBlX&Fnq!}F?My+PlI{SUG9~~b?U%u01cMDms?g&d_1_@dwkil0OJ(%Vcjthe$ZmMW{R$j*{?67h&qLaEkIjrThtu{sTUcr1t;- literal 0 HcmV?d00001 diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/response/ResponseResult.class b/dq-framework-common/target/classes/com/daqing/framework/model/response/ResponseResult.class index 2dfdcba691cf8c1b08ba2c3183b26f5bc2085a84..63461c4a675058345d730284fd84c959cf216722 100644 GIT binary patch literal 4579 zcmbtWZF5^k6@IRDuXJtSM6w*)vEzahr$m-)t2Ci${6<_SAuhI4A~#LKOL8Ntwi3NK zlH3v~g@%`=g}%@h3QTAErI0WAK$*sww!qLYWrp8DJAC60P|9<5ucRwS&8Wd6?>&2V z_w3o{Jm>8Gwh;&t?ABXUh4)h^s4gvuM~bf#Q3V4O8zri&{Xit`j#+=^=;x^U5b!cFGf!fNuwg^QVVWzs-< zD!W>6D;p)w4J|7 z7BWj4`3srSvU?$?3>MRF?vz`~O5anOm9;E=KCqB3=94S#Wp0yvyyWIHPZmp;l6jiS zB}Bu{z*zZ*I6zjvX*Z;AlS(CGeHtBdJ`9ClKU-9azCzJdEb zuLT01dUS5?Xewpkf!Ii^%M~m&G>*r75%FStm!^!0fkQC@a+m8J?=o{tlmW$i;Sgn8XE(kIe7jkb)RowKYMR#50AIp_09(LL-92LI} z*lTWiO(SGIa&mt0C;`yarrVx(_THK&cBQBfuOdj0Mj8u)cW_@QeOL`}E~D9eFgCS3 z;T!P`&D^eHU{b}6QaW=iD`lpe`QXcoaUqd|aXju|FYa~lCG2xBim?!07R^JVIU*X; z@BYtUg+lnHg9*GMTO2eH{`l1w{`r?TKEC$yN6)|c?>|2y>Q%z7)gQg}_P^fw{cZ<` zWkC!h4$fiO!K}D3CvF_YF$XEp9ml+b^Ekp=T9>+6}qih(hI?p7J*qe=sATsX*TaL3{KI}JDNR!!~CG>6^1*@yXrFwrIy zq|_!XR9|uc2I5LiP)}k~-a*|sl5Fo|?`i5y(Z+AVi0`_Iw)o&p1ma^iVZKd$0AFU? z3ybYO&Wxd*R=3k?Hxjs?+PGfNN6Z2C#J>1pC`mkNQ zqn&9s>A5jXN9C{ceb{IIg!WtL_#?Z9LL$g7cv6E4rf6O;Jcpp#C@c%iu6>b2wDT4m zS)}39iyrj(6t4Lc#`l$A)KM~)#jT9x|W6#(QQpOo%+8wZD&FG z3~07Df#xv1WXWMG(9H5HfLZZ(&~}4@ACO+&)_a|`rV(jutRv!0ZiRoj(4&75G3 zRY5Na>u}1LhI0Xn%`696wJb^P&!M{IC7ke(Jyr8LaTDQIE$f0+&xERFo}GoKo(Yd| z|8L;rZKvQ~zRGZCe54>XKLu|{ZP^&*DMCd4Y9jszSmuqy2e5w!D{v$6H`t4#@l8Zj zmqOPl|KF4`cB1S=tDWv8_PQs`vA?6U-~13=*Wrxyo155CUE4EZaZ1lbu-}q7!4DC= zj&1!`f3P~q6t0`T0;HpUTzglG`c*utYDo|BIK?8>h8d>LW7Gxsoxy2JCR|<`XDC@% z#V(ws6jT*abLgta6K&(0wDB$Oy$78k`#;zo!nYmg6ZD4g9sX?N6YSJtJ0Ifm-tb}~ z+!fAR0@>C?^;5Q*_nba!tVhE$qmN>#!p3 z`Km5@ewriQOEQJf+mXa|gvK_}tMok+rVR9(-iR#$;m}}npbzLhJ)i@G*;Pqk@i}!t z-ElFNyEOd|u;le&g_7wz$!QN%fii>Or|3a|P#P?b#-}`)*J+d9JuuY}aaE%MUtdk= zfmNMQontntIE_a6+R~umDS{?d`0)GaJ97&=qy3v05ZpGgD>|s<=qB!oenHFKoA_dM zNXtF^M0c~<#Gb9SEbOaghdprW;S-InID8;`p42NYpBr1tLd0jT%8RgS zx#qE9;P%%`INonIDFWRk(K(2mRSkT S()Yj`{n1hu7rC+xm;MK?R8%bh literal 4428 zcmbVPTX$2(75aW_2yz$_o!|S23$i+tt3LYxQ@uy!H>2rr(}9M>;Y}mV%c(vuDqqJ>PtL z&z|Fd{_jtJ1@IVt*@kU6-wGQSq*<0G-;M%`(yT~xF@jPn%BZw)Zq>$%(!V5{m&N*$ z3}2DvRcT(6=5_JiHm*qjwlqJt@eAqSvGK0-S8cp!<9!i7h~Ps5 zk@9LLlP#AG7-tNanc_m0;ta(Fx8fRz&7OB(bW_W2VKH_5-1%&#GH#$Xom(upmDLh$ zL-X_0MDq0EE^-`Pkgk++g+)$>Cvt^cWy-*&_?el2N6%pRB=?(ETX)Xp3fW_;`E%LQ zynAk0IV@(}<&$nHCu2`(R+e(ayn8lN%%>LIi`*vlLdnf%Un-U^r1EsNoGN9@E5$-N zn>yhM>{pisfA4Ia%S$W1+r9VUZ-N9&(dlFHW)~BL9Cloe-A0t&*uW#-*8_=9KRZ2r zD4jO2CqCTlaz#s(jid2EM7$W^rz@jkU~im++~<1p@cx-u=2xzq_R}&HA7)}k7PE>o z=39K2*(u|LDnYw>>;@@n#fMd5w$X6T&&_(#MgJ)FI`>Mk>f>kNGQd1Rw#z$#XjvLzBC>Aqdx$Tp?(29BDj zUcL=_t~!3=J~Cn=A=$hkU2!uP=G+x^;aHqhwXid8;gH}qU@y7lCC!la%!!$~LnJ`w zGGTk@?Cn(~cBQBfuOdj2hU+VVcknVRS3}7!HT;59jcoN|H_22S zc94;CM{7H3o(=45l8S1PYihxCF`q9Mbb2*c6>BTxy>VAovV{c$qrtoCXH+0H>UiVA z0p9-aoSylv>AKzgtNg9*@Gzh5ZTvtm(IP2FsYS9*^~?eAk|;SrJrj}gM(ReflWmHl zH>fw+cPDPcNNl-1918tNb zb`n+!n+bRufeEx;?XC)K5KrJqZdQXa=)q{^wHota3=*jPw0{Nr^zYGn8*RVkkWVYy zFniDe-zbdJy>R$EwSv1-7MNW_(PXUsHXK=`>C=mz3}EW4V(P?%3X@>ccx6tgp+n9k zxRnm!B&nbJHk2D0pq$`R-hQ@%azA^)ZYBPJmYWoU*m@N<9U9BSR%1ytI#{eD4cvv+ zyW7&FJ60r*!yvkj^~`N;%AIEE5b?3RH9%>uce|r0w+4=4#&b7Iv=ZsCx+%5$p#$8Z z{OKTus{sys_n}6o%xOBG#t$2L4mImp?pH9KYo2E@=P`S-iaB`;9nE^ywWF4lzGt}s zLxH3`#{G}unR`ybz079!lG@Pt6nw0-XJdq?h>-a!$;5A9nKzSvhy5k2(9PuEV9$*t z*3hYj6rv;iyDoDabaBw-4`RnSijA40|3G`6`8B$3z!~i`*RauF+dXE{q zVj>wPIco`J>o00BW&L|kQ$m)fqn5I@3c#-hFC;^BE6>8I==g*=IS?IR67qiqJ9_*E ztf+g|*L9tprqn!JI?=o)&IzI)7+i9XYtu_Yj!8fZ-PZoQ{RbcmEbuP%W_ z!q2MbCeGlv#2;eG+k|tJ%)m)bd87)JS%kkq4??8UU~x3Q;mN!~i;NzCsiw%QnhgcU z%Ag09Z{XXQ^(vatDL;HPX?TsKNfqAr6?#wK#-`ZjHS`H@Yv_+{(Q?-s24W9rIktue zV-IP$n_X-xn>9SVzLs?cYS})IoLcxq zUaorC(0}iTL`R~}Y)}rm)E+vX{T^hXzxw&muRdfXb^GOWmhluxiiM7+z9h0zzm{T^ Tpp||HULYPVEn diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class index f893721274b53c0a4fff29bd634a731b0c29f895..3de4bb98066a69d0def0fd5ac4ce4be415b0bb34 100644 GIT binary patch delta 187 zcmewyusLwUS*Ci!rz>YYUB3Hy*S4o^TQv-?h dDzZr|nw4?$p_f<*AzGr@QBhw&jMkC^0(ax3cA_nk+Cn=A5eKshTMR00009 z0RRbQWOZX>oEtv@PP5z_DGUKKlLjcQ6xT4Z diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class index 74f4f0f231d4ed4089441071203faa80080ce452..db53adb8be85617fee7e103267516e04459ec141 100644 GIT binary patch delta 183 zcmca7cTaAEFFPaub)MF2_qDx&}Z delta 183 zcmca7cTaAEFFT{)b)MF3b_D#-u< diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/ManagerName.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/ManagerName.class new file mode 100644 index 0000000000000000000000000000000000000000..4c36b24ae195ad0c46c490d8614db2ccb72ec09c GIT binary patch literal 1374 zcmb7CTTc^F5dKcP+g+9gO1W9A)(dJclm)~K6nv0CLQ>F(A<-uf?b=^R%wbu>APRkmVn%_Xk)IW2 zPF&9mb6dfJ1{DPrcZ9#I;-2vL6)Z9+4Q}(Q=`tird;B#w>fEjx+n#IL)gnV|*|II~ z0YfyC-C>Ycor=jYRI+SytJT;w-KTuFPB)2?Q|9#@?pop;UP@lgYBJ21%1*XM$<6gdd6lj$QJ!4V6AF;;SIxRCfjQ`t=W+?mN}myMvj>W zEncTF&LlkA-80KxG5ef>IcK?tzZhi4s|jIrL1XGfrvd-^^sJV-y(Tai)EaNr0*Oek z4QlcD$;RdyVNe`%&1S3aQC3H-=LAv{;cchomd$lb$QkbtV@9k+$1oB)h7f0%{a-nC zT*oCH7m(DE644ZHFido>`(ewfR|MhF4)jdOdqu|*XfG_QBZnl7cv>DPMhyA>zG+t& z3cYr5ZapDh5m)KG4$@<0hzN!hDHIc7vLkdd$TRYC?ilP71rdyrjro^D7^7GZ5-^Sl zIx)eO?AhYah1ebK}HBI#u6OF#H4lD=N;w9)MquH z`v6%w%Kt?4J>=+7{s*F))44Vz|44znHBDwoD*Q%&Qu>AAL+FL1)JDwDkdC@21pF6* z_9sKE;xf_%K86`wAx$E*^E3&aCaGzCxJHpgA3cn4#6|Lgsw`&f4H7VwPe5d9EkKxf zP+^-YHIb-II$m6sR(w9Gc(F!o)Oh|7N}&zq#Y(C-KrSc^0iq<}P28f!GA5CsC<2Wb wWqlUR=Mn69o&JailKKYq*)jSOS{wZWn_NOC)5bve>f;@&PlbpKd0*Y>f3q+4M*si- literal 0 HcmV?d00001 diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class index 6c3330fafe92594c84e72035d845b175b13f6ad2..6d892785237a638764686e327681a18453c02417 100644 GIT binary patch literal 3283 zcmbVNZEqA+6n>`N*_rOnw#(9jD=!u;*jHA?7no8MYSC(2u*E7U%5*!l1G_tAX0}lL zWHiQLNbmzO@uMFkCTKKjA@~yY11A0f{s2V&gNgCEGqc;-Wj-_}yXT&J&vVW_Z}-e! z|K9o)z>|0{g)KPQ1_kd3@~$AK1Th4eQ&3ECofpIu(9?oj5M)shOOP`{a8^Mng)C00 zD2uhC!WQe2igPL)6|M?T98?u7D>yG9RkY{LBhHjjHYMaH&KS!^p=4AR3NxN#RThRN z|>3A!& zBQG1JDlcif|IHWoE?>QO<+6lb{)HC`6j}4W(L#}iJ;$&ro?Do*y{T%cL}jIHx~{Q6 z^{#tYF9pB5H!t7+;Fr5MZ~gt%EeTq&>UwtBbdIeo5wy=^)LdijHY`<}rpt zM_kWvynt8C%6z~j_gfXqJ0PL8w{KQLVw7P>=$No7=2W#jNBah|AaZ3Fjnb^)SYjU@ zCcH(9Y0)Q&cDXQboMQ$Hryb_@yzQJV%-dzgRVX@Tx8RuPs;27|MnkWsgFSuBESR3S zv{sbP-o8jI^|EvbSVPEN4ZyXaeS?v>HEPbRg`VPetQLL7ZM?jz_rbeGS~>)-;r2~Y zWbJYR^-V^vr)uZ0K; z20h0H9A{uhr^hG97&-Z*W4hInCn4PsPNt`^_bH9Im+FZ)qV}v^>e)dv@mb8+Ri|hk zwnSrh*6JFz`A0NdzzW-9usfO~|M((%lgIT`jc|wz zcGr`|ZECPPOcys&pN13IBO$xyNYH-FnSaDtIAd}il&p)vj7Skm!*@tZt^=^Jc`H2^tjl`Gggq&7Ewfh zWgY#MrR3T{AgfI}#9e`_#8vLU0qHv*wwpBRA8w==&;kIS;HM1aSxnMKeXP$mcaSE2e_GHp|XBzj`# zPo(pS+t_do+E6~Ric}4e)@4G{dNMByO!78z*O1A}`D6s7=?X!buI3d1QbUlES0kW| z-bPSHPvzSLC>4U*@~H@@T~8C#u50FX_>AHrzP=K2+jOMBPz{& zk{#Zk81ZYiH9Ne>imBOwYfy$((Q!(gr}cyozm|~@UWRXQ2|MOmBK_U(}Eb*6F(t){027Ua;w-V^1&t78Sv>jW50`pM7w+lW`vWkbBM_6ZMgiVBzNO;TdxVQfUeHxVo literal 3090 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 D)m2^$ literal 0 HcmV?d00001 diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeVO.class index 17080d31e564f9bb527e96d0502a18533c299c24..7c23d39d9a2ceaadc2d849628f86eceaf14327bb 100644 GIT binary patch delta 85 zcmbQwH=l3AZDvNE$#obWmu6538gJ0}F#G11EzS10RDqgD`^ygCv6`gBpX?v7n!rU1oK!D8(k`ivQqw{y6%<^aWVfnp8-RVN?f delta 163 zcmX>obWmu6538gx0}F!*11Ezi10RDKgD`_RgCv6mgBpY7F5nBSI`{c=NwyfR^tPDPr89Bu#zhTp7^q(xlZp#`B6bk{1m9pzI vhEHA!6pIFm#el{B0mb4c>v7n!CIiJ%z+&wj`i$w5w{y6%W&_1?fMN~+OFkdP diff --git a/dq-framework-utils/target/classes/com/daqing/framework/utils/Query.class b/dq-framework-utils/target/classes/com/daqing/framework/utils/Query.class index 61fc91e42fee98338188804013a2b877728ad7bd..883edeaa19dbea90b778f880029ffb20317f0832 100644 GIT binary patch delta 703 zcmZ9JTTc^F6otR(OqpRiBw#z$f|pjR7O1U)Rsn^AcflKIy+jk67)a6ZVAY_Bp})YF zdGcRqd{JY3HSyj5;U9pwPTNRy=45A|wX@dVYoBl7uYuan?XTZ~3GVwOIqkEH$+!UX z`7To)#RSuwaXITV!>q@cOVuaAoWbWk&iS0@f=AisB9~k)yIlGBGPIqlIMF-%hnFG@ z*hfBkU$e0m*UvMO$)IWN(t7GYuW{}$6D56H=3vTe`C zl6R|d-=u^yM%bh2F zlDy(!N*vLfjcMT}YK*g@cWzSU4RgE|YFs{~SF!bX&Q^C$gB_BFanX`aLF)FVXd{fO zt;dFhM>X66Cn<7N$ch$K5~Wv7`Y0>&+jh-hofaLtriHQFVIC9nxaukFEruOuaGM#I XahD05?n+K*46~d>OwB4vVx0N|3%*j1 delta 1038 zcmZvb%TLr`6vcm?Dbr5r0)zo(00jXZ6de>qULyDaQ4|#gQBf*0;P4bW8eL6{YZH^M zNK9P1g_s!Pb7|t%xRs3wYySX^_v@&jv1!`-oqNxHoZEgbd=trj{PF4?(8QcYjH4D& zy7L53mu1jn(v;6JjvJh?I7zR`L4!Vvd`>C6-{iE#83s&REY5PyWYEIoyuk&FVlJx4 zA!S`s?#l+l1|u4w&h&gb)1|GB=LhvZN$xEKKbYlI*wnJu>(b-3S8PVPs!=fQ+;bAM z&iqtjD6^EFpE9^+bDc4bcCT8CdS3$737c|m*xY1XLwD23`v#89EhY?-HYp}Gf{r_3 zGo{Q%;q9&(TuP>v`ZK9Hn?Y{dq?xvvQP!*qs`7gD$cyj#m^NUg-E#|>lXG`64>Th2 zfqy&ds8@Za7VkQFT gJ@$ifgEoV9xeLRk1;18P)FHj(w$#ZHAq4392`w|M^Z)<= diff --git a/dq-govern-gateway/src/main/resources/application.yml b/dq-govern-gateway/src/main/resources/application.yml index 2241cc7f..414ef3d1 100644 --- a/dq-govern-gateway/src/main/resources/application.yml +++ b/dq-govern-gateway/src/main/resources/application.yml @@ -13,8 +13,23 @@ spring: # - Query=url,qq # - id: hrms_route - uri: lb://dq-financial-hrms + #uri: lb://dq-financial-hrms + uri: http://dq-financial-hrms predicates: - Path=/api/** filters: - - RewritePath=/api/(?.*),/ $\{segment} \ No newline at end of file + - RewritePath=/api/(?.*),/ $\{segment} + +# - id: crms_auth +# uri: lb://dq-financial-crms +# predicates: +# - Path=/crms/** +# filters: +# - RewritePath=/crms/(?.*),/ $\{segment} + + redis: + host: + port: + password: + database: 1 + timeout: 60s \ No newline at end of file diff --git a/dq-govern-gateway/target/classes/META-INF/dq-govern-gateway.kotlin_module b/dq-govern-gateway/target/classes/META-INF/dq-govern-gateway.kotlin_module new file mode 100644 index 0000000000000000000000000000000000000000..8fb60192d378759239a3ecbf60eac8c8de446e9c GIT binary patch literal 16 RcmZQzU|?ooU|@t|UH|}6022TJ literal 0 HcmV?d00001 diff --git a/dq-govern-gateway/target/classes/application.yml b/dq-govern-gateway/target/classes/application.yml new file mode 100644 index 00000000..f50d514a --- /dev/null +++ b/dq-govern-gateway/target/classes/application.yml @@ -0,0 +1,34 @@ +spring: + cloud: + gateway: + routes: +# - id: test_route +# uri: https://www.baidu.com +# predicates: +# - Query=url,baidu +# +# - id: qq_route +# uri: https://www.qq.com +# predicates: +# - Query=url,qq +# + - id: hrms_route + uri: lb://dq-financial-hrms + predicates: + - Path=/api/hrms/** + filters: + - RewritePath=/api/(?.*),/ $\{segment} + - + - id: crms_auth + uri: lb://dq-financial-crms + predicates: + - Path=/crms/** + filters: + - RewritePath=/crms/(?.*),/ $\{segment} + + redis: + host: + port: + password: + database: 1 + timeout: 60s \ No newline at end of file diff --git a/dq-govern-gateway/target/classes/bootstrap.properties b/dq-govern-gateway/target/classes/bootstrap.properties new file mode 100644 index 00000000..5d6a98ae --- /dev/null +++ b/dq-govern-gateway/target/classes/bootstrap.properties @@ -0,0 +1,9 @@ +#鏈嶅姟鍚嶇О +spring.application.name=dq-govern-gateway +#閰嶇疆涓績鍦板潃 +spring.cloud.nacos.config.server-addr=192.168.31.142:8848 +spring.cloud.nacos.config.namespace=772e2607-b929-4246-9671-ee5a36d74d25 + +spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml +spring.cloud.nacos.config.ext-config[0].group=dev +spring.cloud.nacos.config.ext-config[0].refresh=true \ No newline at end of file diff --git a/dq-govern-gateway/target/classes/jwt.properties b/dq-govern-gateway/target/classes/jwt.properties new file mode 100644 index 00000000..55a67a44 --- /dev/null +++ b/dq-govern-gateway/target/classes/jwt.properties @@ -0,0 +1 @@ +jwt.ignoreUrlList=/route-api/login,/route-api/refresh \ No newline at end of file From 480dab6a5bacf43a2bffe966a34860fbb14861a5 Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Mon, 28 Sep 2020 17:36:15 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=8D=95=E6=AC=A1?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 95 ------------------ .../financial/crms/CustomerControllerApi.java | 12 ++- .../financial/hrms/DeptControllerApi.java | 13 ++- .../DqFinancialCrmsAuthApplication.class | Bin 1077 -> 0 bytes .../crauth/config/AuthorizationServer.class | Bin 6455 -> 0 bytes .../crauth/config/SecurityConfig.class | Bin 3713 -> 0 bytes .../financial/crauth/config/TokenConfig.class | Bin 716 -> 0 bytes .../controller/CustomerLoginController.class | Bin 929 -> 0 bytes .../crauth/dao/CustomerLoginDao.class | Bin 357 -> 0 bytes .../crauth/service/CustomerLoginService.class | Bin 157 -> 0 bytes .../impl/CustomerLoginServiceImpl.class | Bin 2402 -> 0 bytes .../crms/controller/CustomerController.java | 7 +- dq-financial-hrms/pom.xml | 4 +- .../hrms/config/ResourceServerConfig.java | 18 +++- .../hrms/controller/DeptController.java | 11 +- .../hrms/controller/EmployeeController.java | 2 +- .../hrms/controller/UserController.java | 7 +- .../daqing/financial/hrms/dao/DeptDao.java | 2 + .../financial/hrms/service/DeptService.java | 4 +- .../hrms/service/impl/DeptServiceImpl.java | 25 ++++- .../main/resources/mapper/hrms/DeptDao.xml | 5 + .../framework/exception/ExceptionCatch.class | Bin 3181 -> 4094 bytes .../framework/model/response/CommonCode.class | Bin 3120 -> 3327 bytes .../model/response/ResponseResult.class | Bin 4579 -> 4687 bytes .../domain/crms/CompanyCustomerEntity.java | 13 +++ .../framework/domain/crms/CustomerEntity.java | 20 ++++ .../domain/crms/PersonalCustomerEntity.java | 19 ++++ .../domain/crms/ext/CustomerCompanyTO.java | 4 +- .../domain/crms/ext/CustomerCompanyVO.java | 17 ++++ .../domain/crms/ext/CustomerPersonalTO.java | 3 + .../framework/domain/crms/ext/CustomerTO.java | 8 ++ .../domain/crms/request/CustomerRequest.java | 11 +- .../framework/domain/hrms/DepartmentVO.java | 4 + .../framework/domain/hrms/DeptEntity.java | 4 +- .../src/main/resources/application.yml | 2 +- 35 files changed, 176 insertions(+), 134 deletions(-) delete mode 100644 .gitignore delete mode 100644 dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/DqFinancialCrmsAuthApplication.class delete mode 100644 dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/config/AuthorizationServer.class delete mode 100644 dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/config/SecurityConfig.class delete mode 100644 dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/config/TokenConfig.class delete mode 100644 dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/controller/CustomerLoginController.class delete mode 100644 dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/dao/CustomerLoginDao.class delete mode 100644 dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/service/CustomerLoginService.class delete mode 100644 dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/service/impl/CustomerLoginServiceImpl.class diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 49f72f7b..00000000 --- a/.gitignore +++ /dev/null @@ -1,95 +0,0 @@ -### Java template -*.class - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.ear - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* -### JetBrains template -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# User-specific stuff: -.idea/workspace.xml -.idea/tasks.xml -.idea/dictionaries -.idea/vcs.xml -.idea/jsLibraryMappings.xml - -# Sensitive or high-churn files: -.idea/dataSources.ids -.idea/dataSources.xml -.idea/dataSources.local.xml -.idea/sqlDataSources.xml -.idea/dynamic.xml -.idea/uiDesigner.xml - -# Gradle: -.idea/gradle.xml -.idea/ - -# Mongo Explorer plugin: -.idea/mongoSettings.xml - -## File-based project format: -*.iws - -## Plugin-specific files: - -# IntelliJ -/out/ - -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties -### Windows template -# Windows image file caches -Thumbs.db -ehthumbs.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msm -*.msp - -# Windows shortcuts -*.lnk -### Maven template -target/ -pom.xml.tag -pom.xml.releaseBackup -pom.xml.versionsBackup -pom.xml.next -release.properties -dependency-reduced-pom.xml -buildNumber.properties -.mvn/timing.properties -# ignore eclipse files -.project -.classpath -.settings -.metadata - -.svn - diff --git a/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java b/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java index 6f35451c..0612b05b 100644 --- a/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java +++ b/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java @@ -3,6 +3,7 @@ package com.daqing.financial.crms; import com.daqing.framework.domain.crms.ext.CustomerCompanyTO; import com.daqing.framework.domain.crms.ext.CustomerPersonalTO; +import com.daqing.framework.domain.crms.ext.CustomerTO; import com.daqing.framework.domain.crms.request.CustomerRequest; import com.daqing.framework.model.response.ResponseResult; import io.swagger.annotations.Api; @@ -10,6 +11,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; /** * @Author: gongsj. @@ -23,7 +25,7 @@ public interface CustomerControllerApi { /** * 鍒楄〃灞曠ず */ - @ApiOperation(value = "瀹㈡埛淇℃伅鍒楄〃灞曠ず", notes = "瀹㈡埛淇℃伅鍒楄〃灞曠ず") + @ApiOperation(value = "瀹㈡埛淇℃伅鍒楄〃灞曠ず", notes = "瀹㈡埛淇℃伅鍒楄〃灞曠ず",response = CustomerTO.class) ResponseResult queryList(Integer page, Integer size, CustomerRequest customerRequest); /** @@ -39,15 +41,15 @@ public interface CustomerControllerApi { ResponseResult deleteCustomer(Long[] ids); /** - * 鎻掑叆涓汉绫诲瀷瀹㈡埛淇℃伅 + * 鏂板涓汉绫诲瀷瀹㈡埛淇℃伅 */ - @ApiOperation(value = "鎻掑叆涓汉绫诲瀷瀹㈡埛淇℃伅", notes = "鎻掑叆涓汉绫诲瀷瀹㈡埛淇℃伅") + @ApiOperation(value = "鏂板涓汉绫诲瀷瀹㈡埛淇℃伅", notes = "鏂板涓汉绫诲瀷瀹㈡埛淇℃伅") ResponseResult savePersonal(CustomerPersonalTO customerPersonalTO); /** - * 鎻掑叆浼佷笟绫诲瀷瀹㈡埛淇℃伅 + * 鏂板浼佷笟绫诲瀷瀹㈡埛淇℃伅 */ - @ApiOperation(value = "鎻掑叆浼佷笟绫诲瀷瀹㈡埛淇℃伅", notes = "鎻掑叆浼佷笟绫诲瀷瀹㈡埛淇℃伅") + @ApiOperation(value = "鏂板浼佷笟绫诲瀷瀹㈡埛淇℃伅", notes = "鏂板浼佷笟绫诲瀷瀹㈡埛淇℃伅") ResponseResult saveCompany(CustomerCompanyTO customerCompanyTO); /** diff --git a/dq-financial-api/src/main/java/com/daqing/financial/hrms/DeptControllerApi.java b/dq-financial-api/src/main/java/com/daqing/financial/hrms/DeptControllerApi.java index 90225fab..39cfd3cf 100644 --- a/dq-financial-api/src/main/java/com/daqing/financial/hrms/DeptControllerApi.java +++ b/dq-financial-api/src/main/java/com/daqing/financial/hrms/DeptControllerApi.java @@ -1,5 +1,6 @@ package com.daqing.financial.hrms; +import com.daqing.framework.domain.crms.ext.CustomerCompanyVO; import com.daqing.framework.domain.hrms.DeptEntity; import com.daqing.framework.domain.hrms.request.DeptAddRequest; import com.daqing.framework.model.response.ResponseResult; @@ -42,7 +43,7 @@ public interface DeptControllerApi { /** * 鏍规嵁id淇敼閮ㄩ棬淇℃伅 */ - @ApiOperation(value = "鏍规嵁id淇敼閮ㄩ棬淇℃伅", notes = "鏍规嵁id淇敼閮ㄩ棬淇℃伅") + @ApiOperation(value = "鏍规嵁id淇敼閮ㄩ棬淇℃伅", notes = "鏍规嵁id淇敼閮ㄩ棬淇℃伅", response = CustomerCompanyVO.class) ResponseResult update(DeptEntity dept); /** @@ -54,6 +55,12 @@ public interface DeptControllerApi { /** * 鏌ヨ鎵鏈夐儴闂ㄥ強閮ㄩ棬涓嬬殑鍛樺伐淇℃伅 */ - @ApiOperation(value = "鏌ヨ鎵鏈夐儴闂ㄥ強閮ㄩ棬涓嬬殑鍛樺伐淇℃伅", notes = "鏌ヨ鎵鏈夐儴闂ㄥ強閮ㄩ棬涓嬬殑鍛樺伐淇℃伅") - ResponseResult trees(); + /*@ApiOperation(value = "鏌ヨ鎵鏈夐儴闂ㄥ強閮ㄩ棬涓嬬殑鍛樺伐淇℃伅", notes = "鏌ヨ鎵鏈夐儴闂ㄥ強閮ㄩ棬涓嬬殑鍛樺伐淇℃伅") + ResponseResult trees();*/ + + /** + * 鏌ヨ璇ラ儴闂ㄤ笅鎵鏈夊瓙閮ㄩ棬鍙婇儴闂ㄤ笅鐨勭殑鍛樺伐 + */ + @ApiOperation(value = "鏌ヨ璇ラ儴闂ㄤ笅鎵鏈夊瓙閮ㄩ棬鍙婇儴闂ㄤ笅鐨勭殑鍛樺伐", notes = "鏌ヨ璇ラ儴闂ㄤ笅鎵鏈夊瓙閮ㄩ棬鍙婇儴闂ㄤ笅鐨勭殑鍛樺伐") + ResponseResult children(Long id); } diff --git a/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/DqFinancialCrmsAuthApplication.class b/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/DqFinancialCrmsAuthApplication.class deleted file mode 100644 index 63b951973efc44ed8465d5b489a1eb52e5d71396..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1077 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 diff --git a/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/config/TokenConfig.class b/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/config/TokenConfig.class deleted file mode 100644 index 5e113698a4c88c5c2fb6ffa9799e55bff399a792..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 716 zcmbV~%SuBr5QhKM+SYoh_si0q3K}WmMiEpH#HyfDaG9Q_HMJ+voSdp}r7Jex+tUkxHOv;#kI6iyipcnLI*%EK+@{jXZ87vMELIt^yQVG~ zN)@H$Q5x5zJrlJyWyUKe678z6%E!HA)?KKCVYL#OnAgR%(oNn_TIfiLHjk`G-35<~ zZm1?dGnZ2D27iO0=zMtUj3xH=!eYhPCQq&`5gJy+^2XRpp2#S*%H46}L1lhrO-I$G z<)OJt3q8kEdlwY-cDM4k)zdtF2HqBQRmZiK zj2z~XrI+Eq4Cp~1Pqsi2r<2jyzw`+95PlDk&4pwMMe>Kb1sEg`@#1HT#o diff --git a/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/controller/CustomerLoginController.class b/dq-financial-crms-auth/target/classes/com/daqing/financial/crauth/controller/CustomerLoginController.class deleted file mode 100644 index 8d4b500dbf1aa1cd6abe2d94f05bfd4ce9c0c1b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 929 zcmbtS%We}f6g}=FnGn*nq~#GPuU(4--V_N5RDmJ^i{YULWy8wjxT%ZBPHj*7Td+c6 z!3XeBRqr$}xybJK72>wJ=^osHfZqdf1IA-Y2O%#F3}&+<2rZUjjVq9Rr!?O8o1I+^-@=Fxb}zsA62a~Jh|{y+f>@Q=ld7xeo5@J z{ySXGPo<3pQie4A97X-LGR84%{ojlkmd^(IF5go!;y!BhA*+>uej-vjn-p=fjBNeE zSFkVSEZ`EIjgw>tE%Mt_04|dU@)yw|R7HMBQAJL=3!ll%Q&;Aw$tiV-FdZT+)4uW% nETBu?%5UV7U*&p#kz1X~U8NGPofL8%)n#3ZZ;}or_7Xc^Z5k;S8$ZUG=oD0(~9Cv-$iy56fDm2HNK&4&{ujDgZ0(?JU8rgiLWB` zb3jM$9A0$E4z1TFxK0lS3mkG(iKda|7@8oKtLBSyxZ(C8Zq1X@tqTwNFQ&DT(+$?Zwa+ltF)0+QE z9j8oX#ur%DBVAQNUhjDRqSOMn@~*BrW%2KGtS&2o3wh61Yqe@g1@|Pi2@L18D=S4Ac;>sgn22^gs?T=B z6RO~;=PJjm?p0cW6=Kc`8MI`$qGkC$cQ4e<=o5y(`b7S*d@7xaq^k;%0hms;MH?!& z7I;zJadn`a8YPrfB)v-L7-@^~oND?ED;7TdvTX7X<0Wvj1=o>Z%epE(pW&*8M|g6K zO;o4&0TV+_Lp(*#48Bf%N~va!|P7L zgi0+3(vMV`$;;xPyQ!TBQ{ihmTGBPYe3Y{SH#*^H*Lhj6J1ROvCXj2}kWNZH zU!NFjCx;Dq@HnUAbncervOvrBI4J29v+qQx3iU8jRW@>6W5CAZ4&Z5LgH1DH>r}GJ z0*-5@by>hNS4ULw|3eY&Vp~1Fvd#gKjg)@d*wsF}!01G(U8^;oJX}0#hel zliig;K|QIFso43CGqZUa2;4cjy}A1GzIdh4E3&#$VN&zzOs9%?hZp}Sx-f=|5Txud zq~m-V^paj8?ILCK;dq5#4yhpRncRo?wZVRqquC4|ev6|WZ@}9W4$j}jRdhEF|Aij@ zfR)ML(RJ+wy1TG?fW+25de){7(7QEk?W6An`n&MpHzcQ?W8eVx7U?So805AKoDMz5 ztJC`!zMU9P{6b;fFa}(r384A`svV)?t5iG5aS87?jGBoRH;tkRc#j;WH=i{h;6tJu w;p=AtDau>oe-hXD3Ywx!11IK9bNxD35?pa`gR>q%F~&tV8{@4b$9)9+3)YCuUH||9 diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java index a38c37a5..b5d664e1 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.util.List; import java.util.Objects; @@ -80,14 +81,13 @@ public class CustomerController implements CustomerControllerApi { else { return new ResponseResult>().SUCCESS_DATA(list); } - } /** * 淇濆瓨涓汉绫诲瀷瀹㈡埛淇℃伅 */ @PostMapping("/savePersonal") - public ResponseResult savePersonal(@RequestBody CustomerPersonalTO customerPersonalTO) { + public ResponseResult savePersonal(@RequestBody @Valid CustomerPersonalTO customerPersonalTO) { boolean result = customerService.saveCustomerPersonal(customerPersonalTO.getCustomerEntity(), customerPersonalTO.getPersonalCustomerEntity()); return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.SAVE_FAIL); } @@ -96,8 +96,7 @@ public class CustomerController implements CustomerControllerApi { * 淇濆瓨浼佷笟绫诲瀷瀹㈡埛淇℃伅 */ @PostMapping("/saveCompany") - @ApiOperation(value = "淇濆瓨浼佷笟绫诲瀷瀹㈡埛淇℃伅", response = CustomerCompanyTO.class) - public ResponseResult saveCompany(@RequestBody CustomerCompanyTO customerCompanyTO) { + public ResponseResult saveCompany(@RequestBody @Valid CustomerCompanyTO customerCompanyTO) { boolean result = customerService.saveCustomerCompany(customerCompanyTO.getCustomerEntity(), customerCompanyTO.getCompanyCustomerEntity()); return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.SAVE_FAIL); } diff --git a/dq-financial-hrms/pom.xml b/dq-financial-hrms/pom.xml index 5543ca6f..a5788153 100644 --- a/dq-financial-hrms/pom.xml +++ b/dq-financial-hrms/pom.xml @@ -62,12 +62,12 @@ - + diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/config/ResourceServerConfig.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/config/ResourceServerConfig.java index e04fd7d8..30735ec4 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/config/ResourceServerConfig.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/config/ResourceServerConfig.java @@ -1,13 +1,18 @@ +/* package com.daqing.financial.hrms.config; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer; import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter; import org.springframework.security.oauth2.config.annotation.web.configurers.ResourceServerSecurityConfigurer; import org.springframework.security.oauth2.provider.token.RemoteTokenServices; +import org.springframework.security.oauth2.provider.token.TokenStore; +import org.springframework.security.oauth2.provider.token.store.redis.RedisTokenStore; @Configuration @EnableResourceServer @@ -23,13 +28,15 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter { @Value("${security.oauth2.authorization.check-token-access}") private String checkTokenEndpointUrl; - /* @Autowired - private RedisConnectionFactory redisConnectionFactory;*/ + @Autowired + private RedisConnectionFactory redisConnectionFactory; -/* @Bean + + @Bean public TokenStore redisTokenStore (){ return new RedisTokenStore(redisConnectionFactory); - }*/ + } + @Bean public RemoteTokenServices tokenService() { @@ -44,4 +51,5 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter { public void configure(ResourceServerSecurityConfigurer resources) throws Exception { resources.tokenServices(tokenService()); } -} \ No newline at end of file +} +*/ diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/DeptController.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/DeptController.java index 0a5c2482..11e198a3 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/DeptController.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/DeptController.java @@ -100,9 +100,18 @@ public class DeptController implements DeptControllerApi { /** *鎵鏈夐儴闂ㄥ強鍛樺伐 */ - @Override + /*@Override @GetMapping("/trees") public ResponseResult trees() { return new ResponseResult>().SUCCESS(deptService.listDepartmentAndEmployeeTree()); + }*/ + + /** + * 璇ラ儴闂ㄤ笅鎵鏈夊瓙閮ㄩ棬鍙婇儴闂ㄤ笅鍛樺伐 + */ + @Override + @GetMapping("/children") + public ResponseResult children(Long id){ + return new ResponseResult().SUCCESS(deptService.getDepartmentAndEmployee(id)); } } diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java index a4f13137..f3c08f73 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java @@ -87,7 +87,7 @@ public class EmployeeController implements EmployeeControllerApi { * @param ids * @return */ - @Override + //@Override @GetMapping("/getEmployeeAndDeptById") public ResponseResult getEmployeeAndDeptById(@RequestParam("ids") Long[] ids) { List employeeTO = employeeService.getEmployeeAndDeptById(Arrays.asList(ids)); diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/UserController.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/UserController.java index a2545da2..220c0eaa 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/UserController.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/UserController.java @@ -5,9 +5,6 @@ import com.daqing.framework.domain.hrms.UserEntity; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.PageUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.security.core.Authentication; -import org.springframework.security.oauth2.provider.authentication.OAuth2AuthenticationDetails; import org.springframework.web.bind.annotation.*; import java.util.Arrays; @@ -88,7 +85,7 @@ public class UserController { * @param authentication * @return */ - @GetMapping(value = "get") + /* @GetMapping(value = "get") @PreAuthorize("hasAnyRole('ROLE_ADMIN')") public Object get(Authentication authentication){ //Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); @@ -96,5 +93,5 @@ public class UserController { OAuth2AuthenticationDetails details = (OAuth2AuthenticationDetails)authentication.getDetails(); String token = details.getTokenValue(); return token; - } + }*/ } diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/DeptDao.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/DeptDao.java index 17dc3ff0..f6718ebc 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/DeptDao.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/DeptDao.java @@ -25,4 +25,6 @@ public interface DeptDao extends BaseMapper { List listDepartment(); + List getDepartmentByParentId(Long parentId); + } diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java index c80b9576..5d09a6c8 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java @@ -24,8 +24,8 @@ public interface DeptService extends IService { boolean deleteByIds(Long[] ids); - List listDepartmentAndEmployeeTree(); + /*List listDepartmentAndEmployeeTree();*/ - List getDepartmentAndEmployee(Long id); + DepartmentVO getDepartmentAndEmployee(Long id); } diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java index df39dadb..847edf66 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java @@ -7,6 +7,7 @@ import com.daqing.financial.hrms.dao.EmployeeDao; import com.daqing.financial.hrms.service.DeptService; import com.daqing.framework.domain.hrms.DepartmentVO; import com.daqing.framework.domain.hrms.DeptEntity; +import com.daqing.framework.domain.hrms.ext.EmployeeVO; import com.daqing.framework.domain.hrms.request.DeptAddRequest; import com.daqing.framework.domain.hrms.response.HrmsCode; import com.daqing.framework.exception.ExceptionCast; @@ -64,7 +65,7 @@ public class DeptServiceImpl extends ServiceImpl implements //瀹炰綋绫 DeptEntity deptEntity = new DeptEntity(); //璁剧疆id - deptEntity.setId(SnowflakeIdUtils.getRandomid()); + //deptEntity.setId(SnowflakeIdUtils.getRandomid()); //灞炴ф嫹璐濓紝灏嗕笂绾ч儴闂╥d锛堝鏋滄湁锛夈侀儴闂ㄥ悕绉拌缃埌瀹炰綋绫 BeanUtils.copyProperties(deptAddRequest, deptEntity); //2銆佸垽鏂儴闂ㄤ笂绾d鏄惁涓虹┖锛屼负绌哄垯姝ら儴闂ㄦ槸涓绾ч儴闂紝鍚﹀垯鏌ヨ骞惰绠楅儴闂ㄥ眰绾э紝骞跺垽鏂儴闂ㄥ眰绾ф槸鍚﹀ぇ浜5绾ф垨灏忎簬1绾 @@ -154,7 +155,7 @@ public class DeptServiceImpl extends ServiceImpl implements * 鑾峰彇鎵鏈夌殑閮ㄩ棬鍙婇儴闂ㄤ笅鐨勫憳宸ヤ俊鎭 * @return */ - @Override + /* @Override public List listDepartmentAndEmployeeTree() { return this.getListDepartmentAndEmployeeTree(deptDao.listDepartment(), 0L); } @@ -167,10 +168,24 @@ public class DeptServiceImpl extends ServiceImpl implements }) .sorted(Comparator.comparingInt(menu -> (menu.getSort() == null ? 0 : menu.getSort()))) // 鏍规嵁鎵閫夋帓搴忎俊鎭繘琛屾帓搴 .collect(Collectors.toList()); - } + }*/ + /** + * 鑾峰彇璇ラ儴闂ㄤ笅瀛愰儴闂ㄥ強閮ㄩ棬涓嬬殑鍛樺伐 + */ @Override - public List getDepartmentAndEmployee(Long id) { - return null; + public DepartmentVO getDepartmentAndEmployee(Long id) { + DepartmentVO departmentVO = new DepartmentVO(); + if (id == null){ + List departments = deptDao.getDepartmentByParentId(0L); + departmentVO.setChildren(departments); + return departmentVO; + }else { + List departments = deptDao.getDepartmentByParentId(id); + List employeeS = employeeDao.listEmployeeByDeptId(id); + departmentVO.setChildren(departments); + departmentVO.setEmployee(employeeS); + return departmentVO; + } } } \ No newline at end of file diff --git a/dq-financial-hrms/src/main/resources/mapper/hrms/DeptDao.xml b/dq-financial-hrms/src/main/resources/mapper/hrms/DeptDao.xml index 294e0608..8ffcc49b 100644 --- a/dq-financial-hrms/src/main/resources/mapper/hrms/DeptDao.xml +++ b/dq-financial-hrms/src/main/resources/mapper/hrms/DeptDao.xml @@ -36,4 +36,9 @@ FROM hrms_dept + + \ No newline at end of file diff --git a/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCatch.class b/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCatch.class index 16e314dd2b7b2dfa069e5f84b2ed95c2f55bfd5d..f9d340bb0754765d542aa3bec2b6b0fcf8f05a08 100644 GIT binary patch delta 1470 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 CM5lxR diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CompanyCustomerEntity.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CompanyCustomerEntity.java index 6a85275b..068eed16 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CompanyCustomerEntity.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CompanyCustomerEntity.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; + +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -23,47 +25,58 @@ public class CompanyCustomerEntity implements Serializable { /** * 涓婚敭 */ + @ApiModelProperty(value = "id") @TableId(value = "id", type = IdType.INPUT) private Long id; /** * 娉ㄥ唽璧勯噾 */ + @ApiModelProperty(value = "娉ㄥ唽璧勯噾") private String registeredCapital; /** * 鎵灞炶涓 */ + @ApiModelProperty(value = "鎵灞炶涓") private String industry; /** * 鎴愮珛骞撮檺 */ + @ApiModelProperty(value = "鎴愮珛骞撮檺") private Integer years; /** * 鎵鍦ㄥ尯鍩 */ + @ApiModelProperty(value = "鎵鍦ㄥ尯鍩") private String region; /** * 鑲′笢鍚嶇О */ + @ApiModelProperty(value = "鑲′笢鍚嶇О") private String shareholder; /** * 鍏宠仈浼佷笟 */ + @ApiModelProperty(value = "鍏宠仈浼佷笟") private String affiliatedCompany; /** * 鍛樺伐涓暟 */ + @ApiModelProperty(value = "鍛樺伐涓暟") private String empNum; /** * 鑱旂郴浜 */ + @ApiModelProperty(value = "鑱旂郴浜") private String linkman; /** * 涓氬姟鏉ユ簮 */ + @ApiModelProperty(value = "涓氬姟鏉ユ簮") private String businessSource; /** * 瀹㈡埛鍩烘湰淇℃伅琛╥d */ + @ApiModelProperty(value = "瀹㈡埛鍩烘湰淇℃伅琛╥d") private Long customerId; } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CustomerEntity.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CustomerEntity.java index e3c41162..9a30c284 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CustomerEntity.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CustomerEntity.java @@ -6,8 +6,12 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; + +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; + /** * 璁板綍瀹㈡埛鍩烘湰淇℃伅 * @@ -23,55 +27,71 @@ public class CustomerEntity implements Serializable { /** * 涓婚敭 */ + @NotNull(message = "id涓嶈兘涓虹┖") + @ApiModelProperty(value = "id") @TableId(value = "id", type = IdType.INPUT) private Long id; /** * 瀹㈡埛缂栧彿 */ + @ApiModelProperty(value = "瀹㈡埛缂栧彿") private String code; /** * 瀹㈡埛绫诲瀷锛1銆佷紒涓氱被鍨嬶紝0锛氫釜浜虹被鍨 */ + @NotNull(message = "瀹㈡埛绫诲瀷涓嶈兘涓虹┖") + @ApiModelProperty(value = "瀹㈡埛绫诲瀷") private Integer type; /** * 瀹㈡埛鐨勭粡鐞嗕汉id */ + @ApiModelProperty(value = "瀹㈡埛缁忕悊浜篿d") private Long manager; /** * 瀹㈡埛鍚嶇О */ + @ApiModelProperty(value = "瀹㈡埛鍚嶇О") private String name; /** * 鑱旂郴鍦板潃 */ + @ApiModelProperty(value = "鑱旂郴鍦板潃") private String addr; /** * 鑱旂郴鐢佃瘽 */ + @NotNull(message = "鑱旂郴鐢佃瘽涓嶈兘涓虹┖") + @ApiModelProperty(value = "鑱旂郴鐢佃瘽") private String phone; /** * 瀵嗙爜 */ + @ApiModelProperty(value = "瀵嗙爜") private String password; /** * 寰俊鍞竴鏍囪瘑 */ + @ApiModelProperty(value = "寰俊鍞竴鏍囪瘑") private String wechatId; /** * 0锛氭湭鍒犻櫎锛1锛氬凡鍒犻櫎 */ + @ApiModelProperty(value = "鏄惁鍒犻櫎") private Integer delOrNot; /** * 0锛氬惎鐢紝1锛氱鐢 */ + @ApiModelProperty(value = "鏄惁绂佺敤") private Integer status; /** * 鍒涘缓鏃堕棿 */ + @ApiModelProperty(value = "鍒涘缓鏃堕棿") private Date createTime; /** * 淇敼鏃堕棿 */ + @ApiModelProperty(value = "淇敼鏃堕棿") private Date motifyTime; } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/PersonalCustomerEntity.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/PersonalCustomerEntity.java index b2dc52e2..d4004855 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/PersonalCustomerEntity.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/PersonalCustomerEntity.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; + +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; @@ -25,71 +27,88 @@ public class PersonalCustomerEntity implements Serializable { /** * 涓婚敭 */ + @ApiModelProperty(value = "id") @TableId(value = "id", type = IdType.INPUT) private Long id; /** * 瀹㈡埛鍩烘湰淇℃伅琛╥d */ + @ApiModelProperty(value = "瀹㈡埛鍩烘湰琛╥d") private Long customerId; /** * 韬唤璇佸彿 */ + @ApiModelProperty(value = "韬唤璇佸彿") private String idCard; /** * 骞撮緞 */ + @ApiModelProperty(value = "骞撮緞") private Integer age; /** * 鎬у埆锛1銆佺敺锛0銆佸コ */ + @ApiModelProperty(value = "鎬у埆") private Integer gender; /** * 濠氬Щ鐘跺喌,0:鏈,1:宸插,2:绂诲紓,3:鍐嶅 */ + @ApiModelProperty(value = "濠氬Щ鐘跺喌") private Integer maritalStatus; /** * 瀛﹀巻,0:鏈,1:澶т笓,2:楂樿亴,3:涓笓,4:鍏朵粬 */ + @ApiModelProperty(value = "瀛﹀巻") private Integer education; /** * 宸ヤ綔鍗曚綅 */ + @ApiModelProperty(value = "宸ヤ綔鍗曚綅") private String employer; /** * 鑱屽姟 */ + @ApiModelProperty(value = "鑱屽姟") private String position; /** * 宸ヤ綔骞撮檺 */ + @ApiModelProperty(value = "宸ヤ綔骞撮檺") private Integer workingYears; /** * 绀句繚璐﹀彿 */ + @ApiModelProperty(value = "绀句繚璐﹀彿") private String socialSecurityNum; /** * 灞呬綇鎯呭喌 */ + @ApiModelProperty(value = "灞呬綇鎯呭喌") private String livingSituation; /** * 鎴风睄鍦板潃 */ + @ApiModelProperty(value = "鎴风睄鍦板潃") private String residenceAddr; /** * 涓氬姟鏉ユ簮 */ + @ApiModelProperty(value = "涓氬姟鏉ユ簮") private String businessSource; /** * 绱фヨ仈绯讳汉 */ + @ApiModelProperty(value = "绱фヨ仈绯讳汉") private String emergencyLinkman; /** * 绱фヨ仈绯讳汉鍏崇郴 */ + @ApiModelProperty(value = "绱фヨ仈绯讳汉鍏崇郴") private String emergencyLinkmanRelationship; /** * 绱фヨ仈绯讳汉鐢佃瘽 */ + @ApiModelProperty(value = "绱фヨ仈绯讳汉鐢佃瘽") private String emergencyLinkmanPhone; } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.java index 9c9f7752..82166d16 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.java @@ -2,6 +2,7 @@ package com.daqing.framework.domain.crms.ext; import com.daqing.framework.domain.crms.CompanyCustomerEntity; import com.daqing.framework.domain.crms.CustomerEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; @@ -18,10 +19,11 @@ public class CustomerCompanyTO implements Serializable { /** * 瀹㈡埛鍩烘湰淇℃伅 */ - + @ApiModelProperty(value = "瀹㈡埛鍩烘湰淇℃伅") private CustomerEntity customerEntity; /** * 浼佷笟绫诲瀷淇℃伅 */ + @ApiModelProperty(value = "瀹㈡埛浼佷笟淇℃伅") private CompanyCustomerEntity companyCustomerEntity; } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.java index 9272e633..696d4aaa 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.java @@ -2,9 +2,11 @@ package com.daqing.framework.domain.crms.ext; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.metadata.BaseRowModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; +import javax.validation.constraints.Email; import java.io.Serializable; /** @@ -21,75 +23,90 @@ public class CustomerCompanyVO extends BaseRowModel implements Serializable { * 瀹㈡埛缂栧彿 */ @ExcelProperty(value = "缂栧彿",index = 0) + @ApiModelProperty(value = "瀹㈡埛缂栧彿") private String code; /** * 瀹㈡埛绫诲瀷锛1銆佷紒涓氱被鍨嬶紝0锛氫釜浜虹被鍨 */ + @ApiModelProperty(value = "浼佷笟绫诲瀷") @ExcelProperty(value = "浼佷笟绫诲瀷",index = 1) private Integer type; /** * 瀹㈡埛缁忕悊 */ @ExcelProperty(value = "瀹㈡埛缁忕悊",index = 2) + @ApiModelProperty(value = "瀹㈡埛缁忕悊") private String manager; /** * 瀹㈡埛鍚嶇О */ + @ApiModelProperty(value = "瀹㈡埛鍚嶇О") @ExcelProperty(value = "濮撳悕",index = 3) private String name; /** * 鑱旂郴鍦板潃 */ + @ApiModelProperty(value = "鑱旂郴鍦板潃") @ExcelProperty(value = "鍦板潃",index = 4) private String addr; /** * 鑱旂郴鐢佃瘽 */ + @ApiModelProperty(value = "鑱旂郴鐢佃瘽") @ExcelProperty(value = "鐢佃瘽",index = 5) private String phone; /** * 娉ㄥ唽璧勯噾 */ + @ApiModelProperty(value = "娉ㄥ唽璧勯噾") @ExcelProperty(value = "娉ㄥ唽璧勯噾",index = 6) private String registeredCapital; /** * 鎵灞炶涓 */ + @ApiModelProperty(value = "鎵灞炶涓") @ExcelProperty(value = "鎵灞炶涓",index = 7) private String industry; /** * 鎴愮珛骞撮檺 */ + @ApiModelProperty(value = "鎴愮珛骞撮檺") @ExcelProperty(value = "鎴愮珛骞撮檺",index = 8) private Integer years; /** * 鎵鍦ㄥ尯鍩 */ + @ApiModelProperty(value = "鎵鍦ㄥ尯鍩") @ExcelProperty(value = "鎵鍦ㄥ尯鍩",index = 9) private String region; /** * 鑲′笢鍚嶇О */ + @ApiModelProperty(value = "鑲′笢鍚嶇О") @ExcelProperty(value = "鑲′笢鍚嶇О",index = 10) private String shareholder; /** * 鍏宠仈浼佷笟 */ + @ApiModelProperty(value = "鍏宠仈浼佷笟") @ExcelProperty(value = "鍏宠仈浼佷笟",index = 11) private String affiliatedCompany; /** * 鍛樺伐涓暟 */ + @ApiModelProperty(value = "鍛樺伐涓暟") @ExcelProperty(value = "鍛樺伐涓暟",index = 12) private String employeeNumber; /** * 鑱旂郴浜 */ + @ApiModelProperty(value = "鑱旂郴浜") @ExcelProperty(value = "鑱旂郴浜",index = 13) private String linkman; /** * 涓氬姟鏉ユ簮 */ + @ApiModelProperty(value = "涓氬姟鏉ユ簮") @ExcelProperty(value = "涓氬姟鏉ユ簮",index = 14) private String businessSource; } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.java index f0a1b18b..b8ae1334 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.java @@ -2,6 +2,7 @@ package com.daqing.framework.domain.crms.ext; import com.daqing.framework.domain.crms.CustomerEntity; import com.daqing.framework.domain.crms.PersonalCustomerEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; @@ -18,10 +19,12 @@ public class CustomerPersonalTO implements Serializable { /** * 瀹㈡埛鍩烘湰淇℃伅 */ + @ApiModelProperty(value = "瀹㈡埛鍩烘湰淇℃伅") private CustomerEntity customerEntity; /** * 瀹㈡埛涓汉淇℃伅 */ + @ApiModelProperty(value = "瀹㈡埛涓汉淇℃伅") private PersonalCustomerEntity personalCustomerEntity; } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerTO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerTO.java index 2af040ac..b988e56e 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerTO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerTO.java @@ -1,5 +1,6 @@ package com.daqing.framework.domain.crms.ext; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; @@ -19,34 +20,41 @@ public class CustomerTO implements Serializable { /** * id */ + @ApiModelProperty(value = "id") private Long id; /** * 瀹㈡埛缂栧彿 */ + @ApiModelProperty(value = "瀹㈡埛缂栧彿") private String code; /** * 瀹㈡埛濮撳悕 */ + @ApiModelProperty(value = "瀹㈡埛鍚嶇О") private String name; /** * 鑱旂郴鐢佃瘽 */ + @ApiModelProperty(value = "鑱旂郴鐢佃瘽") private String phone; /** * 瀹㈡埛绫诲瀷 */ + @ApiModelProperty(value = "瀹㈡埛绫诲瀷") private Integer type; /** * 瀹㈡埛缁忕悊 */ + @ApiModelProperty(value = "瀹㈡埛缁忕悊") private String manager; /** * 鎵灞為儴闂 */ + @ApiModelProperty(value = "鎵灞為儴闂") private List departments; } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/request/CustomerRequest.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/request/CustomerRequest.java index 2d3bdcd8..7c6be69d 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/request/CustomerRequest.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/request/CustomerRequest.java @@ -4,7 +4,10 @@ package com.daqing.framework.domain.crms.request; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.util.Date; + import lombok.ToString; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; @@ -23,25 +26,27 @@ public class CustomerRequest implements Serializable { /** * 瀹㈡埛缂栧彿鎴栬呭悕绉 */ - - @ApiModelProperty(value = "璁㈠崟鍚") - @NotNull(message = "鍟婂晩鍟婁笉鑳戒负绌") + @ApiModelProperty(value = "瀹㈡埛缂栧彿鎴栬呭悕绉") private String codeOrName; /** * 瀹㈡埛绫诲瀷 */ + @ApiModelProperty(value = "瀹㈡埛绫诲瀷") private Integer customerType; /** * 鍒涘缓鏃堕棿 */ + @ApiModelProperty(value = "鍒涘缓鏃堕棿") private Integer createTime; /** * 璧峰鏃堕棿 */ + @ApiModelProperty(value = "璧峰鏃堕棿") private String startTime; /** * 缁撴潫鏃堕棿 */ + @ApiModelProperty(value = "缁撴潫鏃堕棿") private String endTime; } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/DepartmentVO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/DepartmentVO.java index c4eb1399..be598047 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/DepartmentVO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/DepartmentVO.java @@ -25,19 +25,23 @@ public class DepartmentVO implements Serializable{ /** * 涓婚敭 */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) @TableId(value = "id", type = IdType.INPUT) private Long id; /** * 閮ㄩ棬鍚嶇О */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) private String name; /** * 涓婄骇閮ㄩ棬id */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) private Long parentId; /** * 鎺掑簭 */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) private Integer sort; /** * 瀛愰儴闂 diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/DeptEntity.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/DeptEntity.java index 7c639157..31c9b955 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/DeptEntity.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/DeptEntity.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -26,11 +27,12 @@ public class DeptEntity implements Serializable { /** * 涓婚敭 */ - @TableId(value = "id", type = IdType.INPUT) + @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 閮ㄩ棬鍚嶇О */ + @ApiModelProperty(value = "閮ㄩ棬鍚嶇О") private String name; /** * 涓婄骇閮ㄩ棬id diff --git a/dq-govern-gateway/src/main/resources/application.yml b/dq-govern-gateway/src/main/resources/application.yml index 6ea9f3a1..87f1dd6f 100644 --- a/dq-govern-gateway/src/main/resources/application.yml +++ b/dq-govern-gateway/src/main/resources/application.yml @@ -13,7 +13,7 @@ spring: # - Query=url,qq # - id: hrms_route - uri: lb://dq-financial-hrms + uri: lb://localhost:7000/dq-financial-hrms predicates: - Path=/api/** filters: From 8bf600952fe18c483091fae36163418f5c9bbcb0 Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Tue, 29 Sep 2020 09:25:48 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=8D=95=E6=AC=A1?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../financial/crms/CustomerControllerApi.java | 2 +- .../financial/hrms/EmployeeControllerApi.java | 3 +++ .../crms/CustomerControllerApi.class | Bin 1726 -> 1845 bytes .../financial/hrms/DeptControllerApi.class | Bin 1420 -> 1510 bytes .../hrms/EmployeeControllerApi.class | Bin 988 -> 1126 bytes .../crms/controller/CustomerController.java | 5 +++-- .../crms/service/CustomerService.java | 2 +- .../service/impl/CustomerServiceImpl.java | 7 ++++++- .../crms/controller/CustomerController.class | Bin 6241 -> 6430 bytes .../crms/service/CustomerService.class | Bin 1557 -> 1557 bytes .../service/impl/CustomerServiceImpl.class | Bin 21097 -> 21159 bytes .../DqFinancialCrmsApplicationTests.class | Bin 2800 -> 0 bytes .../hrms/controller/DeptController.class | Bin 3975 -> 4069 bytes .../hrms/controller/EmployeeController.class | Bin 4262 -> 4266 bytes .../controller/PermissionController.class | Bin 3354 -> 3356 bytes .../hrms/controller/PositionController.class | Bin 3581 -> 3583 bytes .../hrms/controller/UserController.class | Bin 3995 -> 3196 bytes .../daqing/financial/hrms/dao/DeptDao.class | Bin 988 -> 1127 bytes .../financial/hrms/service/DeptService.class | Bin 856 -> 857 bytes .../hrms/service/impl/DeptServiceImpl.class | Bin 9691 -> 8654 bytes .../target/classes/mapper/hrms/DeptDao.xml | 5 +++++ .../DqFinancialHrmsApplicationTests.class | Bin 1986 -> 0 bytes .../framework/model/response/CommonCode.java | 1 + .../framework/model/response/CommonCode.class | Bin 3327 -> 3419 bytes .../domain/crms/response/CrmsCode.java | 3 ++- .../domain/crms/CompanyCustomerEntity.class | Bin 5742 -> 6123 bytes .../domain/crms/CustomerEntity.class | Bin 6224 -> 6815 bytes .../domain/crms/PersonalCustomerEntity.class | Bin 8305 -> 8872 bytes .../domain/crms/ext/CustomerCompanyTO.class | Bin 2290 -> 2446 bytes .../domain/crms/ext/CustomerCompanyVO.class | Bin 7547 -> 7786 bytes .../domain/crms/ext/CustomerPersonalTO.class | Bin 2304 -> 2460 bytes .../domain/crms/ext/CustomerTO.class | Bin 3934 -> 4223 bytes .../domain/crms/request/CustomerRequest.class | Bin 3283 -> 3342 bytes .../domain/crms/response/CrmsCode.class | Bin 2585 -> 2679 bytes .../framework/domain/hrms/DepartmentVO.class | Bin 4502 -> 4570 bytes .../framework/domain/hrms/DeptEntity.class | Bin 5860 -> 5935 bytes .../domain/hrms/response/HrmsCode.class | Bin 3394 -> 3521 bytes 37 files changed, 22 insertions(+), 6 deletions(-) delete mode 100644 dq-financial-crms/target/test-classes/com/daqing/financial/crms/DqFinancialCrmsApplicationTests.class delete mode 100644 dq-financial-hrms/target/test-classes/com/daqing/financial/hrms/DqFinancialHrmsApplicationTests.class diff --git a/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java b/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java index 0612b05b..685de46e 100644 --- a/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java +++ b/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java @@ -68,7 +68,7 @@ public interface CustomerControllerApi { * 瀵煎叆excel鏁版嵁 */ @ApiOperation(value = "瀵煎叆excel鏁版嵁", notes = "瀵煎叆excel鏁版嵁") - void excelImportCustomer(MultipartFile file); + ResponseResult excelImportCustomer(MultipartFile file); /** * 瀵煎嚭鏁版嵁鍒癳xcel diff --git a/dq-financial-api/src/main/java/com/daqing/financial/hrms/EmployeeControllerApi.java b/dq-financial-api/src/main/java/com/daqing/financial/hrms/EmployeeControllerApi.java index 97c662f8..4751f69b 100644 --- a/dq-financial-api/src/main/java/com/daqing/financial/hrms/EmployeeControllerApi.java +++ b/dq-financial-api/src/main/java/com/daqing/financial/hrms/EmployeeControllerApi.java @@ -26,4 +26,7 @@ public interface EmployeeControllerApi { @ApiOperation(value = "鏍规嵁id鍒犻櫎鍛樺伐淇℃伅", notes = "鏍规嵁id鍒犻櫎鍛樺伐淇℃伅") ResponseResult delete(Long[] ids); + + @ApiOperation(value = "鏌ヨ鎵鏈夊憳宸d鍜屽鍚",notes = "鏌ヨ鎵鏈夊憳宸d鍜屽鍚") + ResponseResult listEmployeeName(); } diff --git a/dq-financial-api/target/classes/com/daqing/financial/crms/CustomerControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/crms/CustomerControllerApi.class index dbc11e5adb64510675712aaead8315a49195206d..8ba8864bed148ea6ed543cb8fb034227a8c3e527 100644 GIT binary patch delta 386 zcmdnTyOmGi)W2Q(7#J7~8FbhgwAdN6HwuU`@^BQT78m5_6{j*X7*1>yn|zK*f;q(B zdb0{+DkJN(4Nn)%o1DNbHF*V7Ba}B0$n#*XWK5rYh}n2zquJ&k%q@)dq6~}-Yz)i{ z?8OWm44fc>E17|tg^_`Wffp#n3ba=Mtb_@qgb$>I4=BqI7Dba41jz~lWrY}oG4+ao zWJQ3oq6}hi*~uboB8 rSw*0%5;j?7kgPJ$78RfenHW?VSjB-1kgL@oR;x2;L^CiJGiU+;B@Hp# delta 377 zcmZwDI}QP15C`!8tYy8exAl%Uop2V7QY3nnYNJ3Yu?J8&fQUxn04fL2id%>o6j;rd z%=gQGCNulsF`%FBha-SCS{fP}np-_VyCDt8xm;am8*A-ITQ_C;uFhO7924qVq;{yc z8>w?Lbr4)oppD^%haZ*Tg^z!o-1$TOqJGu@f_4pwhFEok?HUn{utpL4R#OJYh2zYL zf8nHPk~Q@kmaHLau%?muZY`P>&9df@w`&0&<^ppOdF$dzmH7}QURy!=xqg&0mDh2q JsP#c()E`B3DR=+? diff --git a/dq-financial-api/target/classes/com/daqing/financial/hrms/DeptControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/hrms/DeptControllerApi.class index 5be81c78da56f319e03a0d20dab3aca92ce6da4c..5ab9365058ea9c47311b0b21b44ccdaa385294e6 100644 GIT binary patch delta 248 zcmeC-e#R|u>ff$?3=9m0465u5%Ipj(8wEZx@o*HS78m5_6{j*XSWIqUl9f&_$}QGU zttioVE-fy}&rL0I&d)7K%&QFZx1Ri;sm_%nIU_SCr6@Izk-_rW{G~6}FM6?l>C5I7 zFQ>0~vZMQ1XT!5Oolnff$?3=9m049e^bitG$Z8wEZxO?GFlF=H($N=+?hWYB#!f9Z?$i=K5h zJe$+`vU$bJ=_{W0cR?6Wc62|V)$(-WjHla|KH0zUS>yW694wiPrUDF%3~UTc4D7`W zq70lsf`ySmj6obI$_lg#Nmc?RD*=?1WZ<6M%POG^)Fcg5!o(m0Rw@kCA`3A{jzK<} Jfw7oD0RYo;GH(C? diff --git a/dq-financial-api/target/classes/com/daqing/financial/hrms/EmployeeControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/hrms/EmployeeControllerApi.class index 07ce468b32a44f1cae705219f3791a9d6dc14e2d..e6b3b9e46df9be7e15e7dcb020451b5db1ae950b 100644 GIT binary patch delta 157 zcmcb^{)|K5)W2Q(7#J7~8D!ZRq}dr{HVU{ii3;Ro7MHl@7Ubktrl$HO=B6?-m}yM3 zGnbQnHh<}h^^2Z$Hawft`E=rpr`wliraYb0^K|*-rxSW7hcdlpWS#8DT;a&V$RNZZ x%)rRN3N%~*NV738F|Zdih%j)12qp$mpg0qQ7+4;pP8=dH!5|sUz*x*61ppJ0DP;fv delta 71 zcmaFHafe;t)W2Q(7#J7~8Kl@5B-j}wHww5jO+L)@l96TdTILF61||j}pfnSMFas-) X7G_{%5CQVoiy1^2#G)A(iy6cLW;YDI diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java index b5d664e1..b6b75c61 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java @@ -141,8 +141,9 @@ public class CustomerController implements CustomerControllerApi { * 瀵煎叆excel鏁版嵁 */ @PostMapping("/excelImport") - public void excelImportCustomer(MultipartFile file){ + public ResponseResult excelImportCustomer(MultipartFile file){ - customerService.excelImportCustomer(file); + boolean result = customerService.excelImportCustomer(file); + return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.IMPORT_ERROR); } } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java index a5ac912d..cfbcd4d5 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java @@ -39,7 +39,7 @@ public interface CustomerService extends IService { void excelExportCustomer(HttpServletResponse response); - void excelImportCustomer(MultipartFile excel); + boolean excelImportCustomer(MultipartFile excel); void excelTemplate(HttpServletResponse response); } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java index 8220f2e7..37bfb53a 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java @@ -276,8 +276,11 @@ public class CustomerServiceImpl extends ServiceImpl personalList = ExcelUtil.readExcel(excel, new CustomerPersonalVO(), 1); List companyList = ExcelUtil.readExcel(excel, new CustomerCompanyVO(), 2); @@ -318,8 +321,10 @@ public class CustomerServiceImpl extends ServiceImpl4VrG1?Fe!~jaS(XMJm z<1$x^XYxUpH!x{%!tmVoV=j?O#K4D;6T3@0Sx-F5Bp_0B%?>Ad(4Z+@r3A}^dp4>J{-hTK0J+Q zME9&rpOYoe%k+>BhjB!@7i8~?VtC1iVbKlaWzm(tBK@mkIVvMly4R$8UAi~K@TP&c z3>-7?_V`%LrH)TzyJN~VpipIA>n=4%JVmQ+hzun9>wuditaN z@t#CdA-}#eIvCwwF&OQNcUa1bRvE4_r#*j|e;J4TS$(l&FW1Ht%y1UHW^HopUB&>{ zn>F5iv)L6gi@bk(O0Y~JX#VC5rZkq|CIjzi+=6#CPGCgiJ*?AsA0HU_P~#(vYLwt( z1IIPS@QHy>H9o^h1D|W0!WXjVOO4YwsWC2V&tSyBgvMEXrSUZ;HO^s5<2*(UOly3D zZ#6F9JB{zD4&Vpb^P|ikM2E&h(skk|jh`{95Hg2VXrjm;@wgN!(`OVTpj4FZvPr0M4jd?BFN;A(%h_vt z0al=#GsXN=z-4XTg_Mg!Ab%Q;?UQhBD?1C<@)hM%aJzU~&uQ8+9adWo%j`Wf4!IjE zajO+1A3=^B;t{v8ik+z9INQkupb1pMI?Mttznv`=+5weBHCEBE#7WI+ZVx57VNDzE zxHJ#ibKzf$bu;`mTr0u+7WNbj2d{57ajiw1XD>?=`%!~C>8eV?x)o=$v23bZi%Ls^ zSF@3-hT<-)m+)rJqCF`|^69mx2ET#^|jLpN;j{C2Kshz>*GCgo5Ogot;xzggC z0`pXEQAV!1$(5Lg>#B0K>+-vbGB5V495UbN8HYPe$4CCZ<2W66 z;^7(UK1z9HftmlH$bq$m$KXAO1!KsTKkf{QC*e!UFX6O4O8a<6`R2@w6bI5zB7iP* pGl+lglgOR*B)T#Ve(6ahSo}S-IM8bq=R%GiK{n7wpLTAN{{d8O37-G} delta 1964 zcmbu9+gH?86vw~6x&2_~hzrQkSVVZ?B4P-cXr^gciDH_Cg%md03{C0`G8Ecv8oMcI zx1W_-P^euj6$uLwf_m+(w_bW^EwH!#0&Df%X9i|~X00v{zjMys=j`+S?0wGpbyxkm zEc)Z0*G2#=#}954B4VP=4I3hvxE0TM@GRQJJSd|>(ma=m=kbF0Ui9E4MBR89F*gq5 z74f|)=4-O#bur&?;|PvQ(;=~)GI7j}iO`nSHJ@$Sy?OJ}Yh85kSwxgP5^kkRUo zv@p?8qS_)#WF`+#V9dQW&Jd3k=2!z6;)V( zg(glbEX9WkAE8U38*3Ck#wR9v6wctRLNU&nIHm9@J~Q#T!WTGi;!B0Ea6w`&DqO;O zgGi3FZLchsn9G<5Ks5# zdXBluF`vg;2!p-B^C2qxMLd2N`y%!p_RNTFsg<4MjV?~ifpKLVE6xB;EI~PYgGt^7 z2TD2KMX!VX+#%Q+24F9{0>_f_rGs!f2<*DdDI1d8RqO4_;vtFc7>o)m(-L!0$&ueC zJE97=!_F%T%(8O@I0rhR(X+Vz4t^^dVMI`kmGm#P)3J(zDsf^a*ZpH|O)1dKp>g%++GPD|zB3x%+J?_ym9k~Hr&;`g~ z^hR!3i`m$OJZz?99ZR`|>mQ)^L5)zzq=EWLgnHCq1NZYV=3d-K!23BbM-umJq^Fi1 zH|#f%XJS)s-UMz9-Ez*wQmxJW;?=6tyr%GO;jBUNtr~T{H_z(5sX*h(O9mQ|gU3>^ zN+z*Nu#Lb5=jUKM9-4%(-9WxkYvSPvh;0c7VW{U9XV@{F;SoG43|xH3D)P>@LUW2z zIQ-NJq~U15&VRzukl@HCYLcUo>FEpeIGXlwBe_Qtm2q?1U6Z9*nSv7{PB;zD|0>H9 zQvj&%n^6|i`rVs)MD1ibn1`P|2HzmX5)!WaULb_;S{YrCax6nSo!1yC+{R`U43-bT~ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/CustomerService.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/CustomerService.class index f7c2de0cb059addec56cc77a5fab0c71b1fee133..35b86f136f0720a7ee96e6791d09eea952aee26c 100644 GIT binary patch delta 14 VcmbQrGnHq<17^mk%@3JPm;flj1pWX3 delta 14 VcmbQrGnHq<17^ms%@3JPm;flL1o{8~ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class index e9a3f040a0e1f30424dc5cae5e0208cf01a909df..547b83fb55bde9265f7375132ac64247b0f8b34c 100644 GIT binary patch delta 7078 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 Vaf(Mx@$eE}$`2c~oLBH;{{cQ1mmL5A delta 7036 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 diff --git a/dq-financial-crms/target/test-classes/com/daqing/financial/crms/DqFinancialCrmsApplicationTests.class b/dq-financial-crms/target/test-classes/com/daqing/financial/crms/DqFinancialCrmsApplicationTests.class deleted file mode 100644 index 9e78cf07b9df7e7b9d2cd04517d1163839d54dfb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2800 zcmb7Gi&hgy82&aO3vrc*msV}Pq6M@rB3dz)79&*JDAXXn)Hc)pr=UN9P25zR&@LVSe!xF(qL~wv^ zgxh5|Qu>4tJZ=qK%qVSp6)V?^>_xFEAL$+C_i6sC1`6eMu_bKHU~6r>I+g{!-Dm+X zy~LYMb=z2H2<7*x9loW7;xyG4k}R&r44|#CYm1(!uT;fw#;4(N1Ct}&{dt24osWa9 zY|pZm)V6`E|62`l-j`}Es4fcan35q=mahbH=*T%&=XQ9HBwf*gHE^SQ(FTFC6}`8e zz*jm-m87ii@H`F5iH!W^X)p)tXMc0|rz|XB(ZuH#9-?Al36Cr+>*X+xn0RdA3p_FLrG>BX zH6yFNj8rHZ%@9X}efXw;r~G_dz^H}qAWW=Sa8NZNE!41TV$Fh!rv|1vLASc3*|2+L zgqD+H_XJ1N!pgdI*f9qpsdW1;gb$c!14l=iRh}?al%6$3T~mj4Mdz8ZRT&yElPoOM zSivLnqaAW72NN}@)u)qgiLInryD(}C36f9>C6_n=IiX(f=w5@=z(Bi~4E)f|Viyp5 zH_2q%162@Mp+p2HaX1Gy*9(eo>Mf8t#Z?{L*Ws6f5Flz*2yi<0EW zDV*k)EYSj*e~cE+P8x~z3Kf8<_`MxwqPau0q*nqxRB?fFLtoMd}#;P z{mUu1`Z2+;_ObtG436!fup0{z5oCK diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/DeptController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/DeptController.class index 038c5072fdbac4df9cd0bda08441696d8fb106ce..c572fc7251d6f41991b22488c2b1daf78f8b18c3 100644 GIT binary patch delta 341 zcmZpde=5&)>ff$?3=9k=3^g0M{;`R2Bxhviq!gv*F*0!K!`Pd}+5H$xKCl*Rg zj$oABJcq-ZNk$?)wZtX0AhD<w1Y?#0G zW>#)NM%hFLCLm;B5ZBtmz_gQrjgi4;Hv@a*b_R}c?H!Yic$8$t8DtscfGW5ccp3B= z3>X+041qizAPp3mT*$LWF&1b7Gf+$#WQO)m1|BAc0}Q;rFmrTvO!nnf5|xIU160Rg z%U}o8&&R;KxrMilG1vyET?%M`7t}FgFs)Dn1(+CiFmP@Fs$c?YW?*0gYGz<4W{?4r WVqoWs!3`IK7(Tg+S8j3&zcK(t3`24N delta 277 zcmaDV-!9K}>ff$?3=9k=4AmRC{;~11mK3F?7Be!i>4O=YW!e20S#lW}j3*XKZSLeq zVPcWZ$t<4yflG`f1gLVe7q=jzOacQF5Hc``X>DO(+R4Di$l$Y^fjx3N1Bdpu$rU_G zvSJLf401pPTns!6`V0mPj0}cA9uJTPicH?lvqvEYXaF-%ObTR#_D%*KCWZqHyuMIl zbhb^N!mA`I1vLh!jKP+{4yc`vfoJn+-Zn;8J)nLmpnf|b%?PALpgJKg5@2N5#=yA& dD9*$n4J6sXYO)w)fNYQ}fa*a;PhQJ!0RVJzGbaE5 diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class index c623421454aef39cc712789caca858b88854cb11..528d4b0ad497e12fbd30a234eaf03d1e354e9ab3 100644 GIT binary patch delta 295 zcmYk0O-chn5QV?=^kiet&t?MBL+svG%St&3VZQmBb`S zO~W9lu_zVPDQ85aq@V9*t?E~?BU#u$^_Y%S@vx`1-j!K1u?MK-mZ?Bf66P%AdMVdt z=eXx=Hop_Ee>K`O0=Xkoc!pcqD6Gt3sP-Z?CA+&gd>OglY-Vr7?duo+NgeqB@9y&| NF8aKiCWTw&<3I4{DVG2M delta 258 zcmYk0K@Pz{6o&s!rz@k=g)X$wXc0kOKtxE2SctU~*fp_p0VkL{SXfC&X&k_H9Kq|5 z#_rGmzW2R%4o~5wBEmg5EC7E01~!O?IZTcbe}ZrCuHq)$ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PermissionController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PermissionController.class index 4a40337052347f66416e5f0342227deb9c71fd0e..7c82a023c14e8c5684a55639caedc3f90aa5b335 100644 GIT binary patch delta 154 zcmbOwHAiZLFqdp10}~K3FoaytWSxb}|8`dmtZ;tbLZGC&nv z47?2T3aytX7_O{6eTuK3A4AKlTKm}Y3 zJPh&-3Ji=4ia;I@kcNmT0a=U;$_y$DEDRDrnHZpP%s^TSWT5s=26iTf0}LF#P(yXL dO{a<=RD7R7(0}BHy0|SGM))odPZ5`d63~Ve6RxG<2*dw;?3i4}t)wZ# zAjKdJR0dSYpu?cczzAmP0a;97mOg_412Y331K;L@+&qkOQ9xm4po9e2)SV36Obos- eBXxF6e#N6CDgif9g29%-4rn4b1Mg%--a7!#)fh?u delta 152 zcmew_{a1QJD7RuE0}BHy0|SG!))odPZ5`d63~Ve6RxG<2*dwn`4KubTlKZnv_8D(`(e85l@2Ri2G0#utf<r)oge zgrZR_G(KV0lz43GfnYm>%54ImrrHf1Vh4q|`K8b~omCni@tW)8JUXAdF^FNU5e$sx)Y-udJ>y#>Eq=OT-NYx4_MWM`A+j zw&!*@x+@mOxSsm6$oTJeFZT=15|zt<U8LK^)ng&CGv_c#78%gL1G)W0lKoR0UoT&};~@Y2y*<})nWeYQEHaiKJ7i|ve; avnk8D%`6`01@pKNFTAR3TJ=l{zxWpf2}HgC literal 3995 zcmbVOYgZFT7=9*PQbGj88}@3g7r@I>6t!Y$xmOz?C4g1i>SQy(O0pYwH=(ho|EWEv zr`3Mw@pFGvPoLRcl1&U8>|*GKyCIE5$pLBIXji=XgRKb|EaQ#giv5@r$wf!>Oz+?;Z&mZ=1cjOmn&f_!1w zTgIkkOWU+$(b#rNo`z>U6WUwep_D6V1@~!fjD9iaB4qe=_!ECI4KR{^S$^2bPq-?G&<_q4JeW zmOVLZ%a(q{C9$0r7aS7zh>p71HeGgA-pE^aA)YCV%4a~z+Ae{vsw`GWw#x|PcD^|y z>$Wwe=B-2PT2(J9%JTylYU{M@O-EoM@=W03j6)(vG&*6i2nS-(3BagF*QLO<_Nh^D zO472!y43YJ&l>b=q?a-@KjRmx@TaLUv(x;h+&%10Trax)y0d%tguzCa*ho7`Y@`z69unMfj<8Q$U z+&;9s<^ooYLP;8XJUg}&8ys`EU4QnJS#g<7hUvIUH|1@`>@tI<&MXglVvzPx9}(!2 zO+o_W?+z@GEGS>H&j~y___(9hjT>dxsagd#@Mi7Cil#iS9}V7fAvB}jcg*nBTDm*QcA-{DG4WyGG3(N!b`$Wqk?K0yQm60 zJTUu?9_2KCMor*GoN)71X5Z=0R@_L7Fu&P@_XncmTJJ=hpmefZ({r2E+A=}+8xwEO z`ti8dy1x&+Y_NuM>$9`-xg2}{@DV#tlD%Q3cAryeG~#YKMo#g9RkU8}OIG_Ha4J3! zqs}n$n5iE&$q+GgZg8QRc3oLxt#?Z=6I{10HucUugs@736IzVf-s`H8Q&k#}$Ir(7 zJF72rroMbmYSm*0=2x5U#!g1#XL$qFokQwYbdqjt%?Of6Q7-B!0>`*n(_LjFyofZP ziJA*On7BEcCh3s6TYrxG-dIaBS)7pXgh@rqehK$6z4$l%?~G z1tnQL`GC=Ac)lK%A diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/DeptService.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/DeptService.class index 08bd98ce74bf2bac1aae2651da12aaf17456bb3f..dd60d5598eec44f7fbbdb1f3f8aece6ac8e2fb5e 100644 GIT binary patch delta 123 zcmcb?c9Tu`)W2Q(7#J8#7^K-5B-j}w*%_oZ3WqW3Nu;NixTF>&7M0|t=9M_+rMTu6 zG^7$iS4DviU4y9;1RV10w?)&{&|D R2#{i8-~yAP3}Rqf8~|JP8{Pl_ delta 107 zcmcb~c7sj$)W2Q(7#J8#7^K)4#Mv1n*cl`@3WqT&%I0Jim$;-BBo>wArskD6=B2pi z7Ubktrly7zrKU16I8WSSK6wu#7n7a!=F^OMjIx{zj0{{rlb9HUff&LPVGsq2hyeg~ C&=}wV diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/DeptServiceImpl.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/DeptServiceImpl.class index 77de5a98f5a447930ed37b611762841755ef13d4..f08fbac94a634d3e32a655c069a1a9ded209626f 100644 GIT binary patch delta 3161 zcmZ8j33yc175>kgnY>wUhH*lc83F_%ApVwzg`qc99mf|9vwAzJB>~@45HfdzSzF z_q=&^{<+%3^B?s+1z?hNcrhP`y?6i*dhr!JqD2@oO#p#>8*6p$FaAZ{jsAzOJKheM8&(ofp5yAA)e;PulXI_1;@1{^CU? z4(ss#s$+XwFW=G2cYXL9&gfs$d*r@%>#J^2^VB$h|mpo$l z@E;TZB~m6XcGo%YHXL~^F>97PCtEP9c)`}D-A!e!O*>l37PReXsT^Z9xy!~2e9f`; zrjGdb*p7Ioz!Tfv-rBY&7F#YbwloXWW%bI%f--%}L3`GDvsP+3P8b}!F_%qTuSm~sFGnaTuFgmj*yXpQPwTKuysD>{N(jmy)QI2m&>2ZSl@{M^pR4SbTF^bLXH8DGf-3)7SuR zR#GP8Oc}3af=mp^q(P=k4oJC@DKb^bG^q$kC65+P58xgpRZ?xr3?(yVmXaE&HKk5T zz06iJN9J0&{-Uw-#H*x1<||ns5mOc_StN^TbV&eR+UQax%VfEdYh;C>)Dm}Tg~CEC zQnFH3DOoLz3QMuflr>7O)jMmsBkN?nk_{SyjT)aO4c8`#bU*E%=CEpl+ntW$F%8|v zf-g$eb<#|7N=)F4$2#MJamChq&V1`!w#Pa(`1Xtjxt@F0Mt705B*SC1X20ZUke2Ql zIUk7GAe#lNimimN(CRm`t=)Myh6}9|p%&%qjKwdp z%vu)SQYJ8YZ+Tk>1IUQ&+||_DY04HQTV;pBLENWc;ef*D2`WB^F6+(kWNEkZhrH$7 zsVhG|f0#8oKU&qm<|J6a*KKH!C@<#g&)~d-v!Rjtzdaw<%i9=JjoN#rFFa&9a)vrYHI@MN3LBU&5QT35E2x*s`(A^pfN?Zr?7 z+QPF4hV0wCY9AREa-Bh9c;jglBr!rS((=ei$dyFlqm0o3o!4#*hTyYZ6N54ID{5janaXA2DOFu5?g5~0?$PRO>Fajh_NPG?Mqs6k(hW{sHCDUK9yR`Y;;kMX`ZMv=3vn95K*`DA0qFUX&V~$M&Mk zU~1#E+f?Dg%n%G&G15H7I+7kDEaznIX_6LTlkH{z$Z{%guwyN^;WKa}kEOV*b$h7O z2zU%Gz#~Y<{|PE?!p&(ko@0HS)HOtt7;g>0qi9}NF2J&d&y>$%9 z#qw)HB=`pS!Q4k4IG{_eV5CZZ5&Zn6i@KKzK?1j=(`e(Y@yU($V9LUhNFVu5=%=v^ zB}r6V4%crVyNB-X#Z|aJjjet4QkiLmao=Xg6tq#kjIE3L?Pg}ir9f`A1G$3<+ARYY zXy3)X`ZK8Hd!4>8dKP(n;Z>Swy{I;@sD#a8M#*u#Nz&*YiZdzBV(QLBN*!`0QB$J% z;k0R)g83xdQ8y7eg)koH?;>^sO)F+Pl^m6mJr!PrAKr|QY66V#^Ofj>b3{1jy20E52IP9`UHeIVR$I$Z7D z0SOH_4j|ywUy!upxlBpF<}5m%eHNzUD7;#v>&uKtJ@{R=BR-#mK2LJ2 K>AgSV&Hn*HKrzn% delta 3906 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 diff --git a/dq-financial-hrms/target/classes/mapper/hrms/DeptDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/DeptDao.xml index 294e0608..8ffcc49b 100644 --- a/dq-financial-hrms/target/classes/mapper/hrms/DeptDao.xml +++ b/dq-financial-hrms/target/classes/mapper/hrms/DeptDao.xml @@ -36,4 +36,9 @@ FROM hrms_dept + + \ No newline at end of file diff --git a/dq-financial-hrms/target/test-classes/com/daqing/financial/hrms/DqFinancialHrmsApplicationTests.class b/dq-financial-hrms/target/test-classes/com/daqing/financial/hrms/DqFinancialHrmsApplicationTests.class deleted file mode 100644 index aab194425969a730bda8c69dad36cfcaa5ff1e45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1986 zcma)7ZC4vb6n-`YR>Bsryi{wgE!GOOWvwE%4Wa>x1p{dt1nc{-8DJpUO?M~M{1ktI zpY_;Q^c;_${UQDVzj=-?&up?JU@Iku$-Q^(y>p*u?%e$L_fNk7n1sk+7*jUh$smQP zZVcgC2G?<;2U$#a(#8Cx5}_jz(#G@M3}*12@qE7rIn0`6&c=KuyNlNA9NZbP(2EaS-6< zYC3qJLRn(k4pm};{``*E6K+kbvYS_t=0ZTUjiLTO>-$o6zYFAE~c2mV%eh5=pE z%2#@ZDM!cFETrdx5<~m)%9ks(%7zSA1?#qOG9P%Nye2|r^rkVbw-xKi{trj<_ZJe< zZjrNGwOUqQ%)qLQbi@iAFYvYeTIT~{KxL9^SS?t%dMNV&N2Q=5l;5}nMjmj#T426( znN(O9K3s6UniM_vA6nXP_*u>{yqzd&;q5MqYD|TV4{hYljhHLlsgY9G;G<)v7}P>f zE-1s|g=6TLFc)fJ>dBoE1lrZi>NXj3i*fJF(%wAmbldr1&G%*KvH{nX-ex78d!k%p z5l_y3C~=HnvYDS5m?-Pu6`bQUY4uz#3`N~Eo`aWg#>TRP6%@#YgWI^{;1pi4ao0f+ zs}4TG8YyzHj*lJO!zUI9qxG_$fp;69I`|Bq+xWu4m-x!U_4W)&n>E_v7@~PqF^>2# z6gGCG$Cl}BK{Ke>^ew}pmZ9L2OuPHyU6X#0KwmQ7=Ci)e*! zEFKUnH|@vDVB+6KAidj2E!HC~D+~*23?6ELSAlz*<4zZKC`E+X7}ogDNZosk zj)zEp7kiIzH9s@J0Mg9-DkZ1kj|+H>nuUwZm5Ouy!CYzDg7F`a&ishZeRQR;ZnQzz zNA&I^dQZE4!o)m6Z~oFg`YbG8-bcTMZ*Ypj^A>)^$(8RhaODvOzy0TTQ)(Kf)Qjlm zdIr4&dzPOG0-a%bODwNMk6i-rS-635j>VQ><8_QuV$n@NON2ER6E;q(0o$-#qI8*- mUZnoQ9UE6{O#Df|gld<2DZCM{S7U1*^*5=%#mGqyZ~qI~XA{Z* diff --git a/dq-framework-common/src/main/java/com/daqing/framework/model/response/CommonCode.java b/dq-framework-common/src/main/java/com/daqing/framework/model/response/CommonCode.java index 6c930972..2e71ad4c 100644 --- a/dq-framework-common/src/main/java/com/daqing/framework/model/response/CommonCode.java +++ b/dq-framework-common/src/main/java/com/daqing/framework/model/response/CommonCode.java @@ -25,6 +25,7 @@ public enum CommonCode implements ResultCode { INVALID_PARAM(false, 10003, "闈炴硶鍙傛暟锛"), USER_IS_NOT_EXIST(false, 10004, "鐢ㄦ埛涓嶅瓨鍦ㄦ垨鐢ㄦ埛宸茬鐢紒"), PASSWORD_IS_ERROR(false, 10005, "瀵嗙爜閿欒锛"), + IMPORT_ERROR(false,10008,"瀵煎叆鏁版嵁澶辫触!"), SERVER_ERROR(false, 99999, "鎶辨瓑锛岀郴缁熺箒蹇欙紝璇风◢鍚庨噸璇曪紒"); /** diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/response/CommonCode.class b/dq-framework-common/target/classes/com/daqing/framework/model/response/CommonCode.class index a15c2503045a1e8c2f2994de978bf4d7486ec7d4..d939627d206ac6bcda040d044a1291383fe1865f 100644 GIT binary patch delta 1509 zcmaJ=TTE0}6kTVYXD(+D$Hp*d6RIBynlT1Vj1ffv1r>Svz&FB3tB#{mAFYq;*h;C2 z+FnsnL{#vtgO2f4TKzWZk4eA!(I00NfBbJ!b?-9-P)P5`UHh@t+57Bs&IkYB8Rm=k zPyYargKiHTXfW_CcDhmR#x4W%u$zN>`1c+EzIS7<0T1>`>}Nb+P|%b($Qa?sA&DQ@ z`H`K&5{>NqB+>VP|b^u%RJWVKX*x>W+YWa%L?t zDYgZ59J?!EOwJ4uucn^EA=Zj4g^dU*)FUb|B4IVZ`n@gDbTWSA;=7&*hrd=R@T0Il z8SlLJ=0TTE&PSmYaZa)?AdEWGbBdTYDsj3ye!2bCvrCCcG)ewSp_o(NcvDAjYiECO zA?f~gj<+u&%yf;Z`wNtjvcomSUXH@pOIJXc^B|Cqk$HX;pb#LWJ!qsoXrw)8q=q$8 zj~b~*jntz?YDyzDrIEVONF_B=NqPV_K1+>soPbFII#M7l19be9NTCb7604}K)#QyM zuy>Ouu!jCFo%0fZE!Oq%r_p+>Fno^e$8bJ}gZZ{k`0FX6k}Q}tT%4Q= zZ0K8J3L!7y%zgmZZ88R{bFiKwNwpKTdP{h3$e-yrTmjQazeUq)+3CGA@?^ps(rK5l-)PSm#0H>)4bLSRqD^JtWHz+F}E@X hagVk7?#x80^+Zkezr~mM4_=x_aw^-foj5k^_y{nh3~2xW delta 1353 zcmaJ=Nla5w6g|I%{@3) z*o+W3EjWUsD#}zGvmhPyTs+R72L7B-(P)7gCk0M1p0-f&jKEpOb6hzu;Ns*0CvJg@ zoLmyP%=s1GvPmFQ;40Uf&2WX_nn1Qd3-5njAV=T^hphs+0yjClC6Fi3#^G&&e1SV0 z>H-A$06y)kzu#@kGOJ*cF(U)HgUB)%EqM8up`tsiz9m#8?L@sdfOBTzjU#k{DY{I{SVu zALO-4f`+}YbB7@XbA5X2#OsH?<~DCj&(~LOE>~$W$VAo*=^YrG93PZqHnQ}t&}Ah# zOwadqjr%%AC*Jn?+#`NboQ7OK)iLVr@BWL*W6I`j?w#r!n9=9cmJz1K#sb2%gzE?^ zO%cXI!bVdz-=woE#aEPSz9s(Ufc~MwUlalN47v6l5SQBZ|EPgk)AC znUzS+B$5q@)L9~RmPnl?QfGGhv0s{hz zS0b=D6nmseg>FG1Fz{6( zr`z?TmIPP8!yKtyO3wyZG_B=`$7+-{9;~0`(T1X0{_#HQOP8IyQ~uwP#0A;$kHpFY zrDq|%|2dQRf5fb%w<5JPlT`ul%V*IF96}9iX<0K=@&+YCAGUth!c)RiUm(VVv@lH{ k(l&&rZT3JJV}U%s)v)RFY%3N_(akVS|K(xS5^q4=ZzcciHvj+t diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java index 6f150867..c4e8e7fb 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java @@ -17,7 +17,8 @@ public enum CrmsCode implements ResultCode { CUSTOMER_IMPORT_EXSIT(false,20001,"瀵煎叆鏁版嵁澶辫触,璇锋鏌ユ枃浠跺拰鏁版嵁鏍煎紡鎴栫◢鍚庡啀璇!"), CUSTOMER_EXPORT_EXSIT(false,20002,"瀵煎嚭鏁版嵁澶辫触,璇风◢鍚庡啀璇!"), - CUSTOMER_EXPORTTEMPLATE_EXSIT(false,20003,"瀵煎嚭excel妯℃澘澶辫触,璇风◢鍚庡啀璇!"); + CUSTOMER_EXPORTTEMPLATE_EXSIT(false,20003,"瀵煎嚭excel妯℃澘澶辫触,璇风◢鍚庡啀璇!"), + NOT_NULL(false,20004,"涓婁紶鐨勬枃浠朵笉鑳戒负绌"); /** * 鎿嶄綔鏄惁鎴愬姛 diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class index 7a68817085df95a34ad1fe7b7a3907646b201771..38424ed800ae5c4327e2f4f67c24b25abf22792c 100644 GIT binary patch literal 6123 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 lb_0)6PxW=D{5HPV+08ooj@=KwOZ7P8dm@S literal 5742 zcmb7H>317f6~E8cGLlBNc6ppoyF{gqEmsuiHcna+H!TWI8nQvkl8&v3J&B}ow4}H! zW#0-dfj}XYQnm(4pe-~GT?j4E6bk3?rC)$A@E7oz0|)rsHzRqZ4Ce@+M6AkNHxLeP*^fziTomuhQ^&@@-8?Pkg7@=6B{*p(~r6+Fe83JSE=RxuO@ zGA~ySg3Z?Dz55Ow6qIb3%T}{xHq6Srv1+x9s-TqT!4I?=mV9)@s#n_0R$~peYo^h_ z6Q@1Aa=m3Pn+^!t(XmLWE?wYRV|~1jqKX0QHP_DSzF!Pt_ccP zt@??Y0i%({cGIex&E^5S-B`l8qD$D-u9=N8LK@m;)vea8f`+HI9>&qwt9~4-fafT{Z|Gv)5GnCGsdpE5mhid;siC@!`}#N#C6Y+ z9RWVz4KDA!?YjOL2dCeSm=xU7Bq%X@a=Hi6Nqn(b-} z?L=Nxs^D`Ok-|pf3l-cbhb2=+xX=^2RKX`W;X)@8N}+q|(L(>xVuhYFv}~t-&;p%a zc!yO*vm5tqPS^3PMo?*>mw@btd(rsN(z4v}j^fS39rA zEN-K>s)*zD8v8A17t*RB)6oo&l`2Wh^so3bi+^54;`EPjvHR-C*d z54NL)6(>8HfSFR9l(_&Harkx}c%(S#$p94$_|S%FEiIN6&QSc?}Y zI~P-~U@o?*^f2v5J#U=UX-3#jE?IWzfc#>y?&B9AGTm5RHS6e1v)+E&Y0#bq-xD$9 zM-RW#4F4yeuEtl_ED5@fR2ruey%G3&d=m}PoA8f(!u&?eQy6c;%FRtI-eQtYbC@C3 zBp2BxMaj4&T#@86d>0=!3H!k@aqo{q1m44$l`x>Je_!vj}jc@WbMicQdj`kbR z`5L47_!!6fjc@ZcM$_^!R{M?TeU0Bs?{kfH)Xoqm^YqLG8uCx>oWpRFn-kxuMnOmE z9zQ?BgZkmB<=Qg*{R9T}!&T3I7HJ8R%dY2K!9o3S*I+*t|K|w}>W8}y`!W6fga`G* zU5ou3^Y^0+>W8}?`&st)6B*PGcTM)Q;_oLqs2}dS?8ox=6C2bIcWw4_+&`byLH%&o zXFvFMfJFWb{Si5@p_5;jnSPvtf%7vjQT!|ghtJQvNbx2(^BQ-IOEMF>4G`wGRh zz-3CFBXw2_tW%=HNa{gQl6puBGADGIQs*eH1+|cel+wc>rF2CLGf8ntVNLOn(s~4> zv>w$WOp3ash!*vbGI|W8jIL@iCaEq7$V1BNageh5h!$tkh)arVBOX#t9|b9=C$v!} zC0x>|mhh1BdJ?3(p3;&`O1Y$@mhzCs^fX9gdPYk#DdUpTTE;`t^ejl4p3|~S%DJSh zmh+It^*l)9`k0ny(wIxiYhxW!;C$a})_F(&%el}_8xt3(Ms-|wRy;;F-rGY|5T|Js zYr`}x9-xyz0lHJvsR0zEJz|BLKq0D%GPQuh)DZL322$v>D9|aO2t6#WqI-d&v`+t_ z_XEY~1^NfA0jcyC`ZL`J6sNz@YxDu25qw)*pbr9#iV!_X9|B56Su<`Z$F`%qyqj`NCC@0R~W9kz?d2tq>GM@w*!%6Uo>?Akc zf{~kkkh9u9SWeH!q2&h+s0a}UOYn!X<3{`mPDW58vx&KFf$g#qHYes*PzOq4<{X7* z*J;x|yq?qptk43kM&askR4F|uRVWN;q-ep8Dy@g4D%4e>TpX*69+oOpifa|_sIs~u zRZ3Td`f;psdPJ&FI<8fuqsr@1sfu=0C@9BjOpi$wYRR>VbyS+JN|oAGsU6k09+xT< zmunT5s?Gl4e$WY|8}4B-O`pZB<0q$>q6dJ6C@Qwl=WzwYv_(Ye3qS$fFkrVTKAWMqV!knbp|L#|HKFOSAbNJqda{T zD2|=+E5W&Dx`f^N^Y_g2wE4(IdR^+Ob(-MYUZ=^_)ecT#NWI>{DEo=j76+%9Q*baU zeIj*@gR_j^;9wN@MCw`x=NV5q81+1n+Uj79G4|wr$Jyr$@H!RyKX<%e<7eDx4$;?S UKlnQF&xaV!au)yi`S6YZ0{Oy@`v3p{ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class index 3dfe10d5e45af2401c3d9a2eeeb68bfad1e6237b..8eff526a86e2fd290f4392ba023d95b35c0c5ac8 100644 GIT binary patch literal 6815 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 literal 6224 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 lw$qW$SEE+jtI>Jw0 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 diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.class index e1bf1badb14012da5e36e345833c5f3e1051e0d9..9385578117ef4dcadb7100506003e04e5abc8919 100644 GIT binary patch literal 7786 zcmb7Jd7M+#6+SnUq0k zbI(2ZCcNMd(*-e$D1(Hm|Vx4VzclyvF9YY+h&c2Akip`8}J% zZ1QZ5_-G`6&!cSK4A39wkBt7r=Fe>2V)Hhezp(i$o4>L7JDY#7`6ruyvH3Tf|FC(7 zL;crB?*=GFFDdjMfBsLQ_xbY!MUWzdB3z27P=s3%9z}Q+;Zua72)`l%iU=wqq=-t; zMU_uf`$SlfyC>ai2#PMaOkb_XlX|KzzBHFfr21wGQkM*+a)|+BSt6V0P8xGksdP@y zCDN&^pw0z7>4CVOOmyqrdfd3Y$4JKYA|XDX2Nq}2gGMH|7NI<=_2dxl;~hD4M}GZ2 z3?x#$#^n{501`BHK_VT`uF?DYjEpTxHa=%Cu@KK^j}*#3a^H~~_Z8x}b880?x5oDT zU8$UbK)7q@@S&>@@83MK`(XZ_Tlii=kZ(Xw>2SkqMLM{CWW)9Bbs-%oeE{JsSAN5- zBRh8Csq;H-17=PIIC^g{%a2~YX=KmA{FYt$tyeL}1k7>c^#=RXDGnq_Bb)XfeRM0o zz6qG*5fsT7eTi(&$QZrz^ua_tFN$ALp8%7?!CI7_ZZ{EFueJBYp-y)r|gj*iWuRD<6wvC;B zLBVXlo-z8<$zC%ZN3Yp_c>fmp&ddnl3H22#63K*~!xN?l2K5v_LjJlvcq^G&<^=^+ z83TjK^jgDMG&ImHbGz}b{J#4S?|n5_hbgLsO4OI9@3p2 zFf!IlFFOat`4`V+f=57yx5oq5PP>$gDO-bIh7jfELTj zsRdk8ULQdWcNNQl`OD?(`z=0Cb`|ha``mJ{IptFs!SMW&nd4_fO65c`VQ$IP__BpO z)J-W*1J4XIWFqSAj6xom5&&g16S%N40c2$YsE`Rjr%YhjmI+)HGGXz}OaPC~1O}Wk zf#I@DU~DuKxG2qp*H|^ACs9>n5^+xVWkyeK=F|%WiS*dcYPqmv)46_LCVsBUm~6oT zbIiJs4%yo*hr9@xiee9|l%nFb)X64h>EwlU$j)UstP3-s)vkgvoOM-ix*VERgQPil zDox2~zp9eV(Sd+TusW7?yTVoRc4osGy$4^0P3M?~6_JcFWAc$5x|a3G4xSn_a%lsr zmBCAgW%`Sa%u0XpTE;4EW>&1yVWme;&F2b2hws<3{j#~BxpkpH7BA^qI3E=Rj2@mH zO6D+V6^AD#Ye9(>=iL*N)9i`KS@p)OIgG{}X2~BLoe*!#O25x!nyHVC$!Rp^khSVq zX=;>MF%8wRvUkm;WuL^-mp%TB1o!ItvQB#}A4EcwrCf++(yS28r!zv-#b^PW#ca-F z^Jz90viS^CbVj{w`q*5?W`NBg%@TAHA6NeWz8|8eXlsbBpeubM5~3}9@mcy@h(1qO zhUg1yu3~dFn`_v7k8We(P(tp;4P}X$!fj%9 zNJK>qT5M+<*MNChi=1}0S*0-B^l>pr#N_~_bheoV0a)AFR#p-i4tBN`ibC?uvHb7&*OH&*|~G zde&HyUSpmLaeFg=I6N*ju-hjSSI84Ucr>lD$cW2Tsy1`}

?Y9E{Q$;E*KH<+K)8f}0)eSn=cJ z+EpTMbQGgGI*2Pu#qEw_G*t(&yHwoaC`L1O5PM3+GaSWe;tpbOsrUp(F`B=F*jFk( z#Zin+!$GW+icfPCW3zD(`%A_19mUwB9K?ZA@!5`IY;F$XV5#_AM=>@<2XUxWe7>U? zo2i4ivQ&JrqZpg8gSe_x+~X+5=ItP^E)^#n#n|*6#NkqL+EIK9t+T`$7O;yK@U-cB z$>qGD>m|cl(7f2?J|yT?`jS(eit)ygyOf~y&d=i>ZydRY3EJQs$1~nIa)%SN(K(KH zym93IC+N%0aeU*ABX>tZw>igA#v4cOoq{$w$MKIhj@(%V-R?Z^f$_$X`>vonoS!E+ z-Z*ks7Idd`oX~jV$UR%oUCwbT#~VlP=z{Kcj#D+>IC8%iwAndM^?2jR(}19_IL8T( zH;z0j2>!kz*L%et^n`Zo{$10jJwP7!&gsukWHWgxc20kqA`3gG4O7&-1gKfm38T4Z zJWoN@{TxMhP-uqg9;Vs?qfYaHQm1)U4|BZFQFI4YsvgyABh_m@km@x>^)X4YNIq4u zks35VNDW#*^)o48k^E}FMw*}nL7Je2)F6{W7755kQngBuRIN&_WKxwys#L3Nq={NJ zNE5ZNTFs=eMXFZAHd3P&0jW`osu3ndEmA~{+DJ`W4M-B^7D-hn+DL6$BS>vp zliJ9nCX3XlHrYt+S~E!PT8rAuq!x?RthU%lleAWlCTVSIE0fwRQmfilAh~yz90$#_ zq*x$}tg!XCy67I-h7zoEok;iMeCeW?Ycg%eSOraUwbFe+ZaUNDqOSsZXrXwIz6Ru_ zqGzx4*~^fSlmWm2MW?5aVtFp6rxu|iXH~4q&GxA z?F7Ql$D)hA0aPu#VjevL6c&?3j2;Dwi0Pt*b^%4jS@Z$z2C5N@=^c6us8*!uW!eK& zCx-A1^>Ltjv5EHL-!^Ixn-OCeXo7eG8`?e~RXl|+`TKz;iq~i*Jpt4x4wFF#fSOzt z_!@H%sM+PmSHVL-Ev_lZ+&6(*UB^-*Jqgr?%;47tYs2O*mAvtLc;z}KpX9#pDI_21 zycc2k{Er_SWEj@~f<$r3zdJm0mV36j+MB{N`?1!Q@bn$zn=wqsT*~8hnwuS}+wv&f z0i>&5^O!Cyep95Vo`S1E^O`Pi(S?>ERTDIy=|VTKRK9{s)fCgE6kX^MQZ-TYn=Z5m zOXV-P8nuAw3KU&v8dBAy1x*+Fg{2A>T+Ld@bcKqpP{GxrRhlj|5KC2AaJ6bxrmL#x zLR*pdYSXGs7dncisxG+NwXo?57hUKxQZ-47m@c#!OBFF)P0mw`_RN!JO>Kp^gT6)I z#*}(chtC4J@V_Kra9( zST%3c_ksL~@FM*HC_t~HYJUh6q<67~e*_c~_4sw`$3T_hIO?aL099edFQlIWRf|44 zo_+=t7S~V%{TwKQC&Vv0vh?UJJf%PdKYNg3%lFab=tqXBgDVgp(J2zw4b#*p#&{e} zvLiZO;s(ZONj#3e*bzmYGFBNMD=}JOM>H;RBjb-sjP5rzdYr_~Jbt{yXm}mb6C`eB re4@nYaUIc*N!-r(B#9?6{y5Aqom_fsudyB5pS5O5&@ap$`O6OhC<$cV literal 7547 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 diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.class index de936ba3a955785c0df61342926f37ff1b20f89c..c0448eddd1f3b574273ee342cb9b2984db5e9aff 100644 GIT binary patch delta 965 zcma)5O-~b16g_V~Izt_!Dbk9{hxh>$wV?PxL9~h%g$jb=f>p%{Oj29Y77eTF&MlcO ziRi+GF)E1$(-_(NFN~%Cz^(DTP6JKTg^RiGynEj{_r81Iya=o}&;R^e`~hG9bAAL6 zYl4Ow(%dvK=I44#n%goKmuOs~I|lCh;YZBGgj^@3Ntn22VoJhk1NRNgtj)(4T4z?$ zdFQD;=j5EnDLa->gOufzTATV3ds^>7P#jT?tSytJEs3Fj*PZsGj;*-VA49OJ8wKxILrI8US@ z&YNE#(vjc*2Z?<2@=3^o-EAW{P@l)UroNj;r@A*+KAH;4XHHDjvj&*~h*nuDPhP^$5`(cZgxzdr5l8=kkDz=2x#R=TyXM4!Qx2ej zB5^?C%7H&Y`~jlc9vNeh>TH z9BC$(8*KXifNi$2yPMe!@(_lFte*n0lUAEiS{LJWn}Rq*Rx6BP)Nff}O|2@OxrX`i z=f2mGxrq+v?(00j(7&CZ?>ub4p@(Y2Llr5c$%)_)8II4O|5Z%z%;bLopBXKbxXdp^ zHp(3SBvF8;+_&E?&n&L(%pI)1O=Hf;=ITqTyS5vhZT6GSO74j0=(FJVUhB-V>f79*sJEJrk#!Znu_Xjspeh)hN(g( diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class index db53adb8be85617fee7e103267516e04459ec141..c4e917ca97b95b989117dcce9f6a94b28a15f355 100644 GIT binary patch literal 4223 zcmb7H+jARN8UL-V)vn~##mZGQ1&4^%*NOn8uucMLnu5VjLL34uEp%gT>`irXq*c15i}HP0$d66@#Ka{NKQ-}+iOVK_X5!}}dDXx#4E$0< zpI6e5oj&E9af)T9I$xZwRp%!)u3ozF{u{4R**~{P?xqgEQ&r#P z$+&sT@%5W4SDx2kRGg|q$(rEih1H8sX&5NEi%#9IxK*Fwh1qEOUb#5!HGDcs%zE=x z$8XlTRY7gl7VqiUIt*!_?ET)ePpn+O^1=DnKe+t5hWH+@>iPRL^be05=dlk2>Bvlb zRrgS{a>A`2bC_mHP;JgBA9w1WtV3qZU+{Ra-P3cmO0ndeX4;A;>&(*GTK(Z-saA2k zYH_Y!X%yW@{NjOT!>?87@v!87-u0(g;@t2^$2r3y8x*R8Z0-`bD+4i+eir+dfJ=g*@kNEmv*khvZdnsDL&N_r@c6H7HdPZRwPU z0kt&3kf_@ViBN^KwbQH>k=P}vvKA8;T`{#z(?0#A*lg`CCUX`R^!9LdQHr zVvt9UPR$%-7Kr0@x6v&79I+roy`Un}3o3wkAv~^LP^U8s?UPuA?j8M_>KK-Nw$`lA zx%YZ9oSC)JxXK_U0zOBTK?XbNAkP(fA0wzW%Ko&N5oS1w5lq}R?p?3MOfcnw#C{EFQ% zJ|t<{8z4y(kvTpTq)IU*SwzY4p)g%sq{oLk5=Mr`K+oX-FVD3@s7}hO~Qxj^KDGpBay}&kqF~>uW>Qbn4=Y8Z1fu68EMRsWF336ZT1>Z zMi{FW_$v3F#!Pquo6h>Az@uX~&=+0stx6*-xHN-mbPb1aILc4|M*XO{&~PN$Pi&)p z)EH^_TC^X1qkh!XX*i16sJP-A^`nMV!?Eb|7#sDYW?IA7aXc*gbZ5Ox@zamq0bO4& zxdJqNgW76%T~)~S-R<9S_l;_o7N6{)|{P6O36?ukxzCgW$ghfWo;`zAWBxKMAV@)Xs4(&Xs7cj zQA&qOseHOaDQ9P>l(Vz>j3{M8rA$8CQi@&cx!~08cugg*H7wdrd&4CXZ{pWh36x{|JWFl zE)|asPIZ>v3XaEpkZ$C~;Ex35MmtC+NxFF_JGm#eH|UZb*~ta=h?yO`3S(jkn;sH= z%8rR39}6X>bdD0GZ9NdNX#yiNueU@QJ06JQZ4p~ZS!Hb_5V4CwE2AYEw9PHR234WOslltz$6*P!q)IJZNNavs} zph*;#k>KU3U@!)g6d(U^y z+_T-5KltA}?*Z6@8yW0CJB>5~5gid1MO+f`jEHANJZIwh4A&P#yeLL533^$?FGRc| z;#CosMf_4IzcTUb3^t=};Wx7WR>bctT(R(b3xBZiM+>i6xN6~=Xs(<1lZiiT81gF` z3Jd4Gi(a|rHI~Z@&BpSahSXBCQq@q5X%>T)uXGKsPMyBG(rj=|1<$T>*%YJBH-hSN zwM9Q>-D`M+8b&JBRj(D)tBs)D`^iq=*UAfiJ0LZ^=r1?CpwptWl5*Bl?~OT+?y;XH z#$LbS2m3V)PfVWTO%8^a&M)|l>d{X9Y_)aLJ6of>;zD!DtDW*%zU-sJRIuXnCVLi^ zn)PzUyTIVe=UNQyQnU4RxzenAextn9s<+G4XM*yG2qUS6{9M^GsZEVlsBI zD0L>4>LQ!_)V=%(;b@pbi|Dw@q8y$K6S<|&YCV-1GLCe!nd9bAJfXd-^m4{~?(Dki z9ezO~^|lIV)5Ksrl2?;j715TsJ_@MIh(aQ_8xo-kX)JEmjY#Y=q^!rpO3mvb<;`haK?CkmKQZP4pMuXPu@BK){$~S`*>1I=! zrzFE;g(o3Qhlgr%GU`}ultPV7q=+`5MKnkw$|Tw;8#P;zjoR3uO>eHU%Br_7gzCOw z8&#CPGi%9f9F{CFf)%g5qUy^znrD#5Ps|@V%q$Qat!led3piq7hkJfH^hirTudu)6aB^zJEP8+*KOo*7o zl#OXYGnmy-{*sexV+oJjco^Tdaa_=M;M$lIu~)=C?6>h- z{8~j?Ah&++3BR(>#$WKdh&R|BGvkt`eIb%W5m__iVXD-jB#S6BGajXjo7~KJEMYv* zCT*<3^FWJL;n~s9!oT44elr8NWTev_}28lkv=jrwT4W%B^Wt6 zL*b@o|AP@Hbr+*IVb40LHP~H7*40VLx`v|*$GD5)O=KP2F=C{gYm$_6Eyom+6_HHG zijneenxwp&aneG{M5MHniIEEK2uTIkc1DC`MG$)`9) zl;Qw>EcAzXg2+G(w{e=tL<@h%86peUaScBqO5+Bu;HN|xtl??=jA#V^LKQzJ zvhgt+?@6L8{>!iFQ$#tw>O0^Oh*g-r33GN0o1T*MteX;rlZrH!bdFNx zTs>5=X+k5*(Yva=YlJGJr(!E9tAcBWDt1w1Wp-7gt`(}Ro{GJttcq?rRI#lht8}Q^ zmYjlfD!3>G!*~zpu*}ePW`Bi9g1-ZwX&L4-`4-L-rTDeD%qmHJPm@(6G7zxVbs`g2 zId}~s3xC5_G>Ovm$iF>QO7R-K%162KE;gUOgDu6eHEfm4uHl}dqi~i>@m_`5$Xko| sDV!I)O=0%#J;nPK9+mS46fVm7cH%XR4}M4ru@6Zlidw^ku=iX42LT(}g8%>k diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class index 6d892785237a638764686e327681a18453c02417..ee3f5621cde1445faf209b4433991948596414d7 100644 GIT binary patch literal 3342 zcmbVN-)|IE6#k~&*_rOnwq>C$D~Ls^_9v@|3R8*#7Ol1gTdabLOt(Wjus_P|Y_aHr zCTbdq5n}?0MooOMFK8gbHlf6*519B5@E5e;-(X_=?#%3VcDoP6hdp!dJ>NO^o^!r? z_OE|${R-eId=SAFoNR!CcZE15gdxPF5Ge&y5q?b}P7CO?&}M|Ngg7I_Sz$;k$VAYL zlPa>}n^Q3>zUNffD)K5E6$P;|r{KJT_asD8xheCAJ!)i33Gv}G#+;E%8`3#``u|n3dGUkMpwuO%PU_jtu9=?|KTSqmp;F@cuj(qD&(D9#XqW(S8hmX$UBDZ_@?_emsS=p zmQ0G7o$?L$mcLs4_WP0{ywA#7&VC8?om~?WLWh`!gr;FDYmOE&lf0Y3Du`O;Qbu~h zur0CnH$%>h#j@zbsaz&GWt?LLlc#Og_I%Dho1DsJ3@e*V*_nLOHqRBzypufSXFTSu znO|($bi|>hrfll$3e=(8mL>tKC|64baIIi&z+jQ+Ilfky2$zGUV#M;5hqrXDKUCPz7#F6)#yeGP_4-e71+^SNSSgm4^UpKDI+^5 zGMAvv82K5Gb0pvp6FWLKG&0D{sfTSdUr0L=q7~`HIx61{t%2)BIsz9_JJt?$avquZ zhQ@ORJ7pfW1hF@j`s!11rS?~|L{ zE|+S6^P{)DTr4glz3qOvxRAOuyoKEon%6Gk(T_EAw>S&OP0oX~b-|kvVPkfd0VMPV zABX>h*S~5%Ajzt`)kJuJ!l+{iV~i$ zotONeaXjWqc%gQj@Po$jh%SlQMp4?jP_FKp}s#6O@!`X!y>f4M5u^J2@%z0LZW&&Aq!0S4&sZ5CFDdn0Mc}YAWc^j ziU6rTNJ*#xP)u(iD5gge4FVMLK@EvW0Mw{Q32M}}L{xw@A4IJL3SF&wYTi5j*h{%g zoVz%L7g>-N{DDEf-8xQ?UvQXv^_&eq;U#Jz%1d~env4;Ah9PQUq;VFnP*Y&T#H-X) zd`Zt?Y7Mx;hK*2*pvb8A%ic3r4 z55*7j4}+)-bFsO9UueMX+1BR%8FoxPo^FV7{@UtA>&iLPOXkL`v?cZvrEURh2fwLC#Wg(<{z40h&e_O!+Llb&BvFpAs#Pcqo@Zz v@lBo{Eutmf>gi-mOT5j~V*<0;(;J1JpeW*@>Jio!7-7SHCKBFu8TZbA(Q>8{ literal 3283 zcmbVNZEqA+6n>`N*_rOnw#(9jD=!u;*jHA?7no8MYSC(2u*E7U%5*!l1G_tAX0}lL zWHiQLNbmzO@uMFkCTKKjA@~yY11A0f{s2V&gNgCEGqc;-Wj-_}yXT&J&vVW_Z}-e! z|K9o)z>|0{g)KPQ1_kd3@~$AK1Th4eQ&3ECofpIu(9?oj5M)shOOP`{a8^Mng)C00 zD2uhC!WQe2igPL)6|M?T98?u7D>yG9RkY{LBhHjjHYMaH&KS!^p=4AR3NxN#RThRN z|>3A!& zBQG1JDlcif|IHWoE?>QO<+6lb{)HC`6j}4W(L#}iJ;$&ro?Do*y{T%cL}jIHx~{Q6 z^{#tYF9pB5H!t7+;Fr5MZ~gt%EeTq&>UwtBbdIeo5wy=^)LdijHY`<}rpt zM_kWvynt8C%6z~j_gfXqJ0PL8w{KQLVw7P>=$No7=2W#jNBah|AaZ3Fjnb^)SYjU@ zCcH(9Y0)Q&cDXQboMQ$Hryb_@yzQJV%-dzgRVX@Tx8RuPs;27|MnkWsgFSuBESR3S zv{sbP-o8jI^|EvbSVPEN4ZyXaeS?v>HEPbRg`VPetQLL7ZM?jz_rbeGS~>)-;r2~Y zWbJYR^-V^vr)uZ0K; z20h0H9A{uhr^hG97&-Z*W4hInCn4PsPNt`^_bH9Im+FZ)qV}v^>e)dv@mb8+Ri|hk zwnSrh*6JFz`A0NdzzW-9usfO~|M((%lgIT`jc|wz zcGr`|ZECPPOcys&pN13IBO$xyNYH-FnSaDtIAd}il&p)vj7Skm!*@tZt^=^Jc`H2^tjl`Gggq&7Ewfh zWgY#MrR3T{AgfI}#9e`_#8vLU0qHv*wwpBRA8w==&;kIS;HM1aSxnMKeXP$mcaSE2e_GHp|XBzj`# zPo(pS+t_do+E6~Ric}4e)@4G{dNMByO!78z*O1A}`D6s7=?X!buI3d1QbUlES0kW| z-bPSHPvzSLC>4U*@~H@@T~8C#u50FX_>AHrzP=K2+jOMBPz{& zk{#Zk81ZYiH9Ne>imBOwYfy$((Q!(gr}cyozm|~@UWRXQ2|MOmBK_U(}Eb*6F(t){027Ua;w-V^1&t78Sv>jW50`pM7w+lW`vWkbBM_6ZMgiVBzNO;TdxVQfUeHxVo diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/response/CrmsCode.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/response/CrmsCode.class index b35c4610fb295ae2e1d814d0065b0b164173cd49..8780f9f86f70658c4fd38e79a6857821d20aa078 100644 GIT binary patch delta 1102 zcmaJ zGsdVf#)TUb6Ju+%0pSPuI~p-A+`2QKb8XU^G-i@HukXCRd!D<0x$k`ay|@CP4Yv(w zh`BI~BRV>CjJV*%QFg}pH_E>;9miZSa9rX9%Y=)ZCnZj?Jk6dn5@*>MXXBj21RLii zl59_M$&`do;sX1p3ln6*%;`)~*nk25UIxP{Dm|^v*j#(Yo9>02E$k_1ccx-HN zFxw#B*ecq2&<+#VF((kV-ixr?L>JN~LTEP8f>x6@3tOAD+GH;V1dQn1OgcI{nWE@C z7EJ6xguK4=LNb|3r@Kw`gMRb4A)p8Al7uAl0D9PWQ@|Chn<3o96uS>{uJD`Khlq(@ z+_GM3{jwKP6F&H@ADYh|AX()Id7I!D@Z@t3^Iu-CzPR`8>HYlDr+n_w_q)sa+~Vrn zMH4~zvweeZ7)Yyd^91AEm>f;jJC zEakP3tpqm^`GI%qCsCKpFM-x zctXoyOFZGoU~4?#%%CBjh4?_ZLOoYCtqoLS1ASh&>29hpNEc))ka3tSe%hfw#XyS# delta 1002 zcmZvaOK(y^6vzLU*PV+KG?l8g8X7CFmPaX8#X^fkv0AHEeBm1bkqWd0t2?`PXT2+T z#+@6J!p=lLfZxDR;!ZthY{G3qNaoD>pC4!D{O|nse)Mkr{PXPxfCM@Q9Ju1f60Yi) z(y{EuIIgjHotGQDtmwGuhJk{>EsnR{B;FCY%kds7MS=UAJmBP^z#~o`3q0ZcDYq;M z_ywM^UN+!!pdt_ysB-`30wIAKZ(r!B>sa0X@~)TBKHEHTzSES%OEff0o7?tbbKQP? zOJW91i7+N4CJ~W{BBtT+YUy<;-YB(d@xrTiy;WP-tT!svw!|Fr8jM`K*~zU{sxgTc z)+Ej%O=_sKSuR&Qos7f+Qe0Zsphw2aM3R=nENdGY+>x;+aiv<-OZo-=vlf=fAk7D~ z&8{Oa<}feeN8p1qWDg=>PCBFZ5CXlo&X~3|4h<)vXGfR-C=#L~A@ntDJdlbslZrGJ zaNsD&2Fmx5nF&l&m!$dEH9CBXG#6!nhbl8TttxSSG-$1yp}JI*nbC$gm4aGuVkPpwYh>%fTR^u7c11Qfg10pCED zo`qt`fn@)t{sFAOMdX>KJH3HUD^M_h8L36rcQ}gnE{+w7jxKzKqO*$=g&wpWLNsvO aAvM+z4$?0GFAd|N!Ln4b;Sv^Ay!;RL{Be5# diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DepartmentVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DepartmentVO.class index a342416017a38c84ad85dd323fa932d80820958a..1fd6cc33f322c8b14b032468c17ccf1958ea5616 100644 GIT binary patch delta 461 zcmZ{gze>YU6vn@MV^oqGIz_3dSW``{#zxyzO$Dn^928u|tw=T}Mb~t6G#qg71)L=> z;Ns|_;2^$&P#-|>q(dpvF8ADXzH@%(&%N{M+`Z7Zs7wmzH|>k-h-T%v@TeopNmoyP zyJ;*feP$gM1s?^44Qwh@QBw#}6YwY=E6|rv>HEa9i02^TK%f|*gcX$8EnZ;(s}a`V zvBw~m7Xeso2U2B*A0=_qQ4){B*noi&^}QZ>ioXNoEiTE uSE3))%4hQnoc3wseB3%m0y?pdrvGap8kv?pSsz-?An9opwJU<{NMXKJ8g!<+c VBuYQMXM1#oV~3+9++caD_zh^KIko@* diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptEntity.class index 652a3e21268b6f7c6c693d7898c311dfa83bf820..9d87ab002cb9092e917be722d71a4b0e5656675c 100644 GIT binary patch delta 2331 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 b027W+crE8IOv51GEz9UqKEiemu^{{(A$TXr delta 1409 zcmaJ=Sx-|z6#i~YxzpQ0p|LLT;6_vkt}*I^OSLYbf-4HRVyQcBb>AxDid59=E((YX zn&6TetB4wX^vySa04>%f#ur~qjOPq!YeIaPZ@zQBv&@;9HyLl!1MhydyaF&1O?D(< zvw*|?pT9lY$+vCDuRy9M?z?ls7`Phdae0k#|z2rxOsq(a~@lS+Xj z%#U))V**nIj0VLZ027Dt}?%tCXg>s%lqp(Zs@2B_0?Qj zsK64oI2Q683MJ~%V5Zu}x=L_Uq5yLw=3<`2d@Rt=%RDQ3`6Rs9puwKIt=#X~T;>}l z(TH0T%TP+zA^sg+ug~wFAh8C^*>zikp3~1uO0uoRO19n6VC3{GCtc|pHm~DYElXk* zN;&^s^Mh?rrWa)rQ{d6iBUafIyVSIomf=L?QL9kXlqo-6*803aNxbDnT#Y!Z)Xo zE>9udACQ_3x@JJaK`(R>7E>EVW{Ew+RZOB}Vn8?YlwgVSRM|5ICwi8WUn-SBw@nFY zUx4LGyVcP%K|308tqm(wQyRUbl}h`-(K8UwJFZLZe3Y`5Y78gj&TQFFARf`if_U)w zE`wM74PH-b4tBqQy*LcR>39m6{S@X6V@yK7-4fEcJNvcJJ1nE{BJ-z_l^-wJU1_uF z7XiIHwY=kzTa}H6-r?o3+u&18uck)mOVCHH{a+xd*xAQwO)LEFOb^5K$Z$$p;ScA;Ffu}zl`2YX_ From 5f23ebd502101eace9e74156a8f74c178eb5d83f Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Tue, 29 Sep 2020 17:29:40 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=90=8E=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CustomerServiceImpl.java | 125 ++++++++++-------- .../service/impl/CustomerServiceImpl.class | Bin 21159 -> 20486 bytes .../controller/UserLoginController.java | 2 +- .../src/main/resources/bootstrap.properties | 4 +- .../service/impl/EmployeeServiceImpl.java | 1 - .../resources/mapper/hrms/EmployeeDao.xml | 25 +++- .../hrms/controller/DeptController.class | Bin 4069 -> 4190 bytes .../classes/mapper/hrms/EmployeeDao.xml | 25 +++- .../com/daqing/framework/util/JwtUtils.java | 6 +- .../domain/crms/ext/CustomerCompanyDTO.java | 92 +++++++++++++ .../domain/crms/ext/CustomerCompanyVO.java | 19 +-- .../domain/crms/ext/CustomerPersonalDTO.java | 101 ++++++++++++++ .../domain/crms/ext/CustomerPersonalVO.java | 2 +- .../domain/crms/ext/CustomerCompanyVO.class | Bin 7786 -> 7491 bytes .../domain/hrms/response/HrmsCode.class | Bin 3521 -> 3872 bytes .../gateway/config/ApiGlobalFilter.java | 4 +- .../src/main/resources/application.yml | 14 +- .../src/main/resources/bootstrap.properties | 12 +- .../src/main/resources/jwt.properties | 5 +- .../target/classes/application.yml | 34 +++-- .../target/classes/bootstrap.properties | 12 +- .../target/classes/jwt.properties | 5 +- 22 files changed, 368 insertions(+), 120 deletions(-) create mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.java create mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalDTO.java diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java index 37bfb53a..5c6aabc6 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java @@ -63,12 +63,10 @@ public class CustomerServiceImpl extends ServiceImpl pages = this.pageCheckout(page, size); // 鏌ヨ鎵鏈夊鎴风殑鍩烘湰淇℃伅 IPage customerEntityIPage = customerDao.queryList(pages, customerRequest); - // 鑾峰彇鎵鏈夌殑瀹㈡埛鍩烘湰淇℃伅 List customers = customerEntityIPage.getRecords(); // 鑾峰彇鎵鏈夌殑瀹㈡埛缁忕悊id @@ -78,10 +76,8 @@ public class CustomerServiceImpl extends ServiceImpl employeeTO = (List) responseResult.getData(); - // 灏嗗鎴蜂俊鎭拰瀹㈡埛缁忕悊鍙婇儴闂ㄤ俊鎭嫾瑁呰捣鏉 List customerTOS = this.jointCustomerEmployee(customers, employeeTO); - // 灞炴ф嫹璐,灏嗘硾鍨嬩负CustomerEntity绫诲瀷鐨処Page鐨勫睘鎬ф嫹璐濈粰娉涘瀷涓篊ustomerTO绫诲瀷鐨処Page,鎵嶈兘璧嬪肩粰PageUtils IPage iPage = new Page<>(); BeanUtils.copyProperties(customerEntityIPage, iPage); @@ -101,6 +97,33 @@ public class CustomerServiceImpl extends ServiceImpl().SUCCESS(customerPersonalDTO); + } else { + CompanyCustomerEntity companyCustomerEntity = companyCustomerDao.queryCompanyCustomerById(id); + // 灏佽浼佷笟绫诲瀷瀹㈡埛淇℃伅 + CustomerCompanyDTO customerCompanyDTO = this.setCompany(customer, companyCustomerEntity); + return new ResponseResult().SUCCESS(customerCompanyDTO); + } + } + + /** + * 鏍规嵁id鏌ヨ瀹㈡埛鐨勪俊鎭(瀵煎叆鍒癳xcel涓) + */ + public ResponseResult getCustomerById(Long id) { + if (id == null){ return new ResponseResult(CommonCode.INVALID_PARAM); } @@ -203,6 +226,9 @@ public class CustomerServiceImpl extends ServiceImpl personalList = new ArrayList<>(); List longList = customerDao.listCustomerId(); for (Long id : longList) { - ResponseResult responseResult = this.queryCustomerById(id); + ResponseResult responseResult = this.getCustomerById(id); if ((responseResult.getData()).getClass() == CustomerCompanyVO.class){ companyList.add((CustomerCompanyVO) responseResult.getData()); }else { @@ -337,7 +366,7 @@ public class CustomerServiceImpl extends ServiceImpl jointCustomerEmployee(List customers, List employeeTO) { List customerTOS = new ArrayList<>();// 鐢ㄤ簬鎷艰瀹㈡埛淇℃伅鍜屽憳宸ュ強閮ㄩ棬淇℃伅鐨勯泦鍚 CustomerTO customerTO; - // 灏嗗鎴蜂俊鎭拰瀹㈡埛缁忕悊鍙婇儴闂ㄤ俊鎭嫾瑁呰捣鏉 for (CustomerEntity customer : customers) { // 姣忎竴涓鎴峰搴斾竴涓笉鍚岀殑瀵硅薄 customerTO = new CustomerTO(); for (EmployeeTO anEmployeeTO : employeeTO) { if (Objects.equals(customer.getManager(), anEmployeeTO.getId())) { - customerTO.setId(customer.getId()); - customerTO.setCode(customer.getCode()); - customerTO.setName(customer.getName()); - customerTO.setPhone(customer.getPhone()); - customerTO.setType(customer.getType()); + BeanUtils.copyProperties(customer,customerTO); customerTO.setManager(anEmployeeTO.getEmpName()); customerTO.setDepartments(anEmployeeTO.getDeptNames()); customerTOS.add(customerTO); } } if (!Objects.equals(customerTO.getId(), customer.getId())) { - customerTO.setId(customer.getId()); - customerTO.setCode(customer.getCode()); - customerTO.setName(customer.getName()); - customerTO.setPhone(customer.getPhone()); - customerTO.setType(customer.getType()); + BeanUtils.copyProperties(customer,customerTO); customerTOS.add(customerTO); } } return customerTOS; } + + /** * 灏佽涓汉绫诲瀷鐨勫鎴蜂俊鎭 * * @param customer 瀹㈡埛鍩烘湰淇℃伅 - * @param name 瀹㈡埛缁忕悊濮撳悕 * @param personal 涓汉绫诲瀷淇℃伅 * @return */ - private CustomerPersonalVO setPersonal(CustomerEntity customer, String name, PersonalCustomerEntity personal) { + private CustomerPersonalDTO setPersonal(CustomerEntity customer, PersonalCustomerEntity personal) { //BeanUtils鑳芥壒閲忓皝瑁呯浉鍚屽瓧娈靛悕绉板拰绫诲瀷鐨勫睘鎬х殑鍊 - CustomerPersonalVO customerPersonalVO = new CustomerPersonalVO(); - customerPersonalVO.setCode(customer.getCode()); - customerPersonalVO.setType(customer.getType()); - customerPersonalVO.setManager(name); - customerPersonalVO.setName(customer.getName()); - customerPersonalVO.setAddr(customer.getAddr()); - customerPersonalVO.setPhone(customer.getPhone()); - customerPersonalVO.setIdCard(personal.getIdCard()); - customerPersonalVO.setAge(personal.getAge()); - customerPersonalVO.setGender(personal.getGender()); - customerPersonalVO.setMaritalStatus(personal.getMaritalStatus()); - customerPersonalVO.setEducation(personal.getEducation()); - customerPersonalVO.setEmployer(personal.getEmployer()); - customerPersonalVO.setPosition(personal.getPosition()); - customerPersonalVO.setWorkingYears(personal.getWorkingYears()); - customerPersonalVO.setSocialSecurityNum(personal.getSocialSecurityNum()); - customerPersonalVO.setLivingSituation(personal.getLivingSituation()); - customerPersonalVO.setResidenceAddr(personal.getResidenceAddr()); - customerPersonalVO.setBusinessSource(personal.getBusinessSource()); - customerPersonalVO.setEmergencyLinkman(personal.getEmergencyLinkman()); - customerPersonalVO.setEmergencyLinkmanRelationship(personal.getEmergencyLinkmanRelationship()); - customerPersonalVO.setEmergencyLinkmanPhone(personal.getEmergencyLinkmanPhone()); - return customerPersonalVO; + CustomerPersonalDTO personalDTO = new CustomerPersonalDTO(); + BeanUtils.copyProperties(customer,personalDTO); + BeanUtils.copyProperties(personal,personalDTO); + return personalDTO; } /** * 灏佽浼佷笟绫诲瀷鐨勫鎴蜂俊鎭 * * @param customer 瀹㈡埛鍩烘湰淇℃伅 - * @param name 瀹㈡埛缁忕悊濮撳悕 * @param company 浼佷笟绫诲瀷淇℃伅 * @return */ + private CustomerCompanyDTO setCompany(CustomerEntity customer, CompanyCustomerEntity company) { + CustomerCompanyDTO companyDTO = new CustomerCompanyDTO(); + BeanUtils.copyProperties(customer,companyDTO); + BeanUtils.copyProperties(company,companyDTO); + return companyDTO; + } + + /** + * 灏佽浼佷笟绫诲瀷鐨勫鎴蜂俊鎭(excel) + */ private CustomerCompanyVO setCompany(CustomerEntity customer, String name, CompanyCustomerEntity company) { CustomerCompanyVO customerCompanyVO = new CustomerCompanyVO(); - customerCompanyVO.setCode(customer.getCode()); - customerCompanyVO.setType(customer.getType()); + BeanUtils.copyProperties(customer,customerCompanyVO); + BeanUtils.copyProperties(company,customerCompanyVO); customerCompanyVO.setManager(name); - customerCompanyVO.setName(customer.getName()); - customerCompanyVO.setAddr(customer.getAddr()); - customerCompanyVO.setPhone(customer.getPhone()); - customerCompanyVO.setRegisteredCapital(company.getRegisteredCapital()); - customerCompanyVO.setIndustry(company.getIndustry()); - customerCompanyVO.setYears(company.getYears()); - customerCompanyVO.setRegion(company.getRegion()); - customerCompanyVO.setShareholder(company.getShareholder()); - customerCompanyVO.setAffiliatedCompany(company.getAffiliatedCompany()); - customerCompanyVO.setEmployeeNumber(company.getEmpNum()); - customerCompanyVO.setLinkman(company.getLinkman()); - customerCompanyVO.setBusinessSource(company.getBusinessSource()); return customerCompanyVO; } + + /** + * 灏佽涓汉绫诲瀷鐨勫鎴蜂俊鎭(excel) + */ + private CustomerPersonalVO setPersonal(CustomerEntity customer, String name, PersonalCustomerEntity personal) { + //BeanUtils鑳芥壒閲忓皝瑁呯浉鍚屽瓧娈靛悕绉板拰绫诲瀷鐨勫睘鎬х殑鍊 + CustomerPersonalVO customerPersonalVO = new CustomerPersonalVO(); + BeanUtils.copyProperties(customer,customerPersonalVO); + BeanUtils.copyProperties(personal,customerPersonalVO); + customerPersonalVO.setManager(name); + return customerPersonalVO; + } } \ No newline at end of file diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class index 547b83fb55bde9265f7375132ac64247b0f8b34c..a68be8685f0ffb4e714e2d7b99195e93d3cf1e49 100644 GIT binary patch literal 20486 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 literal 21159 zcmc&+34B!5)j#LXByTc#KnRNlHxxv+FenI;C=x=DXc8z1OWbfs1~QP$gqaBvth-i= zRjFDn?pwvJZq94efOSw?%B`1 zck;rQ+a4#PslM4kdXqN<`4aw?d|WCYmj&q!zFa;w7U1LCg?t5HS;$xMcM53;UtLVZ z*B9~)d}A>&-zv~;2IooF+Y9-7d`FP>~O|2xQ^^A`dBQXY2WLlFij1|O9&luzi|U?_i( zTID-WNW^zOo|O@#c42b6P`*k9K!hqVR8WY=`rc55g3k=90cxN;4uYbnBKa5`q;piU zd<-$vQ28EasNn&%Pms=2`^s~PKqCybUyv^14FR=(fjU4PhzE6$p+*X}g9Yy)&=WPv zP@{viQRq4}NLL6o8`T&g=`d;jwX6YTZd7BXZJa>klcq*KV#$!pQqiW)bm7!#N0+?1L!flb$uC?iIx|om(Fdx^9%F#1 zs0B=z8;P!r)khL*qfHT}-terDo}qbJV}K|B=x8jOn#trFJ8m(PzcStoRD)`wu}ED< z+ww@FAq-xE@|t*4xOH(j5tV1V(VuFGg1JZcvVf#TT`1bt-s;NBCb=4IAfaGQM-&V|-<`M3;X z-Ju<+XlpXGAiOfNNFb0kFcC?%LwO<#Bgu|d&^9&q$To1SHRN;-p|@ug@B|}RX1p^J zX_ybOS!s;XeVsZPBhXob^?34GCJd=5Uzv$mReY$e7H&s59Kc1JZU zvlyMJqpsNPg^DqSKx?SVl~wsnpx-+z+Aj$f$GjWnYb@ctl4b9d?rDw%d!D0D86555 z>-^=bB2B6P4A~A_EIEHw2Is&spgt9DT3s7%*M3QdlO{toBNH@K1bHFst~Qcti8n6@ zi{w-A%}^)pb{uT8JFA3O&^vOnH(aI>YK={_~g5oApB))aWo%)od37B$aZhXB8zjyQ1j>d5^HVre&kt!Q%1&HWq zhfj}W>g1@gJ^bFdEawJN`9vlo+0oP#NkX^%E5gxMG(?*#5{Ymp)99=bUX!<%EB@|~ zUb<;^OQ(W*K&S&0)!EhIrR!>oHU7e`0yL4Nz8RG+DVL zyilfUIUIrEXTESL9THjB6ltwm*B(!#9KInVw;bfUkmPl(kyNN9m1+;o!-wQ_XmHY> za>*tO?dh%D&U83yJqB74!Yz=YNy9t_ScR$Eg~8xsz{#wb`aL((@jVn7q_~wtcKGiR zRBbLSw&M2*|2t$3uQfJ9tu#~%if(L1po(T1p!wV&@dBm~z0uD|jWhT@b!<*uJUy~J z)Q03V+8$1%LbVPwH`*F07x}xnr}*C9yZJB2BB~9jFmf-UK2?{bKuCkFGl{ed^~P3mO<&pgo*SHGmR`yeScZB3Taw$rKdB zf{jS5*@6zsMWh{5bYyh{V17*3fCwlOm)!8H%a=K55&J}02+Uz9!cdQ$RNAfR;Y&6n zw(W1dOi6gJmufH~2-)>`S=S1vvBn&Q|q(8|1Sfv%s{ z{TC+oMnsQ(4qFwE##~?PBnhxDo22fd(Zgr49@MltdFk!|euiTX2B|yu()Llfh$h*& zQr`%AI8Y$Kz8ceu*|hhb9%(#Iv~km;tkw07qKDn;A}pIjz2nHW9LanNlaZ9;&6&1* zg;?Gr$^7ccOWz~CnY2T;_Ub{b!wzvwkNkI*Vb7N(+&z?6-fYjiitf0K(9{}kTizTV z?d~3po(vZ>wt8HTbQvyaoxJ2~rk6F_`fwN-n^vC9s!XlveLu2q@no@LW_iYtOzaLt z&KR30vC{f@N1`brA)jgAtoO3RHc50&lBZmOHHlg{5>H{@B-D*EZ*91>1K8Z{BKws| zf1r<0SDR|JYBg1xikT{o4-WHkljGcO(%bZoq452QT7%NtR0)+dRZ4Xrbj*&&Q%NMx z?N%wC9F(ut7OB$*<-y7Qf)NURi^rmF!yS8jj6uN!;1Ew5>+O@iQB)oQ5gOm(BW$xt_&>K1jYN$=AxL)~Vo+tv3>{yLv&syozXlRlsi z4Rxof?oxM~d={ULRJ5DDx{Q=qW6~Gu9z)%0s_(1&OdhB1H`N0&)r0CGQ~f}oht(rY z`(%5%*&Wf==19U&X;W=cTTRuawlR@>Z#UJWGVn3=c!o?RK`_-5YKN(wl#i#>)28~N z@Z=e_(^Su@=S=mydcjmL%8Qre@kjFbvMAjv>QyA#ruwn^iK$-e))sf`01W5hNaIZP zQ}r{ZX}xi{M?k2w>MBXAr|;FkZa>Vl-~0F7y6fUCA3k!yu5BCNd*YT|=idL`)^k4G zeDR03V9UyUZ|mLfZQJ(2gWKP~@e)J*+*H3%zm(=j&wX#}wNCS|O!aH^8&mz3K5_)6 zSLl{dhI-vpZ>Tp7^_HpLR^QG!EhgM`=PkQ#c*0cgs5edZu6(?w-Z#}Q^+6xnmm_8~ zP3{*{JS9PY_~`J?adJ+{-nVf`3~>x(@q95XsN087BA&ui`y+c>-kCF-d=$?x)$fG4 zO{V(2y2s=uUTLa7sK-TbKQh%H)t^lDXSD<2s@s^H+*pj}FH9r!o1BR;MB0h}N^5IN zo0~_@n^%@hmbJBszrX|^t4~bzSM@iha^ZGPkEhQHn&PqMs6Ge_>0lZ9njE++fh%s8 z`Ynj_i)Hb|G8~r~>hGrd2Yqg;f2x1kQtTIA8=1*#)TgHUO#NGE{JcM!;|=eUXzrab z8z9Ut#2I`k65S29_y~}X1yYcJ&u57mkAAoXU!E`D#AX}11f)xWKtX{D5z>67j2Ix$ zK!FAcR3y+~frz z6npc;J=Dic6MMIg%#$=ED&4bNbuiNyY3h5=E5pdEky(Xtt_+RNm3Z~Cqme;^RUcxT zXeCm1Ph~%BthZoy%3*{D^uuY0Q}hqb=;qe-LG-F}wgbj_S(_=MtV4FDJFH?Mr%&is zhdpFhnF;RR2+=;Z%{guE<4{@Q!U*2U$zid>1#g9%k7P6wZbLlGcx$zWz$&~f5BjG2 zj)DSscLnT{-OGQw2?vIIUrc%N*hd<9@XW2)wLd6>vK1XMYu9^3>*~XrVM)MAbk0>)%6Wkb(K}%SbtUz;kLD>>YY@*%2HrLWFp*^IwmHa;p<8c92JtEfp5Ull^l`1shPcGtJCNh&M3m3=0<=Dsh=5 z6^^AwJ4>?=m|2h2u~;Ng*&0qJMJER@s9IP*zpkQYS>>YohWWKs3z=r+7F@sQ#M-P7 zul<&#=$I-WH*~^c82z*ZoNr`EA=5ud=*lh_^rf;AodajTvKV~ASJ9MgRIbJt^@}Pi ztLp2S=6Uhjmc0iZ?5WC`*NJ*@i8@;MxGaWUA-!T4lK1MFwcz8ug!S7rGBLU9#T7E_ zuvz(&7OnRFBH3`#I^{Vu!w0*J(AKF(X!nJx$0n=0O-{3lp#F0rIAn~tCglq^<5s{h z?!0 zvPhIuF;KIAX5d670fV=p;l#o>k+b+aA2E*T5a8VGCcxlLv0gB^phG&0~3XXz2EB zLW4g4&o&+0CG5xC*`qu(Sf}op`iT;zA4s#z!-I2R<_WobmYz)pq+<8Xo_}B~cFr7* z2}=S|w>lV}kx4mK1N6jb2`B5|yS09Sz5bYf2!PAlI}2mI37T%ixbZmyf>@GVal@H@ zNcM(W7oh=CI6VPUbiV_GV;J;T^MdKT9^T;pVF~%T z?i@|R%jDiy_L`z|K_XPCgS>VRPOx59wRFM!g$?+suWs1m71my{fuFj9cJ>e4L`?*s zZ)s?S(oiLip`ocw`s;u!A{we{7t~ZVR5`>1>gG2rt6Nl4gDXXFS2ogy zvsG92N1>dGrdwYTRm3=*iowdRropgss!(6SS@Lo>sT=05zq-~dgg`WwT5O%LnCS1R z)`xpTgHzLsvn&+Xs8fBf5%CO zSLdxb(NpQO@-0^pyy}ykY$DMWG0&;0scNXgwU5Y}?xIu&1Up=NW^)2~&n6}mk|LNr zZv=SuI_*8la!E=IeWW!X_Yj6>MrVi1F#oZ~A1^G+0~5tZ3+t@HMc8U7hB)5^E%6wH z5J001YPRcST<@#2wOgHKD@Mvsd4f+Jhyi%S)=XO@CQjCgi`~lTNUWl{8T&?p)`ALv zsk*r`oB&w`Xm#Lxv{%S&@qFnjfb={LS%~cGN>2xt)TtJi_fz3k=v%4-(-+}&R+CU% z)!fmfuV-T~2|YZIqJ*}c0K1%pd!F!aK|HB@drnVS;do;?raV0I<9EmkWEN05O zvzi8@*X)iYe)Et_TF0rVP|z*AZ3y~R;m0W}fek-ch^=l5#~?@a?Adxyj=l>cxZ{Ou zZON7>_GS*sF)p*mzBzE%I=63*!S*ZR<-*8Hcr~2uLTlPZ>J~3^G+VBv8TncQJ5D0i z>X`E+>TZin)ZGR}#{^LvYZo1J;DKnbZwV(NEpa*Nvot=VK`5(Ou_D?U#mQcCrIjXG zl;voad7xoh5kwlUkGAh5iLtpt5YKBr7``&oSMHl>@;Q7iwyL^o|7dJ&e03yLqc0BN z7&>hK^atyf1jK$ae6wItHSzfB4oK-GuTQoSU??t=&qMm(8cB|}dfJ(gCx!R6WDJzL z`>VaQrtE#JHz%~GMTlsHr9{dNUj@^lJs6T}JxmAo-j5EZH|R}bdW-y|2q*u5-^Fhi z^YQ&2zLlIb_h`d0bB{Kh>}R#%hn{lT0H1#ZrVzeyR!n*0w-7(5QU3{_G7-^X^k;mU zRtNeEeT*ljPw1~80E78$%EMctyT_NNN#UOl|NNy}fNjFWEtFs8AOA2JCH~Sb3izlj zuOzRF3UFqUUy|R2pEJ@nDkSQ{K{cQO0u5BOg9eouCB{ywD={A5MDu{5sKn@^!HUWP zC4n>*@1P-N1>;NdOA5Bo(6Zom8rHalhL;tV@`O z-Hf-wmGxM83mrv&qrX!CJtxsW=$}-8{-fz%fPxscAAL%n$r|Zyn|lKNn?BbZy_>!O zr1aY_X*c;m2hNZgSsti4pB2XDfu{BB1HOFFb0YgWj||Son3-tNv$EmL$^mCqF2Jl7 zwxENJ3mt51Qa*#_W}93D45N?X+LxL$v=EI^Y43`-Cn!P*Lqf_sv1_W-E=Xo0z79chcb^S^>N0 z5D3>_;)if|(uj;^E$>lj8ZCnkeTc@S>9DOdb`u?jZsRb;co{l=Vrhwg3r#4?6B@SA z#3dzpTd7pYn1ntdPoK%zeL%gX5p$sn1ey9Nilw*G2x_APDMsU{ol0p9O$EOzDG43v zpykwwr}cCeC4erbfjolugCuT6 z+x~n2+U`Z$fqW3!z(-e4w(&@Yd_cv`dc07Lx%4+p6D2rw4+94yAt>!4C7X`Zm1%D~R@t#tHII%f5trpwZF zZ1Jo#RitTlnkw;r4&GO#X>K=ooMv|y%>%C|PDoRAnvNGG2mek`G|dmbn#24M4S4JK z-HUmA+LIkf2H?BE!@Fq$-9yu$Q5E!k__Ov{@!es4<~t`WTq zV|j&!)2nbwKc?~Y6VH-nxPqPG3U-Dq*x{~V$M+QM^u7gqv@6*DEyiV)!V)3clX(=9-rRlUZg*Q{M_91H8O3e>yOT7}laXCDfWG}O+ z2%mof?SBUJ7kI6Ykx0zBWL>!E+rPe4K*=zSi}@W&v{@&j*7M-+hnZ8=;I>ASo+&h*n}5a6($m5V>1w@u1ZVA-hEsy{L<#Om=4N zhocp3FDNPKBCYKg2n21HRC^WFbG2kptpM7}0^2DDAdZYaC>g*$_{z7w0`g^BPGL!* zjccMn+H%^W94{X)Q=P9R}%= zWc=Te1S4N3B>C@!ZFYjQ2*lWk+rYbab6 zPzOT%LX-=Q6i3(}g$T2nPT_h`osV^_;09g<4L`yi@h(P`=@B2fBfi9l#aN#K=V6b) zTIXsVS6J~3t@l2xdn_*z$HAupr|md+g`@Yp0#rA89EZliC&B_W4nQ^zKFM|*uaOzt zO-E2rdxVo+&w+)aJc9Swjm*%@dWpo?fRqeA6s*P$u-4S?;?-odxH*G9?COP{3*WbnrzRa~Ec6CEhuMF56rpx`Dl zHDKOML&s0pLT4a=`AhQB^!3eDP~v9*7(E!6jMANU%bBtRU}cq-n`A&X1m&L#4k|~1^IXjfuoAi{iN=- zVu3+L`i9gXO2^L;!bXll9amw6t7$N|;%`m0(HM@ojvM&hbxh_K zy$*57QH)VAqS3q>qkJ?5M&5>Ten)~Wnq2&7123iCnuf_lY8%FHr;Fg5E-wD&L$o1H zm+YW#rRmbGbXncRom2?=*ZXg!f}$W=YC-aPX=%Tf203u+W*X?i{?pK{%nunB%9=4U z0PlWTjXX#xz5aH}FY(vN_J}lHD9A3{LYGS((_M^>hYuj`gq^R);?JOod?x(!S#%no zO%Xnq*6?|h;tTM{o-TAnjg`2J+2C$xY_PX8M&R#GtpT%q)BvSP0P@pCh+Hsm)K0<& zDP66WAX*TqXeb$<(->?(?}~u-h*9nC7}uUEsDijH4>6QIHuiB z-iB&FGgsT?=4z|T^0(7Q@c-LoPLM;=W(TG<0_nhX1-6+Gcn+56bfpeV3t=~CK|OYr z1$`$?S6k3EY5J}OZA#O%7IbKut^-H%io2k-b5?;TFCP{I)ksL3;71RoNuH}d=uTq zH`Bd*D`L-W^aS5d&-3@_HNJyh=gss1-$@_yUGy2>LtpT{S_kIAGuF~FUdyK=M;Svu z)e$5gdxTinS`J4q6c0h580Z_xk*dTWUv_H&zlgv@W(!1vO0hXx?~&DzP_nWnom zaCe&S(ZIcF`o0G4OVj-tcpyy=YT%(X{Xhc`r|A(5q|>xT16$M7rGaf}+OB~|)AX1I z9#7K~8rYGhCpGX?nx59c57YEaiND*)S-K!wuG^@Xu`|Yx(!u-~GSw?H}C(CA)IQ*T+HA*1m0(wkuep!xkfR7IW^GD;~G;~t(!zf!INcFWqHrk15 zw?K9}0(n*ouPIZdx<;MFw!SOY&v(`y>|X_|hffuE=8 z7aI6wntr8$U#ICe8u)FRUiY$A?-lZIz}nw}wXcJAk`pEG#3!U+_Bz z9@{E?+7|{)eU%2j8~80um4>?tHgJ-?^xe4_(PD_pdF #{id} @@ -44,7 +47,12 @@ @@ -55,15 +63,22 @@ ON e.id = ed.employee_id LEFT JOIN hrms_dept d ON ed.dept_id = d.id - WHERE d.id = #{id} + LEFT JOIN hrms_user u + ON e.user_id = u.id + WHERE u.del_or_not = 0 + AND d.id = #{id} + - SELECT name FROM hrms_employee WHERE id = #{id} + SELECT e.name name + FROM hrms_employee e + LEFT JOIN hrms_user u + ON e.user_id = u.id + WHERE u.del_or_not = 0 + AND e.id = #{id} @@ -55,15 +63,22 @@ ON e.id = ed.employee_id LEFT JOIN hrms_dept d ON ed.dept_id = d.id - WHERE d.id = #{id} + LEFT JOIN hrms_user u + ON e.user_id = u.id + WHERE u.del_or_not = 0 + AND d.id = #{id} + + SELECT * FROM hrms_login_log + + + \ No newline at end of file diff --git a/dq-financial-hrms-auth/src/main/resources/mapper/hrmsauth/SystemLogMapper.xml b/dq-financial-hrms-auth/src/main/resources/mapper/hrmsauth/SystemLogMapper.xml new file mode 100644 index 00000000..04ed9930 --- /dev/null +++ b/dq-financial-hrms-auth/src/main/resources/mapper/hrmsauth/SystemLogMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/config/CorsConfig.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/config/CorsConfig.java index 25645947..552094b0 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/config/CorsConfig.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/config/CorsConfig.java @@ -1,33 +1,33 @@ -package com.daqing.financial.hrms.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.cors.CorsConfiguration; -import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import org.springframework.web.filter.CorsFilter; - -/** - * 瀹炵幇鍩烘湰鐨勮法鍩熻姹 - * - * @auther River - * @date 2020/9/25 15:09 - */ -@Configuration -public class CorsConfig { - - @Bean - public CorsFilter corsFilter() { - final UrlBasedCorsConfigurationSource urlBasedCorsConfigurationSource = new UrlBasedCorsConfigurationSource(); - final CorsConfiguration corsConfiguration = new CorsConfiguration(); - /*鏄惁鍏佽璇锋眰甯︽湁楠岃瘉淇℃伅*/ - corsConfiguration.setAllowCredentials(true); - /*鍏佽璁块棶鐨勫鎴风鍩熷悕*/ - corsConfiguration.addAllowedOrigin("*"); - /*鍏佽鏈嶅姟绔闂殑瀹㈡埛绔姹傚ご*/ - corsConfiguration.addAllowedHeader("*"); - /*鍏佽璁块棶鐨勬柟娉曞悕,GET POST绛*/ - corsConfiguration.addAllowedMethod("*"); - urlBasedCorsConfigurationSource.registerCorsConfiguration("/**", corsConfiguration); - return new CorsFilter(urlBasedCorsConfigurationSource); - } -} +//package com.daqing.financial.hrms.config; +// +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +//import org.springframework.web.cors.CorsConfiguration; +//import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +//import org.springframework.web.filter.CorsFilter; +// +///** +// * 瀹炵幇鍩烘湰鐨勮法鍩熻姹 +// * +// * @auther River +// * @date 2020/9/25 15:09 +// */ +//@Configuration +//public class CorsConfig { +// +// @Bean +// public CorsFilter corsFilter() { +// final UrlBasedCorsConfigurationSource urlBasedCorsConfigurationSource = new UrlBasedCorsConfigurationSource(); +// final CorsConfiguration corsConfiguration = new CorsConfiguration(); +// /*鏄惁鍏佽璇锋眰甯︽湁楠岃瘉淇℃伅*/ +// corsConfiguration.setAllowCredentials(true); +// /*鍏佽璁块棶鐨勫鎴风鍩熷悕*/ +// corsConfiguration.addAllowedOrigin("*"); +// /*鍏佽鏈嶅姟绔闂殑瀹㈡埛绔姹傚ご*/ +// corsConfiguration.addAllowedHeader("*"); +// /*鍏佽璁块棶鐨勬柟娉曞悕,GET POST绛*/ +// corsConfiguration.addAllowedMethod("*"); +// urlBasedCorsConfigurationSource.registerCorsConfiguration("/**", corsConfiguration); +// return new CorsFilter(urlBasedCorsConfigurationSource); +// } +//} diff --git a/dq-govern-gateway/src/main/java/com/daqing/financial/gateway/config/ApiGlobalFilter.java b/dq-govern-gateway/src/main/java/com/daqing/financial/gateway/config/ApiGlobalFilter.java index 6a488534..2ac4eb5f 100644 --- a/dq-govern-gateway/src/main/java/com/daqing/financial/gateway/config/ApiGlobalFilter.java +++ b/dq-govern-gateway/src/main/java/com/daqing/financial/gateway/config/ApiGlobalFilter.java @@ -14,6 +14,9 @@ import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.reactive.CorsWebFilter; +import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource; import org.springframework.web.server.ServerWebExchange; import reactor.core.publisher.Mono; diff --git a/dq-govern-gateway/src/main/java/com/daqing/financial/gateway/config/FinancialCorsConfiguration.java b/dq-govern-gateway/src/main/java/com/daqing/financial/gateway/config/FinancialCorsConfiguration.java index 70d59b30..9995fd9f 100644 --- a/dq-govern-gateway/src/main/java/com/daqing/financial/gateway/config/FinancialCorsConfiguration.java +++ b/dq-govern-gateway/src/main/java/com/daqing/financial/gateway/config/FinancialCorsConfiguration.java @@ -1,5 +1,9 @@ package com.daqing.financial.gateway.config; +import org.springframework.cloud.client.discovery.DiscoveryClient; +import org.springframework.cloud.gateway.discovery.DiscoveryClientRouteDefinitionLocator; +import org.springframework.cloud.gateway.discovery.DiscoveryLocatorProperties; +import org.springframework.cloud.gateway.route.RouteDefinitionLocator; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.cors.CorsConfiguration; @@ -24,4 +28,9 @@ public class FinancialCorsConfiguration { source.registerCorsConfiguration("/**",corsConfiguration); return new CorsWebFilter(source); } + @Bean + public RouteDefinitionLocator discoveryClientRouteDefinitionLocator(DiscoveryClient discoveryClient, + DiscoveryLocatorProperties properties) { + return new DiscoveryClientRouteDefinitionLocator(discoveryClient, properties); + } } diff --git a/dq-govern-gateway/src/main/resources/jwt.properties b/dq-govern-gateway/src/main/resources/jwt.properties index 72852b09..6bef2a95 100644 --- a/dq-govern-gateway/src/main/resources/jwt.properties +++ b/dq-govern-gateway/src/main/resources/jwt.properties @@ -1,4 +1,7 @@ jwt.ignoreUrlList=/apiHrmsAuth/hrms/auth/userlogin/getBackPwd,\ /apiHrmsAuth/hrms/auth/userlogin/login,\ /apiHrmsAuth/hrms/auth/userlogin/verifyMobile,\ - /api-crms/sweagger-ui.html \ No newline at end of file + /api-crms/sweagger-ui.html,\ + /api-crms/crms/customer/excelTemplate,\ + /api-crms/crms/customer/excelExport,\ + /api-crms/crms/customer/excelImport \ No newline at end of file From b9537077efdc8fab29d016b0ac2b9166ff15be55 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Fri, 9 Oct 2020 14:19:48 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=94=B9=E4=B8=BAredis=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../financial/hrauth/aspect/Operation.java | 9 +++++++-- .../financial/hrauth/aspect/SysLogAspect.java | 10 ++++++++-- .../service/impl/UserLoginServiceImpl.java | 7 +++++++ .../src/main/resources/bootstrap.properties | 18 +++++++++--------- .../com/daqing/framework/util/JwtUtils.java | 9 +++++++++ 5 files changed, 40 insertions(+), 13 deletions(-) diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/aspect/Operation.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/aspect/Operation.java index 3ffb2533..f60bf3f5 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/aspect/Operation.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/aspect/Operation.java @@ -1,5 +1,6 @@ package com.daqing.financial.hrauth.aspect; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.daqing.financial.hrauth.annotation.Log; @@ -10,6 +11,7 @@ import com.daqing.financial.hrauth.util.IpUtils; import com.daqing.framework.domain.hrms.SystemLog; import com.daqing.framework.domain.hrms.Token; import com.daqing.framework.domain.hrms.UserEntity; +import com.daqing.framework.util.RedisUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.aspectj.lang.JoinPoint; @@ -100,8 +102,11 @@ public class Operation { //User systemUser = (User) SecurityUtils.getSubject().getPrincipal(); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String token = request.getHeader("token"); - Token userToken = tokenService.getOne(new QueryWrapper().eq("token", token)); - UserEntity systemUser = userLoginService.getOne(new QueryWrapper().eq("id",userToken.getUserId())); + String userId = RedisUtil.get("dq:token:"+token); + String userEntityStr = RedisUtil.get("dq:userId:"+userId); + UserEntity systemUser = JSON.parseObject(userEntityStr,UserEntity.class); + //Token userToken = tokenService.getOne(new QueryWrapper().eq("token", token)); + //UserEntity systemUser = userLoginService.getOne(new QueryWrapper().eq("id",userToken.getUserId())); Map map = new HashMap<>(4); for (int i = 0; i < argNames.length; i++) { diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/aspect/SysLogAspect.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/aspect/SysLogAspect.java index 5944c7d4..4b55e76d 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/aspect/SysLogAspect.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/aspect/SysLogAspect.java @@ -1,5 +1,6 @@ package com.daqing.financial.hrauth.aspect; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.daqing.financial.hrauth.annotation.Log; @@ -7,6 +8,7 @@ import com.daqing.financial.hrauth.service.TokenService; import com.daqing.financial.hrauth.service.UserLoginService; import com.daqing.framework.domain.hrms.Token; import com.daqing.framework.domain.hrms.UserEntity; +import com.daqing.framework.util.RedisUtil; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; @@ -63,8 +65,12 @@ public class SysLogAspect { //User systemUser = (User) SecurityUtils.getSubject().getPrincipal(); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String token = request.getHeader("token"); - Token userToken = tokenService.getOne(new QueryWrapper().eq("token", token)); - UserEntity systemUser = userLoginService.getOne(new QueryWrapper().eq("id",userToken.getUserId())); + String userId = RedisUtil.get("dq:token:"+token); + String userEntityStr = RedisUtil.get("dq:userId:"+userId); + UserEntity systemUser = JSON.parseObject(userEntityStr,UserEntity.class); + + //Token userToken = tokenService.getOne(new QueryWrapper().eq("token", token)); + //UserEntity systemUser = userLoginService.getOne(new QueryWrapper().eq("id",userId)); operation.addOperationLog(joinPoint,res,time,systemUser); //鏂规硶鎵ц瀹屾垚鍚庡鍔犳棩蹇 // addOperationLog(joinPoint, res, time); diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java index e6566726..bff1c7fc 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java @@ -18,6 +18,7 @@ import com.daqing.framework.model.response.CommonCode; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.util.JwtUtils; import com.daqing.framework.util.Md5Util; +import com.daqing.framework.util.RedisUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -120,6 +121,10 @@ public class UserLoginServiceImpl extends ServiceImpl public ResponseResult login(LoginRequest loginRequest) { //鍒ゆ柇鐢ㄦ埛鐧诲綍鏂瑰紡 UserEntity userEntity = baseMapper.login(loginRequest); + if(userEntity != null){ + //鍒犻櫎redis閲岄潰鐨剈serEntity + JwtUtils.removeUserEntityByUserId(userEntity.getId()); + } if(loginRequest.getType() == 1){//鎵嬫満鍙风爜鐧诲綍 if(userEntity == null){ @@ -156,6 +161,8 @@ public class UserLoginServiceImpl extends ServiceImpl } //璁剧疆鏈鏂扮殑token鍒皉edis JwtUtils.putTokenToRedis(userEntity.getId(), token, times); + //璁剧疆userEntity鍒皉edis + JwtUtils.putUserEntityToRedis(userEntity.getId(),userEntity,times); //鏂板鐧诲綍鏃ュ織 LoginLog loginLog = loginLogService.getOne(new QueryWrapper().eq("user_id", userEntity.getId())); diff --git a/dq-financial-hrms/src/main/resources/bootstrap.properties b/dq-financial-hrms/src/main/resources/bootstrap.properties index b5a7eb56..c22d4f26 100644 --- a/dq-financial-hrms/src/main/resources/bootstrap.properties +++ b/dq-financial-hrms/src/main/resources/bootstrap.properties @@ -17,12 +17,12 @@ spring.cloud.nacos.config.ext-config[2].data-id=other.yml spring.cloud.nacos.config.ext-config[2].group=dev spring.cloud.nacos.config.ext-config[2].refresh=true -#spring.redis.host=127.0.0.1 -#spring.redis.port=6379 -#spring.redis.password=123456 -#spring.redis.database=0 -#spring.redis.timeout=30000 -#spring.redis.jedis.pool.max-active=8 -#spring.redis.jedis.pool.max-wait=-1 -#spring.redis.jedis.pool.max-idle=8 -#spring.redis.jedis.pool.min-idle=0 \ No newline at end of file +spring.redis.host=127.0.0.1 +spring.redis.port=6379 +spring.redis.password=123456 +spring.redis.database=0 +spring.redis.timeout=30000 +spring.redis.jedis.pool.max-active=8 +spring.redis.jedis.pool.max-wait=-1 +spring.redis.jedis.pool.max-idle=8 +spring.redis.jedis.pool.min-idle=0 \ No newline at end of file diff --git a/dq-framework-common/src/main/java/com/daqing/framework/util/JwtUtils.java b/dq-framework-common/src/main/java/com/daqing/framework/util/JwtUtils.java index 1af3149f..54d228de 100644 --- a/dq-framework-common/src/main/java/com/daqing/framework/util/JwtUtils.java +++ b/dq-framework-common/src/main/java/com/daqing/framework/util/JwtUtils.java @@ -1,6 +1,7 @@ package com.daqing.framework.util; +import com.alibaba.fastjson.JSONObject; import io.jsonwebtoken.Claims; import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.JwtBuilder; @@ -91,6 +92,14 @@ public class JwtUtils { RedisUtil.setEx("dq:token:"+token, String.valueOf(userId), times); } + public static void putUserEntityToRedis(Long userId, UserEntity userEntity, long times) { + RedisUtil.setEx("dq:userId:"+userId, JSONObject.toJSONString(userEntity), times); + } + + public static void removeUserEntityByUserId(Long userId) { + RedisUtil.del("dq:userId:"+userId); + } + public static void removeTokenByToken(String token) { RedisUtil.del("dq:token:"+token); } From 1f26d2950d241dc46a89c7d717754fbe4da4e5c4 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Fri, 9 Oct 2020 15:34:52 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E8=B6=85=E7=AE=A1=E5=91=98=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrauth/UserLoginControllerApi.java | 3 ++ .../controller/UserLoginController.java | 8 +++ .../hrauth/service/UserLoginService.java | 3 ++ .../service/impl/UserLoginServiceImpl.java | 52 +++++++++++++------ .../mapper/hrmsauth/UserLoginMapper.xml | 2 +- .../domain/hrms/request/UpdatePwdRequest.java | 40 ++++++++++++++ .../domain/hrms/request/UserLoginRequest.java | 5 ++ .../domain/hrms/response/HrmsCode.java | 2 + 8 files changed, 99 insertions(+), 16 deletions(-) create mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/request/UpdatePwdRequest.java diff --git a/dq-financial-api/src/main/java/com/daqing/financial/hrauth/UserLoginControllerApi.java b/dq-financial-api/src/main/java/com/daqing/financial/hrauth/UserLoginControllerApi.java index 5a32c03c..570e1f8a 100644 --- a/dq-financial-api/src/main/java/com/daqing/financial/hrauth/UserLoginControllerApi.java +++ b/dq-financial-api/src/main/java/com/daqing/financial/hrauth/UserLoginControllerApi.java @@ -1,6 +1,7 @@ package com.daqing.financial.hrauth; import com.daqing.framework.domain.hrms.request.LoginRequest; +import com.daqing.framework.domain.hrms.request.UpdatePwdRequest; import com.daqing.framework.domain.hrms.request.UserLoginRequest; import com.daqing.framework.model.response.ResponseResult; import io.swagger.annotations.Api; @@ -26,5 +27,7 @@ public interface UserLoginControllerApi { @ApiOperation(value = "鐧诲綍") ResponseResult login(LoginRequest loginRequest); + @ApiOperation(value = "淇敼瓒呯鍛樺瘑鐮") + ResponseResult updatePwd(UpdatePwdRequest user); } diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java index 0ca25e14..2c258c50 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java @@ -3,6 +3,7 @@ package com.daqing.financial.hrauth.controller; import com.daqing.financial.hrauth.UserLoginControllerApi; import com.daqing.financial.hrauth.service.UserLoginService; import com.daqing.framework.domain.hrms.request.LoginRequest; +import com.daqing.framework.domain.hrms.request.UpdatePwdRequest; import com.daqing.framework.domain.hrms.request.UserLoginRequest; import com.daqing.framework.model.response.ResponseResult; import io.swagger.annotations.Api; @@ -68,4 +69,11 @@ public class UserLoginController implements UserLoginControllerApi { loginRequest.setPhone(phone);*/ return userLoginService.login(loginRequest); } + + @PostMapping("/updatePwd") + @ApiOperation(value = "淇敼骞冲彴瓒呯鍛樺瘑鐮") + public ResponseResult updatePwd(@RequestBody @Valid UpdatePwdRequest user){ + boolean result = userLoginService.updatePwd(user); + return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); + } } diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/UserLoginService.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/UserLoginService.java index 47481c74..23e2d2b4 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/UserLoginService.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/UserLoginService.java @@ -3,6 +3,7 @@ package com.daqing.financial.hrauth.service; import com.baomidou.mybatisplus.extension.service.IService; import com.daqing.framework.domain.hrms.UserEntity; import com.daqing.framework.domain.hrms.request.LoginRequest; +import com.daqing.framework.domain.hrms.request.UpdatePwdRequest; import com.daqing.framework.domain.hrms.request.UserLoginRequest; import com.daqing.framework.model.response.ResponseResult; @@ -16,4 +17,6 @@ public interface UserLoginService extends IService { //鐧诲綍 ResponseResult login(LoginRequest loginRequest); + + Boolean updatePwd(UpdatePwdRequest user); } diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java index bff1c7fc..2f52e38f 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java @@ -10,6 +10,7 @@ import com.daqing.framework.domain.hrms.LoginLog; import com.daqing.framework.domain.hrms.Token; import com.daqing.framework.domain.hrms.UserEntity; import com.daqing.framework.domain.hrms.request.LoginRequest; +import com.daqing.framework.domain.hrms.request.UpdatePwdRequest; import com.daqing.framework.domain.hrms.request.UserLoginRequest; import com.daqing.framework.domain.hrms.response.HrmsCode; import com.daqing.framework.domain.hrms.response.LoginResponse; @@ -62,14 +63,6 @@ public class UserLoginServiceImpl extends ServiceImpl */ @Override public UserLoginRequest verifyMobile(UserLoginRequest user){ - //鍒ゆ柇閲嶇疆瀵嗙爜鍙傛暟鏄惁涓虹┖ - if(StringUtils.isEmpty(user.getPhoneAccount())){ - ExceptionCast.cast(HrmsCode.PHNOE_ACCOUNT_NOT_EMPTY); - } - if(StringUtils.isEmpty(user.getVerifyCode())){ - ExceptionCast.cast(HrmsCode.VERIFY_CODE_ILLEGAL); - } - //鏍￠獙鎵嬫満璐﹀彿鏄惁瀛樺湪 /* int count = this.count(new QueryWrapper() .eq("phone_account", user.getPhoneAccount()));*/ @@ -92,13 +85,6 @@ public class UserLoginServiceImpl extends ServiceImpl */ @Override public Boolean getBackPwd(UserLoginRequest user){ - //鍒ゆ柇閲嶇疆瀵嗙爜鍙傛暟鏄惁涓虹┖ - if(StringUtils.isEmpty(user.getNewPwd())){ - ExceptionCast.cast(HrmsCode.NEW_PASSWORD_NOT_EMPTY); - } - if(StringUtils.isEmpty(user.getConfirmPwd())){ - ExceptionCast.cast(HrmsCode.CONFIRM_PWD_NOT_EMPTY); - } if(!user.getConfirmPwd().equals(user.getNewPwd())){ ExceptionCast.cast(HrmsCode.TWICE_PWD_DIFFERENT); } @@ -186,4 +172,40 @@ public class UserLoginServiceImpl extends ServiceImpl return ResponseResult.SUCCESS(loginResponse); } + + /** + * 淇敼骞冲彴瓒呯鍛樺瘑鐮 + */ + @Override + public Boolean updatePwd(UpdatePwdRequest user){ + if(!user.getConfirmPwd().equals(user.getNewPwd())){ + ExceptionCast.cast(HrmsCode.TWICE_PWD_DIFFERENT); + } + + //鏍规嵁鎵嬫満鍙锋煡璇㈢浉鍏充俊鎭 + UserEntity userEntity = baseMapper.selectByPhoneAccount(user.getPhoneAccount()); + if(userEntity == null){ + ExceptionCast.cast(HrmsCode.PHNOE_ACCOUNT_NOT_EXIST); + } + + //鏂板瘑鐮佷笉鑳戒笌璐﹀彿鐩稿悓 + if(user.getNewPwd().equals(userEntity.getAccount())){ + ExceptionCast.cast(HrmsCode.NEW_PASSWORD_DIFFERENT); + } + + //妫娴嬪綋鍓嶅瘑鐮佹槸鍚﹁緭鍏ユ纭 + if(!Md5Util.md5(user.getPassword()+userEntity.getId()).equals(userEntity.getPassword())){ + ExceptionCast.cast(HrmsCode.PASSWORD_ERROR); + } + + //鏂板瘑鐮佷笉鑳戒笌褰撳墠瀵嗙爜淇濇寔涓鑷 + if(Md5Util.md5(user.getNewPwd()+userEntity.getId()).equals(userEntity.getPassword())){ + ExceptionCast.cast(HrmsCode.NEWPWD_PASSWORD_SAME); + } + + String newMD5 = Md5Util.md5(user.getNewPwd()+userEntity.getId()); + //鏍规嵁鎵嬫満鍙风爜淇敼瀵嗙爜 + int i = userLoginDao.updatePasswordByPhoneAccount(user.getPhoneAccount(),newMD5); + return i > 0; + } } diff --git a/dq-financial-hrms-auth/src/main/resources/mapper/hrmsauth/UserLoginMapper.xml b/dq-financial-hrms-auth/src/main/resources/mapper/hrmsauth/UserLoginMapper.xml index 9a66957d..fd2d7237 100644 --- a/dq-financial-hrms-auth/src/main/resources/mapper/hrmsauth/UserLoginMapper.xml +++ b/dq-financial-hrms-auth/src/main/resources/mapper/hrmsauth/UserLoginMapper.xml @@ -35,7 +35,7 @@ \ No newline at end of file diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/request/UpdatePwdRequest.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/request/UpdatePwdRequest.java new file mode 100644 index 00000000..d131986c --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/request/UpdatePwdRequest.java @@ -0,0 +1,40 @@ +package com.daqing.framework.domain.hrms.request; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; +import java.io.Serializable; + +/** + * 淇敼骞冲彴瓒呯鍛樺瘑鐮佽姹備綋瀵硅薄 + * + * @author gongsj + * @email gongsj@gmail.com + * @date 2020-09-07 17:12:14 + */ +@Data +public class UpdatePwdRequest implements Serializable { + + /** + * 鎵嬫満璐﹀彿 + */ + @Pattern(regexp = "^1(3([0-35-9]\\d|4[1-8])|4[14-9]\\d|5([0125689]\\d|7[1-79])|66\\d|7[2-35-8]\\d|8\\d{2}|9[13589]\\d)\\d{7}$",message = "鎵嬫満鍙锋牸寮忎笉姝ｇ‘锛") + private String phoneAccount; + + /** + * 鏂板瘑鐮 + */ + @Pattern(regexp = "^(?=.*[0-9].*)(?=.*[A-Z].*)(?=.*[a-z].*).{6,20}$",message = "瀵嗙爜鏍煎紡涓嶆纭紒") + private String newPwd; + /** + * 纭瀵嗙爜 + */ + private String confirmPwd; + + /** + * 鍘熷瘑鐮 + */ + @NotBlank(message = "褰撳墠瀵嗙爜涓嶈兘涓虹┖锛") + private String password; +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/request/UserLoginRequest.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/request/UserLoginRequest.java index c6428064..68dfb88f 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/request/UserLoginRequest.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/request/UserLoginRequest.java @@ -2,6 +2,7 @@ package com.daqing.framework.domain.hrms.request; import lombok.Data; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; import java.io.Serializable; @@ -18,20 +19,24 @@ public class UserLoginRequest implements Serializable { /** * 鎵嬫満璐﹀彿 */ + @NotBlank(message = "鎵嬫満鍙风爜涓嶈兘涓虹┖锛") @Pattern(regexp = "^1(3([0-35-9]\\d|4[1-8])|4[14-9]\\d|5([0125689]\\d|7[1-79])|66\\d|7[2-35-8]\\d|8\\d{2}|9[13589]\\d)\\d{7}$",message = "鎵嬫満鍙锋牸寮忎笉姝ｇ‘锛") private String phoneAccount; /** * 楠岃瘉鐮 */ + @NotBlank(message = "楠岃瘉鐮佷笉鑳戒负绌猴紒") private String verifyCode; /** * 鏂板瘑鐮 */ @Pattern(regexp = "^(?=.*[0-9].*)(?=.*[A-Z].*)(?=.*[a-z].*).{6,20}$",message = "瀵嗙爜鏍煎紡涓嶆纭紒") + @NotBlank(message = "鏂板瘑鐮佷笉鑳戒负绌猴紒") private String newPwd; /** * 纭瀵嗙爜 */ + @NotBlank(message = "纭瀵嗙爜涓嶈兘涓虹┖锛") private String confirmPwd; } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/HrmsCode.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/HrmsCode.java index cbfea710..6287f554 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/HrmsCode.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/HrmsCode.java @@ -30,6 +30,8 @@ public enum HrmsCode implements ResultCode { CONFIRM_PWD_NOT_EMPTY(false,33007,"纭瀵嗙爜涓嶈兘涓虹┖锛"), TWICE_PWD_DIFFERENT(false,33008,"涓ゆ杈撳叆瀵嗙爜涓嶄竴鑷达紒"), NEW_PASSWORD_DIFFERENT(false,33008,"杈撳叆鐨勬柊瀵嗙爜涓嶈兘涓庤处鍙风浉鍚岋紒"), + PASSWORD_ERROR(false,33009,"褰撳墠瀵嗙爜杈撳叆涓嶆纭紒"), + NEWPWD_PASSWORD_SAME(false,33010,"鏂板瘑鐮佷笉鑳戒笌褰撳墠瀵嗙爜涓鑷达紒"), EMP_POSITION_EXSIT(false, 22006, "璇ヨ亴浣嶄笅宸插叧鑱斿憳宸ワ紒"); From e27794b092ed4d8fff54b0e8b48f329991d5bb91 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Fri, 9 Oct 2020 18:27:52 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BB=A5=E5=8F=8A=E5=8F=82=E6=95=B0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrauth/SystemLogControllerApi.java | 3 +- .../controller/SystemLogController.java | 5 ++- .../financial/hrauth/dao/LoginLogMapper.java | 5 ++- .../hrauth/service/LoginLogService.java | 4 +- .../service/impl/LoginLogServiceImpl.java | 6 ++- .../mapper/hrmsauth/LoginLogMapper.xml | 29 +++++++++++- .../framework/domain/hrms/LoginLogEntity.java | 44 +++++++++++++++++++ .../hrms/request/UserLoginLogRequest.java | 32 ++++++++++++++ 8 files changed, 119 insertions(+), 9 deletions(-) create mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/LoginLogEntity.java create mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/request/UserLoginLogRequest.java diff --git a/dq-financial-api/src/main/java/com/daqing/financial/hrauth/SystemLogControllerApi.java b/dq-financial-api/src/main/java/com/daqing/financial/hrauth/SystemLogControllerApi.java index 8e027de1..c0c8a2bf 100644 --- a/dq-financial-api/src/main/java/com/daqing/financial/hrauth/SystemLogControllerApi.java +++ b/dq-financial-api/src/main/java/com/daqing/financial/hrauth/SystemLogControllerApi.java @@ -2,6 +2,7 @@ package com.daqing.financial.hrauth; import com.daqing.framework.domain.crms.request.CustomerRequest; import com.daqing.framework.domain.hrms.request.LoginRequest; +import com.daqing.framework.domain.hrms.request.UserLoginLogRequest; import com.daqing.framework.domain.hrms.request.UserLoginRequest; import com.daqing.framework.model.response.ResponseResult; import io.swagger.annotations.Api; @@ -20,5 +21,5 @@ public interface SystemLogControllerApi { ResponseResult list(Integer page, Integer size); @ApiOperation(value = "鐧诲綍鏃ュ織鍒楄〃") - ResponseResult loginLogList(Integer page, Integer size); + ResponseResult loginLogList(Integer page, Integer size, UserLoginLogRequest userLoginLogRequest); } diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/SystemLogController.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/SystemLogController.java index 0c35c1bf..af08a647 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/SystemLogController.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/SystemLogController.java @@ -11,6 +11,7 @@ import com.daqing.financial.hrauth.service.UserLoginService; import com.daqing.framework.domain.hrms.EmployeeEntity; import com.daqing.framework.domain.hrms.SystemLog; import com.daqing.framework.domain.hrms.request.LoginRequest; +import com.daqing.framework.domain.hrms.request.UserLoginLogRequest; import com.daqing.framework.domain.hrms.request.UserLoginRequest; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.PageUtils; @@ -47,8 +48,8 @@ public class SystemLogController implements SystemLogControllerApi { @GetMapping("/loginLogList") @Log(detail = "鐧诲綍鏃ュ織鍒楄〃",level = 3,operationUnit = OperationUnit.ROLE,operationType = OperationType.SELECT) public ResponseResult loginLogList(@RequestParam("page") Integer page, - @RequestParam("size") Integer size) { - PageUtils data = loginLogService.queryPage(page, size); + @RequestParam("size") Integer size, UserLoginLogRequest userLoginLogRequest) { + PageUtils data = loginLogService.queryPage(page, size,userLoginLogRequest); return new ResponseResult().SUCCESS(data); } diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/dao/LoginLogMapper.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/dao/LoginLogMapper.java index e1fd08c6..3cc42d4a 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/dao/LoginLogMapper.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/dao/LoginLogMapper.java @@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.daqing.framework.domain.hrms.LoginLog; +import com.daqing.framework.domain.hrms.request.UserLoginLogRequest; +import com.daqing.framework.domain.hrms.request.UserLoginRequest; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; @Mapper public interface LoginLogMapper extends BaseMapper { - IPage pageByCondition(Page page); + IPage pageByCondition(Page page,@Param("loginLog") UserLoginLogRequest userLoginLogRequest); } diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/LoginLogService.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/LoginLogService.java index 6b193507..50ade5b3 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/LoginLogService.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/LoginLogService.java @@ -2,8 +2,10 @@ package com.daqing.financial.hrauth.service; import com.baomidou.mybatisplus.extension.service.IService; import com.daqing.framework.domain.hrms.LoginLog; +import com.daqing.framework.domain.hrms.request.UserLoginLogRequest; +import com.daqing.framework.domain.hrms.request.UserLoginRequest; import com.daqing.framework.utils.PageUtils; public interface LoginLogService extends IService { - PageUtils queryPage(Integer page, Integer size); + PageUtils queryPage(Integer page, Integer size, UserLoginLogRequest userLoginLogRequest); } diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/LoginLogServiceImpl.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/LoginLogServiceImpl.java index 7d07640f..a78ca32c 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/LoginLogServiceImpl.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/LoginLogServiceImpl.java @@ -7,13 +7,15 @@ import com.daqing.financial.hrauth.dao.LoginLogMapper; import com.daqing.financial.hrauth.service.LoginLogService; import com.daqing.framework.domain.hrms.LoginLog; import com.daqing.framework.domain.hrms.SystemLog; +import com.daqing.framework.domain.hrms.request.UserLoginLogRequest; +import com.daqing.framework.domain.hrms.request.UserLoginRequest; import com.daqing.framework.utils.PageUtils; import org.springframework.stereotype.Service; @Service public class LoginLogServiceImpl extends ServiceImpl implements LoginLogService { @Override - public PageUtils queryPage(Integer page, Integer size) { + public PageUtils queryPage(Integer page, Integer size, UserLoginLogRequest userLoginLogRequest) { //鍒嗛〉鍙傛暟 if (page <= 0) { page = 1; @@ -21,7 +23,7 @@ public class LoginLogServiceImpl extends ServiceImpl i if (size <= 0) { size = 10; } - IPage loginLogVo = this.getBaseMapper().pageByCondition(new Page(page, size)); + IPage loginLogVo = this.getBaseMapper().pageByCondition(new Page(page, size),userLoginLogRequest); return new PageUtils(loginLogVo); } diff --git a/dq-financial-hrms-auth/src/main/resources/mapper/hrmsauth/LoginLogMapper.xml b/dq-financial-hrms-auth/src/main/resources/mapper/hrmsauth/LoginLogMapper.xml index efadb287..866bd044 100644 --- a/dq-financial-hrms-auth/src/main/resources/mapper/hrmsauth/LoginLogMapper.xml +++ b/dq-financial-hrms-auth/src/main/resources/mapper/hrmsauth/LoginLogMapper.xml @@ -6,9 +6,34 @@ + + + - + SELECT + hll.user_id,hll.login_num,hll.create_time,hll.newest_time,he.name as empName,he.job_number, + he.phone,hp.name as posName,hd.name as deptName + FROM hrms_login_log hll + left join hrms_employee he on he.user_id=hll.user_id + left join hrms_employee_position hep on hep.emp_id=he.id + left join hrms_position hp on hp.id=hep.position_id + left join hrms_employee_dept hed on hed.employee_id=he.id + left join hrms_dept hd on hd.id=hed.dept_id + + + AND he.`name` LIKE CONCAT('%',#{loginLog.name},'%') + + + AND he.job_number = #{loginLog.jobNumber} + + + AND hll.create_time >= #{loginLog.startTime} + + + AND hll.create_time <= #{loginLog.endTime} + + \ No newline at end of file diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/LoginLogEntity.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/LoginLogEntity.java new file mode 100644 index 00000000..691b50ae --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/LoginLogEntity.java @@ -0,0 +1,44 @@ +package com.daqing.framework.domain.hrms; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +@Data +@TableName("hrms_login_log") +public class LoginLogEntity { + + @TableId(type = IdType.AUTO) + private int id; + + //鐢ㄦ埛id + private Long userId; + + //鐧诲綍娆℃暟 + private int loginNum; + + //鍒涘缓鏃堕棿 + private Date createTime; + + //鏈鏂扮櫥褰曟椂闂 + private Date newestTime; + + //鍛樺伐濮撳悕 + private String empName; + + //宸ュ彿 + private String jobNumber; + + //鑱旂郴鐢佃瘽 + private String phone; + + //鑱屼綅 + private String posName; + + //閮ㄩ棬鍚嶇О + private String deptName; + +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/request/UserLoginLogRequest.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/request/UserLoginLogRequest.java new file mode 100644 index 00000000..45692174 --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/request/UserLoginLogRequest.java @@ -0,0 +1,32 @@ +package com.daqing.framework.domain.hrms.request; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 鐧诲綍鏃ュ織璇锋眰浣撳璞 + * + * @author gongsj + * @email gongsj@gmail.com + * @date 2020-09-07 17:12:14 + */ +@Data +public class UserLoginLogRequest implements Serializable { + /** + * 濮撳悕 + */ + private String name; + /** + * 宸ュ彿 + */ + private String jobNumber; + /** + * 寮濮嬫椂闂 + */ + private String startTime; + /** + * 缁撴潫鏃堕棿 + */ + private String endTime; +} From bc73746223e65a21fa45d240ede6cf437de602b3 Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Sat, 10 Oct 2020 09:44:32 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=90=8E=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../financial/crms/CustomerControllerApi.java | 13 +- .../financial/DqFinancialApiApplication.class | Bin 0 -> 809 bytes .../crms/CustomerControllerApi.class | Bin 1845 -> 2076 bytes .../hrauth/UserLoginControllerApi.class | Bin 0 -> 746 bytes .../crms/controller/CustomerController.java | 34 ++-- .../crms/service/CustomerService.java | 18 +- .../service/impl/CustomerServiceImpl.java | 150 +++++++++------- .../crms/controller/CustomerController.class | Bin 6430 -> 6289 bytes .../crms/service/CustomerService.class | Bin 1557 -> 1643 bytes .../service/impl/CustomerServiceImpl.class | Bin 20486 -> 21978 bytes .../target/classes/bootstrap.properties | 29 +++ .../DqFinancialHrmsAuthApplication.class | Bin 0 -> 1077 bytes .../financial/hrauth/annotation/Log.class | Bin 0 -> 838 bytes .../financial/hrauth/aspect/Operation.class | Bin 0 -> 7203 bytes .../hrauth/aspect/SysLogAspect.class | Bin 0 -> 7384 bytes .../controller/UserLoginController.class | Bin 0 -> 3030 bytes .../financial/hrauth/dao/LoginLogMapper.class | Bin 0 -> 412 bytes .../hrauth/dao/SystemLogMapper.class | Bin 0 -> 415 bytes .../financial/hrauth/dao/TokenMapper.class | Bin 0 -> 403 bytes .../financial/hrauth/dao/UserLoginDao.class | Bin 0 -> 1015 bytes .../hrauth/enums/BusinessType$1.class | Bin 0 -> 993 bytes .../financial/hrauth/enums/BusinessType.class | Bin 0 -> 2101 bytes .../hrauth/enums/OperationType$1.class | Bin 0 -> 952 bytes .../hrauth/enums/OperationType.class | Bin 0 -> 2375 bytes .../hrauth/enums/OperationUnit.class | Bin 0 -> 2421 bytes .../hrauth/service/LoginLogService.class | Bin 0 -> 345 bytes .../hrauth/service/TokenService.class | Bin 0 -> 336 bytes .../hrauth/service/UserLoginService.class | Bin 0 -> 801 bytes .../service/impl/LoginLogServiceImpl.class | Bin 0 -> 779 bytes .../service/impl/TokenServiceImpl.class | Bin 0 -> 758 bytes .../service/impl/UserLoginServiceImpl.class | Bin 0 -> 7027 bytes .../financial/hrauth/util/IpUtils.class | Bin 0 -> 1748 bytes .../target/classes/logback-spring.xml | 47 +++++ .../mapper/hrmsauth/UserLoginMapper.xml | 41 +++++ .../resources/mapper/hrms/EmployeeDao.xml | 1 + .../resources/mapper/hrms/PositionDao.xml | 2 + .../target/classes/application.yml | 12 ++ .../target/classes/bootstrap.properties | 12 +- .../hrms/controller/EmployeeController.class | Bin 4266 -> 4530 bytes .../classes/mapper/hrms/EmployeeDao.xml | 1 + .../classes/mapper/hrms/PositionDao.xml | 2 + .../framework/exception/ExceptionCatch.java | 4 +- .../model/response/PromptSuccess.java | 21 +-- .../com/daqing/framework/util/Md5Util.java | 1 + .../framework/SpringContextHolder.class | Bin 0 -> 1981 bytes .../framework/exception/ExceptionCatch.class | Bin 4094 -> 3871 bytes .../model/response/PromptSuccess.class | Bin 722 -> 529 bytes .../com/daqing/framework/util/BasePage.class | Bin 0 -> 1496 bytes .../com/daqing/framework/util/JwtUtils.class | Bin 0 -> 4264 bytes .../com/daqing/framework/util/Md5Util.class | Bin 0 -> 1149 bytes .../daqing/framework/util/RandomUtil.class | Bin 0 -> 932 bytes .../com/daqing/framework/util/RedisUtil.class | Bin 0 -> 7943 bytes .../com/daqing/framework/util/SendSMS.class | Bin 0 -> 3531 bytes .../domain/crms/CompanyCustomerEntity.java | 5 + .../framework/domain/crms/CustomerEntity.java | 2 + .../domain/crms/PersonalCustomerEntity.java | 4 + .../domain/crms/ext/CompanyTemplate.java | 83 +++++++++ .../domain/crms/ext/CustomerCompanyDTO.java | 1 + .../domain/crms/ext/CustomerCompanyTO.java | 29 --- .../domain/crms/ext/CustomerCompanyTOI.java | 107 +++++++++++ .../domain/crms/ext/CustomerCompanyTOU.java | 128 ++++++++++++++ .../domain/crms/ext/CustomerCompanyVO.java | 31 ++-- .../domain/crms/ext/CustomerPersonalDTO.java | 1 + .../domain/crms/ext/CustomerPersonalTO.java | 30 ---- .../domain/crms/ext/CustomerPersonalTOI.java | 152 ++++++++++++++++ .../domain/crms/ext/CustomerPersonalTOU.java | 167 ++++++++++++++++++ .../domain/crms/ext/CustomerPersonalVO.java | 45 +++-- .../domain/crms/ext/PersonalTemplate.java | 133 ++++++++++++++ .../domain/crms/response/CrmsCode.java | 4 +- .../META-INF/dq-framework-model.kotlin_module | Bin 0 -> 16 bytes .../domain/crms/CompanyCustomerEntity.class | Bin 6123 -> 6242 bytes .../domain/crms/CustomerEntity.class | Bin 6815 -> 6815 bytes .../domain/crms/PersonalCustomerEntity.class | Bin 8872 -> 9061 bytes .../domain/crms/ext/CompanyTemplate.class | Bin 0 -> 6760 bytes .../domain/crms/ext/CustomerCompanyDTO.class | Bin 0 -> 7330 bytes .../domain/crms/ext/CustomerCompanyTO.class | Bin 2446 -> 0 bytes .../domain/crms/ext/CustomerCompanyTOI.class | Bin 0 -> 7877 bytes .../domain/crms/ext/CustomerCompanyTOU.class | Bin 0 -> 8773 bytes .../domain/crms/ext/CustomerCompanyVO.class | Bin 7491 -> 7106 bytes .../domain/crms/ext/CustomerPersonalDTO.class | Bin 0 -> 9335 bytes .../domain/crms/ext/CustomerPersonalTO.class | Bin 2460 -> 0 bytes .../domain/crms/ext/CustomerPersonalTOI.class | Bin 0 -> 10958 bytes .../domain/crms/ext/CustomerPersonalTOU.class | Bin 0 -> 11854 bytes .../domain/crms/ext/CustomerPersonalVO.class | Bin 10419 -> 10034 bytes .../domain/crms/ext/PersonalTemplate.class | Bin 0 -> 10420 bytes .../domain/crms/response/CrmsCode.class | Bin 2679 -> 2795 bytes .../framework/domain/hrms/LoginLog.class | Bin 0 -> 3024 bytes .../hrms/SystemLog$SystemLogBuilder.class | Bin 0 -> 3469 bytes .../framework/domain/hrms/SystemLog.class | Bin 0 -> 8152 bytes .../daqing/framework/domain/hrms/Token.class | Bin 0 -> 2491 bytes .../domain/hrms/request/LoginRequest.class | Bin 0 -> 3199 bytes .../hrms/request/UserLoginRequest.class | Bin 0 -> 2924 bytes .../domain/hrms/response/LoginResponse.class | Bin 0 -> 1879 bytes .../gateway/DqGovernGatewayApplication.class | Bin 0 -> 884 bytes .../gateway/SpringContextHolder.class | Bin 0 -> 2064 bytes .../gateway/config/ApiGlobalFilter.class | Bin 0 -> 5613 bytes .../config/FinancialCorsConfiguration.class | Bin 0 -> 1557 bytes .../gateway/util/OdcProperties$Async.class | Bin 0 -> 2366 bytes .../gateway/util/OdcProperties$Config.class | Bin 0 -> 3069 bytes .../gateway/util/OdcProperties$Oss.class | Bin 0 -> 3470 bytes .../gateway/util/OdcProperties.class | Bin 0 -> 3406 bytes .../financial/gateway/util/RedisUtil.class | Bin 0 -> 8346 bytes 瀹㈡埛璧勬簮淇℃伅涓瑙堣〃.xlsx | 0 瀹㈡埛璧勬簮淇℃伅琛ㄦā鏉.xlsx | 0 104 files changed, 1087 insertions(+), 223 deletions(-) create mode 100644 dq-financial-api/target/classes/com/daqing/financial/DqFinancialApiApplication.class create mode 100644 dq-financial-api/target/classes/com/daqing/financial/hrauth/UserLoginControllerApi.class create mode 100644 dq-financial-hrms-auth/target/classes/bootstrap.properties create mode 100644 dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/DqFinancialHrmsAuthApplication.class create mode 100644 dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/annotation/Log.class create mode 100644 dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/aspect/Operation.class create mode 100644 dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/aspect/SysLogAspect.class create mode 100644 dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/controller/UserLoginController.class create mode 100644 dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/LoginLogMapper.class create mode 100644 dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/SystemLogMapper.class create mode 100644 dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/TokenMapper.class create mode 100644 dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/UserLoginDao.class create mode 100644 dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/enums/BusinessType$1.class create mode 100644 dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/enums/BusinessType.class create mode 100644 dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/enums/OperationType$1.class create mode 100644 dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/enums/OperationType.class create mode 100644 dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/enums/OperationUnit.class create mode 100644 dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/LoginLogService.class create mode 100644 dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/TokenService.class create mode 100644 dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/UserLoginService.class create mode 100644 dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/LoginLogServiceImpl.class create mode 100644 dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/TokenServiceImpl.class create mode 100644 dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.class create mode 100644 dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/util/IpUtils.class create mode 100644 dq-financial-hrms-auth/target/classes/logback-spring.xml create mode 100644 dq-financial-hrms-auth/target/classes/mapper/hrmsauth/UserLoginMapper.xml create mode 100644 dq-financial-hrms/target/classes/application.yml create mode 100644 dq-framework-common/target/classes/com/daqing/framework/SpringContextHolder.class create mode 100644 dq-framework-common/target/classes/com/daqing/framework/util/BasePage.class create mode 100644 dq-framework-common/target/classes/com/daqing/framework/util/JwtUtils.class create mode 100644 dq-framework-common/target/classes/com/daqing/framework/util/Md5Util.class create mode 100644 dq-framework-common/target/classes/com/daqing/framework/util/RandomUtil.class create mode 100644 dq-framework-common/target/classes/com/daqing/framework/util/RedisUtil.class create mode 100644 dq-framework-common/target/classes/com/daqing/framework/util/SendSMS.class create mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CompanyTemplate.java delete mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.java create mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTOI.java create mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTOU.java delete mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.java create mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTOI.java create mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTOU.java create mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/PersonalTemplate.java create mode 100644 dq-framework-model/target/classes/META-INF/dq-framework-model.kotlin_module create mode 100644 dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CompanyTemplate.class create mode 100644 dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.class delete mode 100644 dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.class create mode 100644 dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTOI.class create mode 100644 dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTOU.class create mode 100644 dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalDTO.class delete mode 100644 dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.class create mode 100644 dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOI.class create mode 100644 dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOU.class create mode 100644 dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/PersonalTemplate.class create mode 100644 dq-framework-model/target/classes/com/daqing/framework/domain/hrms/LoginLog.class create mode 100644 dq-framework-model/target/classes/com/daqing/framework/domain/hrms/SystemLog$SystemLogBuilder.class create mode 100644 dq-framework-model/target/classes/com/daqing/framework/domain/hrms/SystemLog.class create mode 100644 dq-framework-model/target/classes/com/daqing/framework/domain/hrms/Token.class create mode 100644 dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/LoginRequest.class create mode 100644 dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/UserLoginRequest.class create mode 100644 dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/LoginResponse.class create mode 100644 dq-govern-gateway/target/classes/com/daqing/financial/gateway/DqGovernGatewayApplication.class create mode 100644 dq-govern-gateway/target/classes/com/daqing/financial/gateway/SpringContextHolder.class create mode 100644 dq-govern-gateway/target/classes/com/daqing/financial/gateway/config/ApiGlobalFilter.class create mode 100644 dq-govern-gateway/target/classes/com/daqing/financial/gateway/config/FinancialCorsConfiguration.class create mode 100644 dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/OdcProperties$Async.class create mode 100644 dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/OdcProperties$Config.class create mode 100644 dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/OdcProperties$Oss.class create mode 100644 dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/OdcProperties.class create mode 100644 dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/RedisUtil.class create mode 100644 瀹㈡埛璧勬簮淇℃伅涓瑙堣〃.xlsx create mode 100644 瀹㈡埛璧勬簮淇℃伅琛ㄦā鏉.xlsx diff --git a/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java b/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java index 685de46e..588ac3a6 100644 --- a/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java +++ b/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java @@ -1,9 +1,7 @@ package com.daqing.financial.crms; -import com.daqing.framework.domain.crms.ext.CustomerCompanyTO; -import com.daqing.framework.domain.crms.ext.CustomerPersonalTO; -import com.daqing.framework.domain.crms.ext.CustomerTO; +import com.daqing.framework.domain.crms.ext.*; import com.daqing.framework.domain.crms.request.CustomerRequest; import com.daqing.framework.model.response.ResponseResult; import io.swagger.annotations.Api; @@ -11,7 +9,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; /** * @Author: gongsj. @@ -44,25 +41,25 @@ public interface CustomerControllerApi { * 鏂板涓汉绫诲瀷瀹㈡埛淇℃伅 */ @ApiOperation(value = "鏂板涓汉绫诲瀷瀹㈡埛淇℃伅", notes = "鏂板涓汉绫诲瀷瀹㈡埛淇℃伅") - ResponseResult savePersonal(CustomerPersonalTO customerPersonalTO); + ResponseResult savePersonal(CustomerPersonalTOI customerPersonalTOI); /** * 鏂板浼佷笟绫诲瀷瀹㈡埛淇℃伅 */ @ApiOperation(value = "鏂板浼佷笟绫诲瀷瀹㈡埛淇℃伅", notes = "鏂板浼佷笟绫诲瀷瀹㈡埛淇℃伅") - ResponseResult saveCompany(CustomerCompanyTO customerCompanyTO); + ResponseResult saveCompany(CustomerCompanyTOI customerCompanyTOI); /** * 鏇存柊涓汉绫诲瀷瀹㈡埛淇℃伅 */ @ApiOperation(value = "鏇存柊涓汉绫诲瀷瀹㈡埛淇℃伅", notes = "鏇存柊涓汉绫诲瀷瀹㈡埛淇℃伅") - ResponseResult updatePersonal(CustomerPersonalTO customerPersonalTO); + ResponseResult updatePersonal(CustomerPersonalTOU customerPersonalTOU); /** * 鏇存柊浼佷笟绫诲瀷瀹㈡埛淇℃伅 */ @ApiOperation(value = "鏇存柊浼佷笟绫诲瀷瀹㈡埛淇℃伅", notes = "鏇存柊浼佷笟绫诲瀷瀹㈡埛淇℃伅") - ResponseResult updateCompany(CustomerCompanyTO customerCompanyTO); + ResponseResult updateCompany(CustomerCompanyTOU customerCompanyTOU); /** * 瀵煎叆excel鏁版嵁 diff --git a/dq-financial-api/target/classes/com/daqing/financial/DqFinancialApiApplication.class b/dq-financial-api/target/classes/com/daqing/financial/DqFinancialApiApplication.class new file mode 100644 index 0000000000000000000000000000000000000000..38b18cb5223af23a6958e97253943f060204b09e GIT binary patch literal 809 zcmb7CO>fgc5Ph4bbufXpDHO_=#4XLC+j8JysFbGkWPwCbIB;4!8?&vwo37Wie~S}{ z13!Qtg_w1M5~TEiE$w*c&Agd;<6pmj`~+}>ry-iSA7D4c13V0{$FT8AY2}U?*1G#6 zhUUPGCBtT{w0v6?iL@U?l9Q(sn^fc@VU@qnolW;yl?;b*Y6?CUmr7@RqO{Pd5;;G; zJp23IpQ`?JnyXYeWpqS!3ZXQ^Zue7sF1`q!3rZb2OAJxnhp-tj@2r3s!l9{bD$kT} z?AeWF4m>l%-up^BRmhPl6}8^i+PJz6;y;d!&3HNWbthI7^2*o?o*3h}sGLcSo~W#{ zk`L>U69WF7<8?ewHrIS?(yEYpM$XGCk!8}p;9^mbztLX3;T($ESjPs#!T-q@;87co z@q}S(q20UWT&9kpcjG{_5tiDgo!g3*kaU-JFvvw&Mk{3BUnvzS7X1PddBG=mJLtSm@Y7APynAde}l0FqSz$|^D_Vah6lWR-!kDll17WQ$cn(yBm5 cr~w_s#Gnp#m@v>74T!@u8MLAq7>gOS0j?b|0{{R3 delta 252 zcmbOuu$52X)W2Q(7#J7~8FbhgwAdN6Hww5gG39GaY!sW!$1E}V6f@Uk17?TG=b6-* z@}Q!MK#{D;yex*BH?ZtrsuyNpWMBmvApoS=7?>E?iy0&tIDrHUBZCx!7^bW=NLCss zE5jg*DJut(l>^GkGbmunDuQGcfwD?4SyN<-l|j}isUT7+Bal(jq*`AOmxaB%_U>L=loWtSf{cVH z5EQ9Xgn}Xwk@wI7$UJ@0lL%v`|gf(NAdC5dVYQAVA$1PT3be?~3X!9nNx{xL&-`rjs znG!0ha%H0(^1|hXVyyfmgBOKZdl}(J>10vil-9-zFNw_HRbCqIY9b8La&e9Dsj{3c zqwVlWqo*oVO#P3YegFFRaJ9MlrFn3i)PE-R&uOOhZIxK0jHKEZqMsJQ@?5P%4xDXl zwHiN?!}XM-+FxQ2-NT9h;X<~x_d99qQgibrwgJBH%wz1zMFz|5vhh)ZE!RZ5%MjcoC8X&ztq_)06$%7!x-)Kx&}_DHM%f#D4L5=>PP? zV6fd0SAw=?wz!0W&oW@pMau@zong=o8G857Ymj1=keq`D&`SrQeOG9I2W4%vpMU{) ecv*G>ctq8YNvVsp+KMAY8A=t0VdN7q2cs8`q50ha literal 0 HcmV?d00001 diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java index b6b75c61..44630e25 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java @@ -2,22 +2,23 @@ package com.daqing.financial.crms.controller; import com.daqing.financial.crms.CustomerControllerApi; import com.daqing.financial.crms.service.CustomerService; -import com.daqing.framework.domain.crms.ext.CustomerCompanyTO; -import com.daqing.framework.domain.crms.ext.CustomerPersonalTO; +import com.daqing.framework.domain.crms.ext.CustomerCompanyTOI; +import com.daqing.framework.domain.crms.ext.CustomerCompanyTOU; +import com.daqing.framework.domain.crms.ext.CustomerPersonalTOI; +import com.daqing.framework.domain.crms.ext.CustomerPersonalTOU; import com.daqing.framework.domain.crms.request.CustomerRequest; import com.daqing.framework.model.response.CommonCode; import com.daqing.framework.model.response.PromptSuccess; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.PageUtils; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.List; -import java.util.Objects; +import java.util.*; /** @@ -73,9 +74,9 @@ public class CustomerController implements CustomerControllerApi { List list = customerService.updateCustomerById(ids); if (list == null){ return new ResponseResult(CommonCode.INVALID_PARAM); - }else if (Objects.equals(list.get(0),PromptSuccess.getDeleteSuccess())){ + }else if (Objects.equals(list.get(0),PromptSuccess.DELETE_SUCCESS)){ return ResponseResult.SUCCESS(); - }else if (Objects.equals(list.get(0),PromptSuccess.getDeleteFail())){ + }else if (Objects.equals(list.get(0),PromptSuccess.DELETE_FAIL)){ return new ResponseResult(CommonCode.DELETE_FAIL); } else { @@ -87,8 +88,8 @@ public class CustomerController implements CustomerControllerApi { * 淇濆瓨涓汉绫诲瀷瀹㈡埛淇℃伅 */ @PostMapping("/savePersonal") - public ResponseResult savePersonal(@RequestBody @Valid CustomerPersonalTO customerPersonalTO) { - boolean result = customerService.saveCustomerPersonal(customerPersonalTO.getCustomerEntity(), customerPersonalTO.getPersonalCustomerEntity()); + public ResponseResult savePersonal(@RequestBody @Valid CustomerPersonalTOI customerPersonalTOI) { + boolean result = customerService.saveCustomerPersonal(customerPersonalTOI); return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.SAVE_FAIL); } @@ -96,8 +97,8 @@ public class CustomerController implements CustomerControllerApi { * 淇濆瓨浼佷笟绫诲瀷瀹㈡埛淇℃伅 */ @PostMapping("/saveCompany") - public ResponseResult saveCompany(@RequestBody @Valid CustomerCompanyTO customerCompanyTO) { - boolean result = customerService.saveCustomerCompany(customerCompanyTO.getCustomerEntity(), customerCompanyTO.getCompanyCustomerEntity()); + public ResponseResult saveCompany(@RequestBody @Valid CustomerCompanyTOI customerCompanyTOI) { + boolean result = customerService.saveCustomerCompany(customerCompanyTOI); return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.SAVE_FAIL); } @@ -105,8 +106,8 @@ public class CustomerController implements CustomerControllerApi { * 鏇存柊涓汉绫诲瀷瀹㈡埛淇℃伅 */ @PostMapping("/updatePersonal") - public ResponseResult updatePersonal(@RequestBody CustomerPersonalTO customerPersonalTO) { - boolean result = customerService.updateCustomerPersonal(customerPersonalTO.getCustomerEntity(), customerPersonalTO.getPersonalCustomerEntity()); + public ResponseResult updatePersonal(@RequestBody @Valid CustomerPersonalTOU customerPersonalTOU) { + boolean result = customerService.updateCustomerPersonal(customerPersonalTOU); return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.UPDATE_FAIL); } @@ -114,8 +115,8 @@ public class CustomerController implements CustomerControllerApi { * 鏇存柊浼佷笟绫诲瀷瀹㈡埛淇℃伅 */ @PostMapping("/updateCompany") - public ResponseResult updateCompany(@RequestBody CustomerCompanyTO customerCompanyTO) { - boolean result = customerService.updateCustomerCompany(customerCompanyTO.getCustomerEntity(), customerCompanyTO.getCompanyCustomerEntity()); + public ResponseResult updateCompany(@RequestBody @Valid CustomerCompanyTOU customerCompanyTOU) { + boolean result = customerService.updateCustomerCompany(customerCompanyTOU); return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.UPDATE_FAIL); } @@ -143,7 +144,6 @@ public class CustomerController implements CustomerControllerApi { @PostMapping("/excelImport") public ResponseResult excelImportCustomer(MultipartFile file){ - boolean result = customerService.excelImportCustomer(file); - return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.IMPORT_ERROR); + return customerService.excelImportCustomer(file); } } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java index cfbcd4d5..1b27c409 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java @@ -1,8 +1,10 @@ package com.daqing.financial.crms.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.daqing.framework.domain.crms.CompanyCustomerEntity; -import com.daqing.framework.domain.crms.PersonalCustomerEntity; +import com.daqing.framework.domain.crms.ext.CustomerCompanyTOI; +import com.daqing.framework.domain.crms.ext.CustomerCompanyTOU; +import com.daqing.framework.domain.crms.ext.CustomerPersonalTOI; +import com.daqing.framework.domain.crms.ext.CustomerPersonalTOU; import com.daqing.framework.domain.crms.request.CustomerRequest; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.PageUtils; @@ -10,9 +12,7 @@ import com.daqing.framework.domain.crms.CustomerEntity; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; import java.util.List; -import java.util.Map; /** * 璁板綍瀹㈡埛鍩烘湰淇℃伅 @@ -29,17 +29,17 @@ public interface CustomerService extends IService { List updateCustomerById(Long[] ids); - boolean saveCustomerPersonal(CustomerEntity customerEntity, PersonalCustomerEntity personalCustomerEntity); + boolean saveCustomerPersonal(CustomerPersonalTOI customerPersonalTOI); - boolean saveCustomerCompany(CustomerEntity customerEntity, CompanyCustomerEntity companyCustomerEntity); + boolean saveCustomerCompany(CustomerCompanyTOI customerCompanyTOI); - boolean updateCustomerPersonal(CustomerEntity customerEntity, PersonalCustomerEntity personalCustomerEntity); + boolean updateCustomerPersonal(CustomerPersonalTOU customerPersonalTOU); - boolean updateCustomerCompany(CustomerEntity customerEntity, CompanyCustomerEntity companyCustomerEntity); + boolean updateCustomerCompany(CustomerCompanyTOU customerCompanyTOU); void excelExportCustomer(HttpServletResponse response); - boolean excelImportCustomer(MultipartFile excel); + ResponseResult excelImportCustomer(MultipartFile excel); void excelTemplate(HttpServletResponse response); } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java index 5c6aabc6..b071dcd1 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java @@ -2,6 +2,7 @@ package com.daqing.financial.crms.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.api.R; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.daqing.financial.crms.dao.CompanyCustomerDao; @@ -31,6 +32,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.text.SimpleDateFormat; import java.util.*; @@ -76,13 +78,17 @@ public class CustomerServiceImpl extends ServiceImpl employeeTO = (List) responseResult.getData(); - // 灏嗗鎴蜂俊鎭拰瀹㈡埛缁忕悊鍙婇儴闂ㄤ俊鎭嫾瑁呰捣鏉 - List customerTOS = this.jointCustomerEmployee(customers, employeeTO); - // 灞炴ф嫹璐,灏嗘硾鍨嬩负CustomerEntity绫诲瀷鐨処Page鐨勫睘鎬ф嫹璐濈粰娉涘瀷涓篊ustomerTO绫诲瀷鐨処Page,鎵嶈兘璧嬪肩粰PageUtils - IPage iPage = new Page<>(); - BeanUtils.copyProperties(customerEntityIPage, iPage); - iPage.setRecords(customerTOS); - return new PageUtils(iPage); + if (employeeTO != null){ + // 灏嗗鎴蜂俊鎭拰瀹㈡埛缁忕悊鍙婇儴闂ㄤ俊鎭嫾瑁呰捣鏉 + List customerTOS = this.jointCustomerEmployee(customers, employeeTO); + // 灞炴ф嫹璐,灏嗘硾鍨嬩负CustomerEntity绫诲瀷鐨処Page鐨勫睘鎬ф嫹璐濈粰娉涘瀷涓篊ustomerTO绫诲瀷鐨処Page,鎵嶈兘璧嬪肩粰PageUtils + IPage iPage = new Page<>(); + BeanUtils.copyProperties(customerEntityIPage, iPage); + iPage.setRecords(customerTOS); + return new PageUtils(iPage); + }else { + return new PageUtils(customerEntityIPage); + } } else { return new PageUtils(customerEntityIPage); } @@ -111,11 +117,13 @@ public class CustomerServiceImpl extends ServiceImpl().SUCCESS(customerPersonalDTO); - } else { + } else if (Objects.equals(customer.getType(),CrmsConstant.CustomerType.COMPANY_CUSTOMER.getType())){ CompanyCustomerEntity companyCustomerEntity = companyCustomerDao.queryCompanyCustomerById(id); // 灏佽浼佷笟绫诲瀷瀹㈡埛淇℃伅 CustomerCompanyDTO customerCompanyDTO = this.setCompany(customer, companyCustomerEntity); return new ResponseResult().SUCCESS(customerCompanyDTO); + }else { + return new ResponseResult(CommonCode.INEXISTENCE); } } @@ -132,7 +140,7 @@ public class CustomerServiceImpl extends ServiceImpl employee = hrmsFeignService.getEmployeeById(customer.getManager()); if (employee.getData() != null){ @@ -146,11 +154,13 @@ public class CustomerServiceImpl extends ServiceImpl().SUCCESS(customerPersonalVO); - } else { + } else if (Objects.equals(customer.getType(),CrmsConstant.CustomerType.COMPANY_CUSTOMER.getType())){ CompanyCustomerEntity companyCustomerEntity = companyCustomerDao.queryCompanyCustomerById(id); // 灏佽浼佷笟绫诲瀷瀹㈡埛淇℃伅 CustomerCompanyVO customerCompanyVO = this.setCompany(customer, name, companyCustomerEntity); return new ResponseResult().SUCCESS(customerCompanyVO); + }else { + return new ResponseResult(CommonCode.INEXISTENCE); } } @@ -170,9 +180,9 @@ public class CustomerServiceImpl extends ServiceImpl success = new ArrayList<>(); - success.add(PromptSuccess.getDeleteSuccess()); + success.add(PromptSuccess.DELETE_SUCCESS); List fail = new ArrayList<>(); - fail.add(PromptSuccess.getDeleteFail()); + fail.add(PromptSuccess.DELETE_FAIL); return customer ? success : fail; } else { return customerDao.queryCustomerNameById(idArray); @@ -181,13 +191,14 @@ public class CustomerServiceImpl extends ServiceImpl companyList = new ArrayList<>(); List personalList = new ArrayList<>(); List longList = customerDao.listCustomerId(); - for (Long id : longList) { - ResponseResult responseResult = this.getCustomerById(id); - if ((responseResult.getData()).getClass() == CustomerCompanyVO.class){ - companyList.add((CustomerCompanyVO) responseResult.getData()); - }else { - personalList.add((CustomerPersonalVO) responseResult.getData()); + if (longList != null){ + for (Long id : longList) { + ResponseResult responseResult = this.getCustomerById(id); + if ((responseResult.getData()).getClass() == CustomerCompanyVO.class){ + companyList.add((CustomerCompanyVO) responseResult.getData()); + }else { + personalList.add((CustomerPersonalVO) responseResult.getData()); + } } } ExcelUtil.writeExcelWithSheets(response,personalList,"瀹㈡埛璧勬簮淇℃伅涓瑙堣〃","涓汉绫诲瀷",new CustomerPersonalVO()) @@ -289,10 +302,10 @@ public class CustomerServiceImpl extends ServiceImpl companyList = new ArrayList<>(); - List personalList = new ArrayList<>(); - ExcelUtil.writeExcelWithSheets(response,personalList,"瀹㈡埛璧勬簮淇℃伅琛ㄦā鏉","涓汉绫诲瀷",new CustomerPersonalVO()) - .write(companyList,"浼佷笟绫诲瀷",new CustomerCompanyVO()) + List companyTemplates = new ArrayList<>(); + List personalTemplates = new ArrayList<>(); + ExcelUtil.writeExcelWithSheets(response,personalTemplates,"瀹㈡埛璧勬簮淇℃伅琛ㄦā鏉","涓汉绫诲瀷",new PersonalTemplate()) + .write(companyTemplates,"浼佷笟绫诲瀷",new CompanyTemplate()) .finish(); }catch (Exception e){ ExceptionCast.cast(CrmsCode.CUSTOMER_EXPORTTEMPLATE_EXSIT); @@ -305,55 +318,60 @@ public class CustomerServiceImpl extends ServiceImpl personalList = ExcelUtil.readExcel(excel, new CustomerPersonalVO(), 1); - List companyList = ExcelUtil.readExcel(excel, new CustomerCompanyVO(), 2); + List personalList = ExcelUtil.readExcel(excel,new PersonalTemplate(), 1); + List companyList = ExcelUtil.readExcel(excel, new CompanyTemplate(), 2); List nameList = hrmsFeignService.listEmployeeName().getData(); - CustomerEntity customer; // 瀹㈡埛鍩烘湰淇℃伅 - PersonalCustomerEntity pc; // 涓汉绫诲瀷淇℃伅 - CompanyCustomerEntity cc; // 浼佷笟绫诲瀷淇℃伅 + CustomerPersonalTOI customerPersonalTOI; ManagerName manager; // 瀹㈡埛鍚嶇О // 涓汉绫诲瀷 for (Object personal : personalList) { - customer = new CustomerEntity(); + customerPersonalTOI = new CustomerPersonalTOI(); + customerPersonalTOI.setType(0); + BeanUtils.copyProperties(personal,customerPersonalTOI); manager = new ManagerName(); - pc = new PersonalCustomerEntity(); - BeanUtils.copyProperties(personal,customer); - BeanUtils.copyProperties(personal,pc); BeanUtils.copyProperties(personal,manager); // 鏍规嵁瀹㈡埛缁忕悊鍚嶇О鎵惧埌瀵瑰簲鐨勫憳宸d - for (EmployeeVO employeeVO : nameList){ - if (Objects.equals(manager.getManager(),employeeVO.getName())){ - customer.setManager(employeeVO.getId()); + if (nameList != null && manager.getManager() != null){ + for (EmployeeVO employeeVO : nameList){ + if (Objects.equals(manager.getManager(),employeeVO.getName())){ + customerPersonalTOI.setManager(employeeVO.getId()); + } + } + if (customerPersonalTOI.getManager() == null){ + ExceptionCast.cast(CrmsCode.CUSTOMER_IS_NULL); } } - this.saveCustomerPersonal(customer,pc); + this.saveCustomerPersonal(customerPersonalTOI); } // 浼佷笟绫诲瀷 for (Object company : companyList){ - customer = new CustomerEntity(); + CustomerCompanyTOI customerCompanyTOI = new CustomerCompanyTOI(); manager = new ManagerName(); - cc = new CompanyCustomerEntity(); - BeanUtils.copyProperties(company,customer); - BeanUtils.copyProperties(company,cc); + customerCompanyTOI.setType(1); + BeanUtils.copyProperties(company,customerCompanyTOI); BeanUtils.copyProperties(company,manager); // 鏍规嵁瀹㈡埛缁忕悊鍚嶇О鎵惧埌瀵瑰簲鐨勫憳宸d - for (EmployeeVO employeeVO : nameList){ - if (Objects.equals(manager.getManager(),employeeVO.getName())){ - customer.setManager(employeeVO.getId()); + if (nameList != null && manager.getManager() != null){ + for (EmployeeVO employeeVO : nameList){ + if (Objects.equals(manager.getManager(),employeeVO.getName())){ + customerCompanyTOI.setManager(employeeVO.getId()); + } + } + if (customerCompanyTOI.getManager() == null){ + return new ResponseResult().SUCCESS("瀵煎叆鏁版嵁澶辫触,"+manager.getManager()+"鍛樺伐涓嶅瓨鍦"); } } - this.saveCustomerCompany(customer,cc); + this.saveCustomerCompany(customerCompanyTOI); } - return true; + return ResponseResult.SUCCESS(); }catch (Exception e){ - ExceptionCast.cast(CrmsCode.CUSTOMER_IMPORT_EXSIT); - return false; + return new ResponseResult().SUCCESS("瀵煎叆鏁版嵁澶辫触,璇锋鏌ユ枃浠跺拰鏁版嵁鏍煎紡鎴栫◢鍚庡啀璇"); } } diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class index d58c2bf4565761cc4e11e9db24438acc79bc2ba6..8dfdaae24ee26391ad801cf1fa29d47f23edf022 100644 GIT binary patch literal 6289 zcmcgw`*#z^75+xDk!?wKuww^kXbq%|4Gx=xgaiyE!Zx5p2G_Ek1WL(TTAKxFSFBck zq|c;nLP;NKlBS`rq%CRsE~K#fC%~*(Gu>%n-wBueZ#j%VRS*3GluWR z@RmSVu2QzmqGn|^YeCOx0=qIfv#8|NbGk9F%;|<|Xw%0w(IukhHf7ahz<U=!SN*Qk>PSDV5p;x-(`@EzGEvF2~+v zi+x(B`aQQWC}$eBWflsW71%TqOi_RPxr$~jXY{fy@YX=)jJlvI1(n344O^Sntl@f7 zVg3Sh^JY=i4VOksVpkE^8; zqk-UC7t}(906UZr)mv+$DNs`rR=b;4=-KRSLzQike;Hs=o<;~H9L=Met?C6DawzQQ zj7gMh^h-p~lc|tboXrH1uBm~-PP&&Q`iDy3@W6?cQfq_|)$_Dy{i^L47X>G%J$Myc zFDNq1Nl#zxSz0dn=jlEdRIqkm2xQilr+fGS<&#-k&7Gx(onsio_XHkm+Et?t71i+Q zQdW}lXw!RnZa-+|mkBFTRu{AhhN@|(1%cAQ|Biocsd`3z$*E)MwZ=n_e+EN)HFXXf z;b4AbR$vkk5XX6)2sBU5gjo)q!lY8m&gR+!IK?2SIeQx%*DonNyn5cr^U93ulIOVG zX~Zm+RAX7dyiJ-t!8>5N+h@7D)yg{{$gJUH7bdwXDg(#iCa|cpQliBlNhD2wgpo9T z2az;QE4!4Hb|u}3!0z0R9=r8KhBGcvHLM_bBig|VfQY1!5MyTiQ! zmYjNrsaZK~+a=`)8(AfB!oPxtWl_TG#J!mXnwFDM6;jQl>5QhdVyVF3l1NufxJc8* zTBP#>4YOg9c|k9!maUBYy+e9ITWiR*%u!h2q1)CMnCfEZO`kO@R!);(1n%)!ua;dq zWtG*aYOGgJ&>MDDoNlgPaMl-fDzWN)lXU7_KZPW)4fhE=oC{UNLB!p%EKA@M=#Sy; z1h(U10^i3E68ItZCh#NtIEHr;co#pByZ@B;V*)?JB~sgrmI;fQ)y`IOIjzi_J$du| zyZ^p;>7VCcyLsWAEit^8z|Zl%)c1?v<;_c1{&n@eEeZTms{EBi@@xDif#1sE@9_Hs zF5^l9AIRY!a5Vu9a|xW0O#ww--eFv|-vhTSpIQ4<>*Zs!XS5veDW&mdt0N&*(s>e` zO@g9h1y8kj8hoD!oDbJ@|IgZ8;w~!_EYPQAkHHzsPLGU?WwQcD!k}D&)_OYEJ0+~o z;KAiIE6;8(e|z6*?&P+5rDZL{#JDr;rA7fiVit?0;eL@N(?@4gne^zXiPU6jT;Rd_ z#np-<(MGo4ATPV$Y;YmBPif%IUg81=Yh;aj!Lo#T;N$Kqd=b^iTz z=wH3b;BkT718Xe5Q~M zB@@B6XHzr2#-6YWvhCJn`)*T%C+I8atBosP|D7Obg+S!-=?OC9WACk1bLZ%#5^Uk0 zEt~nx_i_FrGDq{dg3nI^5L-d*LSJAR#=z$w(ZNYV{yUcgt{q{KfZFgn7{V0tg zJmBcqfSv3`pbgeZ;N1j=x^whRDOW=Yv{N<6up6X1l`H&=)8#7b#w(& zcR5qu;`MT|=YpX>p<7zf;<#}u+Sq@JK7Sfr$Y2x3>BOTX`4}yjz+q$^3;SItfrVK- zi4@_+aRdi3LiENW{fk3IMadXhu9Ru;qHw-8&7iDchM1PxZ|Rn=Z2_nlQqTeH;CxZR=UPL?1eIH4ej=QCWl#4o6$-e`E&k)PW5c>WAeLt-{>R|1q zof84p$cN|^=@>rkV;v7+oeZ#MF~#|Ih(121`IFHVmxoD0mlFarc%}jT-X`H|gg@5+ z{gA z&4=(*bED1$EOZ;_+q7EW1?qcs?fTAAA8Tq)-^vvGvDGQ|jRv|5hF4&l5wfis=_PV^ Vj&CBcoO964UYTQ?f^OQW{1=PJy$k>V literal 6430 zcmcgw`F9i775<)N5VprQ*g$}i)`hgTfiMXWAecafZ9s{P9m{qapmoO5U$gb zE=js%Yn!%7o0e|rM$f#RI@2hGg8^X~TD<=xT0 z{`1y50QTV@ZTK+k1S)Na!EQw_=G$=@3v#(ApB|T&PqpIH_>81|wjEF4$u>NN&$Z$6 z_=2Q;Q7)gBTb_~2XWQ@`o|l&|N!~BZ7hh?^3zGH%zA9;7lb5f{7ca`Em*nLe^72i2 zd0D>rRs!En;7S7D5$MWR%C=e1t&DEX8(CdoZ#ruh)SPz7D9)+pjG|V|8d_e>T7|M& zb~mX*wM>Hon&ar#v^Co>i)Dd>Y15ih%O#5v&skbQzie6;)mdFD zmeq4w);6t0RSOu@WW_cw8V)^e zdnIqv$d-~eM+|x*Y~jnY@wkM{kF%#s;83)(X6zJLJF45~&D^*qjkI-(Fz<_u@@0Ki zoi&QNaDY$f_NZ1WF&k+7s(CG6p@D5`22YAM~;W%oHl9Y3gZ$pazrW=6-SsrhwEyfu#@2>h<;HCoajGO&$U7m;zo`h zty?CJd69RL+B2_W8+lcxIpNt@TT6>2zn<=LjSBW24jGxTWpxi8A%924*0L8FVW$ie z_^!Z#rb9LCKv7MPF0~$<`z<3ma z&Ps{yhH|J&t*3Ojger@-BOvtX3t2rsvQRQDyISx&-IlZ99I)&K>UrBPsV8}n$1(|i z&mWYhAp4hl6bLlUC!GnYW|catNxe|Y(N&q#9_x+9l&AxY(XgxROqA#e zCz{nc`l}7D!x^mnyj9SLet|vN&gn2Y5xn4{=1nkMQFJ zexl%~xGJUpj15`AtN3{WzfkZ?yq3VP6#N>$kvzXua1F01cwO#&1Ft0TI|Xmz_X@7# zhJu?|Qt%e8Ch)d`Kj4oF-oc*~{8^I!B3b?_ms#W#oR^mi_?v>i<0=n;utT*o$@Q_(3 zm_>K0??|1RPNq}CGvmpLcVt+YtPy@F+MEvdHnKS^u$GAiZ>A)FfU12dFxZU5Xl6=Y@60Y@Vl=WkRo}BQBN2nZ<9d&e*san z2@;`=wN1&#lF2(Y&P4UW+fchLuy)@HMi^>UQlsNz6O%I|6BA<-{AZ_^KY?xh#pKb; z`$zaSxtjNn^4`unk8)lIxKeo+ysz4E1LAc)#IS=`xfv9+lUK#vfL*woE4EKEwK&X= z@!mq(rneD$^akRO?06F`J9pi^gjFp(l2>2jyRf{2j=UW%k0+1ZxCi$-IyPYspJGxX z_VRzKIPT+fN1PkLS0E9NFP+@JpT7fVAj&w1`$^v(C*cse50tro@H7rr*L&QxwEh7c z@vJ|}y;4`ZWAzdeF^(9u1}7bZH@e#bgWGWwAEPK~+$zCElu=2?C`F=sh(8*2l(%CT z^0fb(-pQ~0DNp;F7)E#f6P*&uH_&>cU*JR^9;SPo6|eyr zOa>;$-o;jtN?^)2`C*FjO`Z-+egq#Uy%l03Z;$dP)2v-qmGnRo1Wr?Zv=nX>qqDl*AIaX)p&cGJqXtfNUI0F2p|+m*YYw>oQ9*f?cAAtQBq}L?@<8LMOX2r!%Hc zUdwDe`5~j&WEn<<&5xO9Flwnc$qCTacJn$;gm{ zY>@#}7^Vuz9?@io4pgbhbD5+k^D#?Iu3}DQG@1N>*_bhEvpdTyMqf@Q1`(jgL>U-Z zfNo+CXJBMt1M;E55@2CT24PfTh-xVe)swl|bQNTvYFQZ>WPv6zF$jQ3B?e_MtpWi4 C!B8Op diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class index a68be8685f0ffb4e714e2d7b99195e93d3cf1e49..cb384b7c3f54509f40a5f4262bcec4b2648571f0 100644 GIT binary patch literal 21978 zcmc&+34B!5x&OYCN$zBFfe;8fptvEj1O^0AgQ5_E1e1UyfVkn13}Gahi8B)**0pt^ z?pmdS`@*7C5yXTTtJW%3YpquM`kvjiC20Fz_t*DotMdNexy#&1CJXrbof8edyL z!}z))BEG4BZ{}Nyi1`k=y3?SaN!M=_@Lha&fJX5~gTE;h?lE{%fQsc6oB3WLa-YHX z2Pnu782n&9Kg179_ebO%kIL<10h+~I@_8$73*ci*fVcDGLi>pV{uVzeG@p_Yt@81- z^xGj%pDEy-yi1-wYw&JAKPP0`gq?PS_XKDvcgVx%<)hQ!7Xow=x5{+B9pD%FC3*eJ ze*TWMyyEBY%KfVbza~^#4c;4|Gv)jB0L_u9e2?GAJ99Yz#DCKCrk}qr-*3ss4`k5W z2LCWXmBQvMen&pu6`DVitM`Q3`!by$8~iT;s+C@~(z26(BE9}qp8cELejv9$6|R0( zz(40-$j2`Y{!pgzQGkENzczTE!Cijd@8^#LR43eh!oTtJZv(VaZvLJBLq2|I@bB~a z5B$df|B3(X=f4>Ip8;x?N&PiI32v2#|0N&)Ed>51$bD+?-vhK>sQiOJldI1S{vtq^ z3%{510YhQ(R|&9J$(+_JmOgDDq7)cZIfn8D=z8gWJ%5f5>2N)_`Bko8Um5 zl^;+6Re;whQImGZBMmiLs2v6QQ%4)>m;i0XeATf5+AjQVSI416jghP4Sc+XHL1ZanJ z92cOS!u(3VrlYP_K)7-}L@L0wBS6>o|p=7!@;6D#ZDO`-bmrO{YJXjL>8j@3oO zjiI_kQxdK5P+7Y3Os3%CmRKs<6j>TgMprgQX2)XjR5%rl$C6B^RK^nxp=5IclvX9e zO_6o+#G25`NH~@ZtqRwr;)&K!*c}j>-I9v0izXuVAUmu%l1Rp5;YQEfn5Ol^+M=F= zK&uGzX%5F)Gf17-52>;qV?e2JH9(jbi8jP)B8j!px(HKWbXG~v(EM&=Kqv3CXe^qV z#gsE{{8A=gS-c*khEzslk?NMFm61ek7+8Yy%6MJ4acMXam3zC=(@B%2|Yk;Rc@ zOCx4IJv&cLSc}Gx(>a9Ro>8C^hycKNYa~*;5G&WLnHiP^EIdp`FOy|;w95vAsWkhW z2LdDjkXO3vpA~?}`cx#Agbs#)M?)0ahA~iNQA>?BrZLRnsvPQ@YSkz~Dx6llASYUn z&!Ojg=2jVxHDK(BOtEZjc0{wR+j?cnsJramiGo*GT51>0oCWgXgId}{d&j|XDrz4R zPRrf3*PJfuozs5T;4}}e3s+tesZ0HHChu51Yn}Bw4sP<=@Mobis3sMzTT>No)^cWsYw5L*hc z4{{#qp_s=|hoC(>p*H}Wv*5CHA;|e+5M}YrX`fk>k`M>a8nWZjr_}asz_jUc%#MxW zteJ)ifrFN2c(_O=kjIVdVX(({v&!I;&to!@Ep>H~Bs9{uDjaP@L$rQ&A`xz78q;lr z*H+nc6+?Y&AKkR9NT>W71VQ0cO9Ggk+&^=@ylQwdyw;tmv${;DkIN2tZyv@OS-Y@e z=6GP>dO^>FL)L5|ia5iOHbE^J+ZNt1k z*aD4U@E~!p2RbmgDwl3QXq8J31(!yh6+R8qgR?g;u9h z&7t}DkQ4w7PE0#fl8*v=sjO7MbcEHq^*18ovo0C>TkNrU<#=_oNGl-oJK-|ZfZxru zpojSYD{kW1Z?tHG0h=sl=Ik#=%#lb<%}`Sfbs`EAC^Ik((jeE0gMzh%N3;QRS|p@# zQ1i6SKSYKs#c>Gfxm6q*DQ8X@v@DT95||+}4db%fq;-*%p(Z3t(dKX>6{>Qs=0zJL zy`^-0x;m_rn?8vb?mK+w5p`?#>-D>K+zflu6pkS+N_5Z1dljN8tA90IxyY}$bW6;0 z^=b=i*^G2wfb{J)Jt6+Vh2PmwkN{vBs#k`Z&SXmYrEGPiZcV%eX>H0IN@q#tZU1eF zln(2hmVULb*X$l<#NQlFrfR_nmbfkvfu>kD`NtRX)yBaBtM1;V+c%msR zl?780>okt_*;w?T=0IyDDu-` zrLtK{7h*g(i{8K*=x8|I0eFUE4h2b<4pP@q3lK@NQ-S^o=q%M6vV#Dsq)gxM&U@eS zcJ^$y+wA%#(L-Z(U86ffebdM`9dUC7$wr7h*5cWCgft@?_A1^!PyAA9mA@48J zMiwe;I}TDOr2$OB_TEg7{WIoZQ~z>Pu!&eR2*5f@5m`^*xkKQ&N4D7iO8jrmLi^74 z{~NylcO}U3`iEv-a&X_BGVGrdqDf6AHlYcj^LDU5HzCk(yzs z6{cFL>I_wHs)$-;(hKx$Lp7LcwThbDz^hGliCSZ-Mpb9hi}aGAnoJc_ag#6MHSnzi zVP{bS7A#fc6n%<6*|DYTj(fV=w{*4d+PCMHuBYzlx^KIwn$@MIN)QqsY@}oX#5VX@ z>QbgkihMM1OxS8ddYWD_U09Mx!KC+9%1|w)TC3KXoTt_!!|K}b&~G+9wtvIzT{k{> zjHz1HWo~2FV>>_Dy#Zl2c!k&?B;2E2hJ`TkJV4(Z>2n!cbS3>PmH$ zsjgPnFp+$J)l^>-1-VvTmm#PUV4CWBb%Uuk$j8^!ji$Ou5WZR6Vyau!ZA>%z<*>|h zJ&w9tp4?Qot2<0}r%?Qcy3JH~$?e^uf*aL0k-wVi9<|9-o71}E7I97bjDC;g!BqFE z`v$^+H?Xp~k^HTHaJ>T^pk?H!uBRW_zoGq;=dRuV{O$W*dU*deJNE6l`jc%NK6!XM zLdSi3p4j*N^B?c*?0VoPL)~wx2NX6F%zZChvv1F4r}-gMJ**xv)uZ%XN7nQV-O7Za z9y8SzwbfADOtoE|pY^qP;r{Ip@4x>grjziK%v|XH2zI?P8iTAUd8bSQP)1eiW=nV7nBy`B@R< z-IxUz^3a172?vvfaMr`RcD&Ga-Io1#KePXqr!BQFfm^a{RN6pskVlF&1XyQg8S%-E z_Wh4uz5l^2`#0XOud}V|&YLZQ`yYCt>xJ9)Z`krDM9j1C--GEAa+K@R}rC6y>rjhzd)|3)6YQ=w(s;VZ{*B?E9 zerYmU+SDZGA1`=8ecMzoDhS<7S*ffJOz&gY#bfnReV!tuW1rADvTwf(p0!!Z9RX}s zuZSmB;M9eoUN+Tt=si=tqM#630tQ6aCT8*l>Q!OywSL4POK#H7h#rDd3&Ghd2J=|~ z<8?7w-&1cKs`%@e{NQYnEqHpQ4j~-JpFI+jYJs~=Z3jpaZuPZ%uod<$eA0UyBV%-i zcv&&Vtb5w37pH*Meg49bOo0&_vp{qAF?`8SzDsI--WVt@0f z49-@y#H?+%dG-YoEi3rb)5>5R*=19>84BmED)l7bE%s!L2kByDt)4ofJw-X&_ZGHP zvvUSH^e|_n;`T=ENm<$O_RdIe=@I^5p2#>{$I=Z2nkhH_pno zsp}PeS0MY$kARGUS0G|W{+g*?F5Aat(|GGV;T)VQTq3!e?7+sGTaoR+L8hW|R4Sv| zY!mCb0!&nPYQhJKm?_?*^@di7i}>;cJJ_0}PjGVKktiVdJh==d|c9*NpuMRobP z6*aZx)n(|>DY+1cAGFgaj~{e1Y)FC}a&io& z#emp1*>Qvu88;poj}=R4S<&`fL?xWG_92hYu&OSyTHo{tZIF;-*po`P$+?!Ca6Qg$ z6?-S_kigSo3nM#;6pk$Zj_paS+r|f`WtHLdM61H7)nFMXRG=YxQgdYn$V_5*`w^Lb z4vrsZr0g0B=uGl5XFYUwku>q{{r#!9)dU-%_YdUAbjA!FBCw%@q=zS}%RotQ8;Yfs zURCi_bXBXhD`|Sq)*!9##VC5sfun%7TnP5LSY* zlkTHDJXoiMGDR1;%0MQRImknEaOSxf_fSuFHn1vo&rDJfokkP@9mE6@f7A`;M`Q#( zPLK~dF;<6@)v)whz5uT;rf>W}S=({})*DahMvR+~)qRMX$WdM#n+ZvssBsAzunOxE zU`019i>6lBtd2xd(8d=m8SOtqu}{mVmC)lDZL!SKA{>SrqbtKJ!!}E9wlyb=gX-~h zRdN`;x1$z4=CVvCk(h@=WQlkyAec5V2r`C2el-?MU+rNH{vW20hd)4xCShf=SKPg- z=$t_cmFbW`n+M0WuP8rv(Za>G_^PR>?e*w?pVWY-PL-X6&W)=?nDjv?El~QZ3}+!A zsdf76$Zky3mRBvRoLyV)FypUYSi7QnNo6I@O2TB-Ybj)E%D#uwM}BLifddgJCjm*z zE1Z!ir{k|IFEs;-l~siLbLEEKQ(A~K7b7yAKsuim8*YVZBfO5l>EHz8u8S>nQLL!3 z(aOWAj|TBT{%9<<)Y`=|LDrL|7l$atc;&5oEQ?%3*w)@oq71~#J7^I#U5?gQtZ)&9oTMd z#kj|&Fg{-er4YWc{YAMG+KG2+(y!rDUPLsW_TtmDI?(I%J=`(9L2rTq3|5dVJSFOw zFsY3c{^j7GZ&Ev`O)P1ryi(tU-DCuPlRC(sL#4UF+z!geZf{;NuY&?Ir2-7b-W#q4 z$<<(mE#o1jM$p(x7Y2XgN(?EC7`?ym2>5u7OCGRw}-~r1IBv?Ou&GN&VZ8c11vW5%fMNV zUj9-VjO$AP${HF%F&as68cog6fFzwtDVj@bsS=BS9<4{OR%)TI&=qt!-9%UFWuFiD z=h6uJ1N{*cD?#l~^k-0OLEB&GKhbst+Wt!ag*Kq!F8fCMZ~7Y$8wpyU(%*raEI(NB=Yj<1dEOQ4j8w)Y2&Y|-RufEyCMflkR~2Tg%i`GP)Z)m|Ez z(X171Y8#y>gS;zpLV87@-zAfRzIK{cn(Hn~Zk9!nG4`UkW2Sc>lesRIT2|9A%<%@y zbpzJrCg5~4*5wwg%WYIbx6?Ez;T$N%0=kRBbPruhn}GDa7;zunP4`2JAE2F3pH6xh zcI#2SRu@2Q=g?8~In>dI-iPZ|^I^w!_(m|&xnq_y9#VjiApqbk8=}}^Ki%zqe zj@(54pl=(YNvj|Tp04N_yv~AqvKVC8vV61^(6a!4HysUMG#TFLWO$?5@I?z?t7>7e zFNO~i_aGK$GMz}DvL918nZ|QI?2-@tM&NJj-_p>naiLqIZ55&mI+qLZRB6DDc1E)4 zjKo#0)r$w&YB7rP^7%6w4&(C$od(2UjD9;C|NaIx#1KJEehLUhl@$-cx?wZhhV?jb zDX?DMNwa|E8C9KhCcbA^Pb`7Em^cX^C7m<}O=Wv%?roF~D9WpXU6 zvBcOC&7WAI^+aQyy*jUnULG@NLI563mjZhh}K z)&i6z{|p?Liq!y)%Lahs2f*N`!0~6m@#nztm%#Bu;P?@6{1tHgHE`SqB)WRRaTFiX z14qknXX1Edb{t1*9FNMxaa0c+kLF`69I;k8S{^UzLmnYauTyT$lRc&F+$_?zd;lo@ z9w_|*DE$#A{Rt@j8Ik5+=r}m0$#6}jFl%$*j;dkQ($aR3D{U9?v3#6HX{jr1)wZ;i zy3$siA#FvJ^En-7N!jOg3UgY_j_m=@7(U*HN4%)0>yk7)S;Wj%M@I*}s5r87UZ1Fp zg{31_TpG!FbUcj9RIK!=uw~`2Vrev%xM(clv3!C?qsm32+;;X;T{Ox; zx0}q=*t$0^o6L;u0m^uuV1dG~01`i*KkE1c`@33fPzRll$QtH%e1024`Fi~T`W;HoO~OFi&k!>;u3xLGOe^c#WpIMWVh7WEeCc_oK#d_ z6zQZoX#A=@)KF5ix|3GoCfY`qw9%Sv6sX!oO?xP|6TlGs@x9at1N0iM=fMXOj{ww% z0g}V#T}?fo1mL`ONOi4EW;$e=`uj)PX;No1_>1lneh9 zghvkimZVPw{3inbX*7YS(_g-@Yr2s)(EuD0o^SaXrrrjnlcD^ zCvL83qpxl|@J=wdjlQO5aV=&sL2j>Gw(YEJfFsJ1%B$PiWYG-E$4;!Q7GiFd=7r{X)(2OEq;$_32ot}_&up*^b#+pSNJ@7 zlh3Dj_#*lVub>Y&On>E-^aa;Jsp=8sMG(TQ;?caCCvub*;NbFkI8j}X|1yohcq(fRp(zQSg6>Z}R7SgmLfHu&0Oytstk5>lF@fdXOrVm#Nx*zz3lNuB zNl-({UJ4+nzI`)QPQoS1OSqhk)adkyZFEQ8gEU&c3vp4bFY+HGQ(u@5(eMcq+v!fI zy-yVI8`~&9=wn=9^iU*F1_)X$cS+sL3d$`r`86!`wRAdPM|1glI-75xYTf`3bu(Se zx4=u?<^}|F0d_Tl2gwf`oW-OD2(?wrY2Zb8DjuhS&%srW?k8m(YZ3FwCR?q@d%5LaX+yqSjbz3{~M(OACUHT|IP&SVPL=$VL7uZ3DFnCLOQ z6pEPx#SZYfP*0z;qBZgw`J)m%#45t8SUJ~?6FTVuShoj@9@<3@x6van)1z(l7_3`0 z*0%us-{E_N@(TlKsRGM)NK5l(8sc0xZll5OweMndEA?R&3uMk1=@&y;DK}EdxZ^R( z3;HUhA}CGQ39;+iX^YtZbf!B2+D^P33;j4I{{)rrlUU%Vu)t4KgrA{HQ4CG-v#;Zc07YG#Fdm3a&+Y`*DVWJEgxYS_W`ZpWPC*Ly~oq+NxpoL$QwkO)?Th`T+ZS)k%K2BKJCa6Cx zW6!~`%{0s&=IPQnDUJLr6mp1Pf(X6>~D# z&|UmC0>B^AWBe{{;~(kOkaAlUVwNzxfFFW*r7pwdp_;uOKA|4S0~&X&9@mvp2}mE; zl~;*T9@Z6Ft6U>tpFH~jS)$YHLjY{``URfKTAfUJU&spmR_yBmyi^-rU4zikUqtMx zWYaLd|DXz3*1ywHpMs23Ca|0z;Okw?+^SBj!gAs-g7ElNw9B{fJiL>3V4&|z$Mnh&YoQsj`$xKX+!m8#t%zO$$#ps~q zPmg*su@g+}>Wc{^lKclS@kcQ6r+%3@616moiAJQE8B82$Gtp!-aW%fh#ErHS3n;pl zK?swUL}>G~L0{USjga2_H*70>N<;YX$l(3~gZ7zbN#a;ga&Z~$;xbwn>%=UNM%p3e z*?f$YLZ4;KP|+5I&;gGHC4><@8PsV|76y0sU{LuW0l73p<>7Z94f%n|gJ4jWP&25j zlRX&3G8P78Kh9>*-O(BOZCa5A%G%L6Tff)d(cw!uf!SG=GrqJ?3TT#eCOM_2-J+9} z0sylX|JEgWy$a(&5fIsm-?Y5=%%J+A`jL7EznywL+7bT4SLW~r{yN{NuWser`1bz+ D>=KN0 literal 20486 zcmcg!34B!5x&OYCN$zBFfe;8dsJJ0p5(b5$CQ2m>5=a6i0R&W>BtsaPCCp5axU^ce zDlXN!qoPtP)n{9^ngy)VO}jm7Ul-dx+rGZ4wS9ek@7d*PtMdNexl8U$CJSwS{K(9` z=brPOZ{N;MzV-fr=ZI*rdMrSn<_!Tpmp97CCi&PLpnZIve4Jm5j|)n83tw2mVQw#> zDcn&;#L*JIh_{y!b5gFl4f>``-BH3RP6y~{&KTSy5Ox}Tae&HYi(T9+KrS)((f|ed zGJ`KK=8y8nWcn4d$CYyX@c_m6s$#yHuLlf-jq>28 z626%~DGzQ5@U8qQ0dSija=XEI1SrIJ%Co!V<8FiR3D6?mAcX7*@V$JWY<$10+bd%a z$kl@~_K?B*0(7Pz{%L-==8Vp7*7o=kRPxA4&!1$b8 zeLg_l`~^Y&i2&`AtDE^rdHR%$eNk?omfL4!|GpCL=K=W`H28p^d@#Vz@|O&L&fw?$ ze8|sV4$x-7>MQ(JKYuMio8;!}{DOSEXz(|R`J4Q$0Dqgm z|3b$8P4woM^6~Ehx{7}#AFmnwx_rN3@UQ*+W`M5Y-^l%MOf?^rSP%cqCOHPBK+AbtL1V&hU&!aKvESQrv-Ok^TmkyK5-A+KV%^6X5;!_kDL zAE^kyrZeuIYpwg5d0EK1OM5cWSUR*O+!a|TS3qlGDw6Jo@+}?O6plfe6S<_C_LYt06Xv7TGN%6yv$8@@=bInF^zV1JeS%S$jAck9H<|Lh;^q zsB*eH){_o(BvX-4Jdz1_hBM(%qs#{wU$VR%x_`16NqDV*PgF)M2izVm3mBD$SOlZx7JGM86yR~1EaH7aijLgPR z3V9Cft~rv~mh4;;7RhJeo1sqH?KseCdmB5MmV4cgR#aKo^EjMUbG&7wsw!!6w z4x3#bLvd!*i%S`Y343+Yvla?oo)eH9G*2HJ&7830Vp-NIB|6_?(9?>sJGuF9B7Sz&sQ%TQid1;8|CGevGQMqx&80Asz2%^Kfa6p$dROPd6e_ zB%6^Z%^l{g=jFI$;K`eqjC4;&Mw;}@yXL?fL*=b`VH^Np^)8U;irH*u&;&bye+#5$7{@BbLdw~N!XW=~XY@(w| z7BD7%x1Dc_KggHrW>QFXk?2a?^(4A&L&IUo#in@av-OlI_Cb(mL(fB<(P3r02=Cdd z6FN>j!3LwS9dbyS~ltk%dPJUNj4gbWJ23AneNaEd`KpW0VipzksP?h z-rmYcO^37Atv`mu!@6W>Qn|`B#qnAyP^ifkB=gzaXmpP5+&o#>k)@#d_#tk(2t5R}6AWdbQNUzMom{sq z(y=|+gUTl3O?&cGUAC|F=(;m9rhblChQZMM-Qjem4VXaW9jOQu$+{^{XP_9?wGl~l zT32)OA!)}Hoff#!uPC7_R|FJ^OK$F`W%h<&1%1>`UkVXDVY>g-X>C`fm1Wje-s zn2{jdDm83G04z_Y;$f-XOsRl|_}G~bMGw~;)>=vB-&`;ib|lg1(8|1PjjsB3{XcB% zjffuoEWaojO}M_+$q-;)HcCUKu7}TJJ*dQW<}x$^{0t`?2$I?!q3xsG5>2wxwy^;W zbD#i#b{5mOb8#O%H_~u&;@DEVYvEEiI*4I*t4qgR4vh{YA2|{TO45;xT8`Hxd1PwOyzmEhPh($pF-ch=Jnt*5i z2Aqdw_G2fF|41ryEbagQ!P}Aj-^YFjij@V#!twUb@GQ5zIBOxi{oKZR!zvSa`(5&o z8<}3xJRZY0XLU6_-OOwQ9lc>a4q0ZGtZ*q%C^sFEd1}5KCXHrEB$+{DEi?qOaA!Ey188nP(SBso7w8EzUQFdz#ik0V5>uJ@ z;Q3r(^67krNuQxd3^l=|J~a`&8Bmw`n;izH`NL1L{pulW}!~XjxZ*l z#b|X`3meCf@CfZnL!E4@*=mld=Bjzf;k*KIb4c;|o?bGzqUIwY=AAogNp7eLQ&p-e zfv~`&pQwcgfwTP-tr1veV1)>L&OntIh>s^#=kCiIkt6w9T<+Z=VmvQ==J>KqYk12+lCRmlH` z7_Dn}3GgO;S*sjp?#+iji?r#rfyZ7uaNyTZ9(;Z8 z4TegaDx=W!G+%r6%GU<=IKw+lb+OuIs$P1+5tydXty>LsiK#ACml^7EQ+-q|$h$2z zeB-kZy>b8Zruvw=%v4v%$Cc{irn*X9J%%RbNtBotj*BUtI&3_Aba>~uJEu=FwxUZy z;wbxi=xM#E+ci)kdY9fCkL+!EXYXt>GrZj=gt-N#x>gJW3VoegVR9ueG}ZNLv*_<` zQ{A9$G}TS&d^FaEjLIoY#CUFInxUWMtx6!;Ui_U6p~9v2US4L+%E zG1aZ=Q%p6&^}Ie%A1`$z6P;0gb{f**GxQNTquT)I+%3g(07qV1lBq2?VKvlkrn;RD znd%O8r!CEK!L@;zT&?ah)!phI!Ew)cG{~DXN|t|QLT!Uk@3n*qj@%~>;C{6it=Mtt zp(9pD!E|nSWOi*Uh+e5fQT_vNC!$N$>7FRrfmXuyXfgzc>|?hqC|Rpd@zOi4WCAVh zAy;kJvg6^~2t5F%%F&fD`-~GA!qDzktrAKn=Aa8BhkHl}7xb9)y7%xZ929`i;PQO@fRZe5qx^oG=7 zgtR6*v&>BZwA&s*i1vAU-fiP)Xk=HR^IQE%SAsk=~ClkkIVYam=VRhD*+ZQ0h%4#%O zS%{<7h=;pjHr^h?Z~)%YKWjZem!pR9bd_up@m`L42!|p0F@qj@kTWt#`-tU3dC~CB z&MKE&c4kHGZ10i(T@y6(MYZ9$cvat3$WgOpaK^wENCi>N zWSf_Z_DT6H-g*tF7B2&>lgwR?SCZYmYf?$Xx=d8waLDRC+Q5cOKn@S2PvL6!*Rv9+zCrLMu!fi~2uOiT0f zVOaMG?|#(bJ)cZCk(uSdwg8wpw~dKJBvls+r_-Volh-t?ZC%~6tZ7T#y4JSU%?)dr z&d$%daqkIES}|5T4olOpRS{lZ3X5irQxS29GD>)t*x}?a4u$%CyP(eXavxbny6SHc zRW2x3WJc?{y1IteR;CqRxVCAHpajEpDf>;UQGAjPm&4wpLq9}Q3{CdFm1hyW(u>%* zbu$~1OK+AmMlvXPoOpMp)j1BAK-rS4jo?Theg!vn4djWMZiNcHk(U`9_i9lf-cSy% z5OU_uLu<>*pR{Ia?=OlKPFp8gCujL!R}R`b^$P92P+Ztt85)xlyHe~_AHhLt#KpcK z+=P8`17@KXb;%cFVG9L{V5RXEj#$!WUl zg-BE_31D+fcHl%N0p8l(25_*-i>&p~Ii%3QbLaarNoxpBN4KZt)yXW19UySZ6J&-b zP0V7XK9v&JEwh@FndsJD>(I;ep2y=A#1Xu#*S|OxZR?(hrx4th*PApBHjm}r!C^>^ z1PA?&L$2lGEzfc6ox93|gY{-Xwt1k083)iD>-4~!nEe)j`@TRf8jy-TGk5=qF*K?i zjtNWrQMWpnmX%34RRi?I*cMK=Ag9*)1@`(9`o<3~>);@a^(JU~5bNgWjYnch^70|x zTL?)jCbkX(kix|&prQvhL^Io3w?!fu80@o_j*eaOP@g$Y(1q&99j|ExFpud_IOdlWS4Ls?CZEHFJ ze~=^;;YIXl8eS%UL)UAH&PyPnI-O%^_u%9TTN=(?vwCeCzFHgGMtr$=RA}I*uArU% zfg4vu0QyZ7tx)=^4oB_K)DHc1Yz`7_4b5wsmbEoF$oN}Uw{2-z*VKg9rr@$VwHE5P zobsj5qZG_mT{#|UI2FxMTtQS3<8(rr708yru=1+VSh<1Z=u{w*Cck#1*hts_i-vMxzYcHJJ*eDAnN?Rk@ z#juVE2wq$D%LX`W@G8F*FotV?PTuEggjbK?tZap}l3pYiBJcW!riQi#yyFttF;tyu zcVWkE&u&g6A3nr{ic%yra>e55E!sW68p%!!eW_+kY>$WZ>W8y`m}n)5Li^58=(-m*C6n8GP|APDs}nW=EXDiAE0Bl8BI#My%zO@a*v{5M zsXx5av!IUp(AskJwcg-lLxzgRTH&kluF#`QCy#(uHa$!;N1sP0&_4P!;lQ4Jq~z=m z*Zc8HT1EK&EWVW-S`8b+iPf+%obBa|mE#`Ajre>LkV5#z84(rE?VHX@os zU&N`9I+@^G)Mua15`pZh<-k*UM-!)lrZdKS zXY6W0d&!0NT^HKRSo=M|IDz;u2=W{BF9v;I|NntOKQ!n^2EAg?Bux1+ekK$EX9BiF zU%?O4Pw1z%1{@2l3o&+S#fvoYARWE&DLST~j(tMpUNJ~B6*X77PmYr(m3?&lQ*=Tf zoj5=z-9xi5a~5Wvtf*yvB~)j2wNK#m)0_=K-vG@OQ1dWhzB8dBcLKIA&>}rmD`O`J zjsW*i3^&oz{3 z^b7hojKwkbOZs<=fmBzNm(s83HLzm_h3R#A11u4y2B=`tyA(9&*9$fG3K`RcYd8zF zxpp4_6=CeaxVbh!l`Y_0)eCfr7=&C7(gK)-FX)3wyg)OuhP9Q1`e>mn^0Ir*5W8WV zl~qAsKb=xt=yJR;o8#`BQ*-A4d&`cN!-9xDhPx}k^sB&(tHJbZ!1QaWims!@bUiF= zH>~PLYNuPEv$xVm={7vM9rko59Npb;TlZ)|oCi&=qvPl|uqhvA9i>I$!`zAVTlx=Z z+CGelNPJi`k$y-2skQHbE0P1QNFKCBQbjk>@9DoFM6nw2W!4V=4HzP>Qu5j2dY4W& z=zkVv3+*lX1C~As`JE2oiO}K|FOa|Dxjj_K@GFa;sf(K{2kAo$A`B>d16XWS4A7E6 zI!)11dx{8ZfKDHzGqhvU%fulLP_;F7>^-kFF+?09$O+wRJ@vC^9Lj;-`ZQ&BO$OH<)D-lwIk-N!4-@bxyf z5FY|7_y)fIf*(bHg%ofqY%vzbR-`fMtT;$#f}Lj#(9)^&;q8+;ZtkOHWwm`&*GKhz z)PU#9@%)@VS}}ClsM$S8E5Yl^iauJ^M@^#S;9s+%B|h-gEcZb);H|IVaqMq7iWdXt64sCt#svs|$sDKK9~2i_z=e6>!s@ZP@O^OM2jIdF!G#}zrdPm) zAA<`&8IucQi#c52f-$)8i(y>wxw`NyxFK3uE0TPX3JV?|F6lMHCH;}HX?z{>egoF? zCQXHZIS&404m`>t_>dt<*SeCfbtPSEOZqrh(u=Yr4R>Gs9xWML)P=67kB~@5kZZ># z@@)|L4v73Khym%x}vJ=yt4BT(q?#z3kGOQW!Z%XX%lY3ebnAZ9s4QJ{1in7XzP>Onr}lK zlC(iG-&#Zj;u7++Nu@jie~V!vRr4gOh;!g$?N_;?FQg9BiKMJ~gkSwEFS7kLXwUUl(;!`)`6E3l!cIgrxzYveyT)eyHkb7ap`8xv zXG3#|XMy!6gY~m%KF^^lo=Xe40)N_K9xdki5Jjb{%YK^cvhsMFm5V(LtZ^Aw<6+=5 zkf2xE48%&!KuHEbUOJZr%+n!aodXm+gKw~fw<2*Xeu|?8KV0|&A8EOhOmB- zD0=B2ZI^;c*DO9bW6}2FVDTVnZNFNspzTt`#GsyW$+8l-NLKp~Qa3JkpjHY7A`zWK6>sujfMEz$X6I#}xd6<*B@xYq5J1U%;#JXH3rJ3o#Pr^SK=(9o)&CS`+ud z2p^ys9E9a4`&`(y?V)2S5D9^quybHF%Adym7&9?hJGsC5k3tHEi6QTzaz`oesWrp~YEr;j3>`GSRg^s)U^9P}|R zuzE5o0|Nl9ktX4$dI8F7Op;g>NExZ$^c?n&}mqGMb&t%G{(_U48YO|*rG+Jhnk|!kSV>qzm~GYf zO5Uur*>Weal${pZsdw`LUD;9v{(QWuP^ixI(bWg(nvG?j=%;HXpo3r6_0jcGw^*H| z8Nycn1l03dGWj~1%-18P?xxv%gX_ov-=$2Fy|jZLpbS4m*YZAB*r3E^%x<@F zwA*eR%|Iej4Q3UfHMInu@DLbtE$*a+ROptw*2qg3kq9@HjCW}^T0Mo+SE67m#g%WO zW+!SCr^}bNWBmiMJKki=^(a z)Chn37dlQVaw)hW&KL1@06&&E>mg43b^{*6QqUb!8t178={^YR{+5a=@V!z#H0Lbi zEt5I?5;*r=n!qnp8Glc6W4^W4rFW|4hR{0|-u+cgiHZ38b5LR<^Ew_L#*dQUr5KLH zULf(nXh^&YBz^`YehwslF%}XiU8FAc!{e+(+s=yw9$84NvXQs~-{RtC+PNDHUF#r} zNoyjk`N5!X$e~S>*^E+>e@&D4P5dpd-@u{$R-jswP%+O;M4*edWEd=p9BEu2XnPwgY9~zF}TR`v+K=6-1@J~SS&*Mi>i_k()x^B4$ ziWo}+asp%{=$;|W_!4axVw81;(5Uyd&k&GEtpSx*Lx@+GqAz4?=SPr@iCkKBgf2mZ yZo|*IG_O~S@t_QkuIAsXMP~=q!)m|!4F1kuC&rP?bA$?z=ydTmeHG(4C;kskFj$)a diff --git a/dq-financial-hrms-auth/target/classes/bootstrap.properties b/dq-financial-hrms-auth/target/classes/bootstrap.properties new file mode 100644 index 00000000..3187c1a2 --- /dev/null +++ b/dq-financial-hrms-auth/target/classes/bootstrap.properties @@ -0,0 +1,29 @@ + +#锟斤拷锟斤拷锟斤拷锟斤拷 +spring.application.name=dq-financial-hrms-auth +#锟斤拷锟斤拷锟斤拷锟侥碉拷址 +spring.cloud.nacos.config.server-addr=192.168.31.142:8848 +spring.cloud.nacos.config.namespace=7632bdaa-3381-4669-b3f9-2fc73be451e8 +#spring.cloud.nacos.config.group=prod + +spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml +spring.cloud.nacos.config.ext-config[0].group=dev +spring.cloud.nacos.config.ext-config[0].refresh=true + +spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml +spring.cloud.nacos.config.ext-config[1].group=dev +spring.cloud.nacos.config.ext-config[1].refresh=true + +spring.cloud.nacos.config.ext-config[2].data-id=other.yml +spring.cloud.nacos.config.ext-config[2].group=dev +spring.cloud.nacos.config.ext-config[2].refresh=true + +spring.redis.host=192.168.232.128 +spring.redis.port=6379 +spring.redis.password= +spring.redis.database=0 +spring.redis.timeout=30000 +spring.redis.jedis.pool.max-active=8 +spring.redis.jedis.pool.max-wait=-1 +spring.redis.jedis.pool.max-idle=8 +spring.redis.jedis.pool.min-idle=0 diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/DqFinancialHrmsAuthApplication.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/DqFinancialHrmsAuthApplication.class new file mode 100644 index 0000000000000000000000000000000000000000..e321ab415c7d769613f6d6744d660e4b59f61aa5 GIT binary patch literal 1077 zcmbVLO>Yx15FMv!lP)Q3Qz(@0wwE-A^#xUkRF%?{h(myip!Cp_*Ksy(ckR^cE%38A zfjIC3_)&=QZkhxs%7K;E-kGuAn|U+)`_Io`0Pqs_Jt)HC5{_aj4y0m= zOBT_gVW}O`)9d!F>#d2CCiPRxYJ zvNb16VB?*zL)|}PhQ-1Pg9p8?P7N1r>GIxROz%5J0y`g5Wo0aSGLcwbQz>n;^bqb< zN1Ko)BbU#>v3%C%itoEUkJ=Yj-UTZ%2wT&sZ$QzK|MtLg*; z|F-0CE&$%M;tOI-&ayPUaRdeagsuna2%UjP4Wl;A}Lc3}^@JROV=!KL7q zKz&|UvJ&&6W(vaLHYrY6P@5UBR>YE|F=wU@7S`SxYv;N>LxFB5O#{;{;6LV`0uZMF zt|hc6?gaPc`gb7TvTzw!7Y0~^Ra`6i0r21sTB~TUA&9$tn1KP5tA+XxSUR8H_b>vm vfu}ZSFv@Tj)-yj65;R;ko7q~0E!_7o$9qV3{{lz?+wcH=5AofZ_#XWQ#Pl@y literal 0 HcmV?d00001 diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/annotation/Log.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/annotation/Log.class new file mode 100644 index 0000000000000000000000000000000000000000..8ff99f05a152a8c04f979492164285d7c3cfb844 GIT binary patch literal 838 zcmbVK$xg#C6dcnf?EAhII8?xa2*HgLQj4g77L^tboZR$LT)7UUP9=Vg10TRgAzl!W z94ZhTqR69}@p#^QeS3ZZaEJ{DYYx^Op@MSS1>KQvCgd{(a9l#?0iMsd4WEf zYcDEOV5u4!t2%V8x~icmZnG<}mMC0)*X-70(4r_urYCjCc3b^OA5XhMj@!l?A@Qnop>O(BQO~+ zTcyz^kEfN3p#(dwEH8M?2Kb9ME}a%gBg3aGpHf{o3=CrE3n*cjff0;;0vW;>#u=Kx mWDHGVoE@jxVE{9j<$sRd=a?{m3qe@GB9@{PVHqn}1>OM*WbkDG literal 0 HcmV?d00001 diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/aspect/Operation.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/aspect/Operation.class new file mode 100644 index 0000000000000000000000000000000000000000..3ebaf4a1dc5bab0356c58611910454c6785489fb GIT binary patch literal 7203 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 Ygqh0LeSF@}zsub|Zw%b;mj%QB2ad0_kRa4 zj1M}{iHSD6)`m0fNaAb)=WxCQ7x228z0rXbCe`wydRIw?DE zSZV3Z8(ArEG?ldrT28-dSb1&MuyiYH=%zO3=p}DXqqq{&uB_7=71%yqvOJ?8XAIZK zm~zarY)|(L+j0etrEDj!xkZOYXC1vD7i{N-mXW&UYO{LQvzd@$3#8pdIG~un>{D1t!jaKa$Y*d?Bb-IF;tXp_SJ-3-Vdl7#X}AID{ZgjOw-eDu*5s}Fuyx%Z*(Sj^{{ zK;a3v;P;59HV zLUXB8Y(6`7A%(sCqtXe14SXVsx*Rw2?@TMlE#XL>bM-7&8b`q~Hn0To6DJXD4TXSh z{DJ0t0d!+KR|3yr2c?wq!BDwnOXNo`t5tVbskVfw3WY+|!)NC;2p79J+g-<8%X)MB z8kpNtHn*3vUObPOk8YZPT6pB9fu9jQ@GD{wOb#xiwPL%262Ji@FzDOg6Uc{fsfib` zk2VvuxSz8KUZi|Xa2tM1w{ffDO&|Id6c+=u3A96~P!94r$S0xFaVXpn4E!2Si~9;^ zPlz)f!7pe#*>e}|%V_@=t;^_8m|OhJ1ek{y$ir2bd&-!5Ld+W|u^%td_RG|z)?err z<8cf%_TliF55rCPz+Q)_AM4XRN5wJ``jCjA5@y9b;EWGNX8XqRU{)A_1`Caon4I3Nv=<+B>40?jaNAz^XKFL05wQFi~s-t literal 0 HcmV?d00001 diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/LoginLogMapper.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/LoginLogMapper.class new file mode 100644 index 0000000000000000000000000000000000000000..82809c1e545d0873a1e450e5720152b2c8916359 GIT binary patch literal 412 zcmb7=u};J=42GQpTJ8V|iHR3rJTGiTNH8!JA#oDBn}*g$lawR{@oEe_01t)mwK|a4 z81g%cZa!oIU9k~YYszF{X)Towuz zD?bEnZn%^FC)?EIwcOAsIK3ZSVrw2aa@CnD=X??h@1laU(uW4AC*2z45f17115QTL zXStbUi^YzdX6l58hSbWt|Dl>H6deCug#sD*U%SW@D45CFk*$O1uILQ*ARA*2`w}zB H&jG#xB#MB% literal 0 HcmV?d00001 diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/SystemLogMapper.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/SystemLogMapper.class new file mode 100644 index 0000000000000000000000000000000000000000..dee69d4ee276b95dcbd7cce277a0b23341e3a9d4 GIT binary patch literal 415 zcmb7=zfQz3491-UTJ8XefrS@f#0y&y5)4d5NK|5X)6nKkySGU0Ylg z0v44^UaDK&Gr-C3Y*IVl@CZ14NH%Jt9(B-ludc0ikvW_V0?tb3Tcm+xr%;c0NZSuM z3GpEYHuwXkEm^6lXCg|m;?)><03HhAYlV>5 z7-C0`^Z%dy`Stz*02gqS!y<=+91a!Cm$vaVq+k@da!oIU9r*_DtF_TXQEGNr5j$IR zLibkDU}N8lokSS0wld~hs28p{8XRrs^m~+^doXPtf F;2Q(BePsXu literal 0 HcmV?d00001 diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/UserLoginDao.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/UserLoginDao.class new file mode 100644 index 0000000000000000000000000000000000000000..59edb1313ea6675f301e4ebe190c18f8f4080f3c GIT binary patch literal 1015 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 Pu8paB5ARc~F4+G8kTn3z literal 0 HcmV?d00001 diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/LoginLogService.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/LoginLogService.class new file mode 100644 index 0000000000000000000000000000000000000000..1cc34945794dc93dcd27facaa0203e2a167c34a0 GIT binary patch literal 345 zcmb7=O>V+K423<=5}=zddJeoOyHs6PsuZb1>J$rxH?f_s8PZ^9em}D>&Fe$k)6rxiCLb0F~VMnIHuWF%W$O~yTR%A8THlp5C z6xjcC(W6=iWjtGhUbz)Zg`eeVcm!W%p8W&Ql5O<> literal 0 HcmV?d00001 diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/TokenService.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/TokenService.class new file mode 100644 index 0000000000000000000000000000000000000000..6fad05207265aff31cee822f70c89bb7d6bf4c25 GIT binary patch literal 336 zcmbVI%T5A85bW{60$%h-Y!bMw@n~W~;$iuL-q{u!c4lNAsK3U65AdUi!-B+k^w8av zPO7@9zxLZ508HSffPMjk0)`3(mCP;0@Wx`!|My@jr6(6ezgJb(y~g8C`Y# J8hYIFu4bYm@K*Tw~jCMFOG!~+!FpQfO@3aY9ZuI9o6cqrrVh5#WZ z23^$jQ-65F=hyoO05ssL4CiIID8nU#YKX2W{BdU!*ZOr;9>z=#;<+KhRi zV<8nEn%HuK(*&*KZx&5Uhf;M{0q?do5;MUgL8(oxBNWPGP;a9f>YyXiVh)XEP)I11 zL2ZUc4wh}*mk}~p{IB=l=VnlhQXCB814h_`{$u-C2N)4ycA}L<-d$hlOd?0z)Uv*7 z{uoqxGE~APhS-?xkonplq3^s*n!eDn40OWdWnVaHCsATKE*vT=wcJ}D>N(tD(tsy&?;AD=T#t~VmD>)oXiGidC>l}adIiiqqX5;xq;u%Am_*cxPo ziNSqZ=|E5=1`Kkv^5o`xfeZyjdX?x^WKag6&=FMjLsdB5hHCUV2PfHn3TN3_{{}$q B08{_~ literal 0 HcmV?d00001 diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/LoginLogServiceImpl.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/LoginLogServiceImpl.class new file mode 100644 index 0000000000000000000000000000000000000000..d71db32d5406587940c800263d0e7bb3fdf6c85c GIT binary patch literal 779 zcmbtSO-~y!5Pc?uKuSyb6dZe_J=BMC+b9x3LPAIT_D41DGU8ah@@>Js|az2hI2z1lT8JVl!WQX#ctg;!YLXNzu;z$PV zFDTQJOj*d(4asuoJ(5SvB?3!58d?=A&lmk27aJ&ND0h`KR|6F(ltmS!{u8wgb={!?8jft}OJMl!ljf!O1HYh7gR&a%b3sq;e_O3xObPx=f|d+p*?spXRi$ugQ) z5a_(;MFf)i_#59q;Kyq&pYZ`-Fvp|G6UcKa_+uFyTa4rw1I=$Y5Z6r1VUc6K4YaYu bae4gTWb}bigK?ep5ue8E3O@5%=dS_}M3wKJ literal 0 HcmV?d00001 diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/TokenServiceImpl.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/TokenServiceImpl.class new file mode 100644 index 0000000000000000000000000000000000000000..610dbac3e4e6a29d11f0566589eae833733db159 GIT binary patch literal 758 zcmbVKO-lnY5Ph-MYW@BMkKWXS@!&-&f(U|8Jy_{I-Hq+&CRvlLA3w{J;K8E@f0Q`e zinIqsBrwUFOlIc2%=^d7D}X($)ltDx4a+sG)UYZraX^;hp+IGGt1U2o>{2Z--z2Ng z3)9j5Qgt%+EHz!CvbOS6;xFfT>`@SCG!tiJs&2`4RExS+#lmxyw|=IMa)we@Nb}fHkwTsoLF$L7Z6Iey6AtA%__d8x zxk2?amFL=z_Ux6>_s-wQ)EPyVTQ^}4-8dYL{E6K#F(y@Sxxy#e83dEuwS?eP6b(S^VY&zeSA@{85)pvU#YOh^<%(eU?-k3oZ69W7H{sR8L z^6fuG7ufwve}*i@E+jj|JY#_(k9o&K>8| literal 0 HcmV?d00001 diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.class new file mode 100644 index 0000000000000000000000000000000000000000..cb47481ac59108ed2654f1b1f2a1698568ff072f GIT binary patch literal 7027 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 oJ2|gi0E2rN{vEx0IPyKBT + + + + + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + utf8 + + + + + + + + ${LOG_HOME}/hrms_auth.%d{yyyy-MM-dd}.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + 0 + + 512 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-hrms-auth/target/classes/mapper/hrmsauth/UserLoginMapper.xml b/dq-financial-hrms-auth/target/classes/mapper/hrmsauth/UserLoginMapper.xml new file mode 100644 index 00000000..9a66957d --- /dev/null +++ b/dq-financial-hrms-auth/target/classes/mapper/hrmsauth/UserLoginMapper.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + update hrms_user set password = #{password} where phone_account = #{phoneAccount} + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml b/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml index 69baabd7..0988e6e1 100644 --- a/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml +++ b/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml @@ -95,6 +95,7 @@ AND e.job_number = #{employee.jobNumber} + AND u.del_or_not = 0 \ No newline at end of file diff --git a/dq-financial-hrms/src/main/resources/mapper/hrms/PositionDao.xml b/dq-financial-hrms/src/main/resources/mapper/hrms/PositionDao.xml index 343ac5b5..88fb9584 100644 --- a/dq-financial-hrms/src/main/resources/mapper/hrms/PositionDao.xml +++ b/dq-financial-hrms/src/main/resources/mapper/hrms/PositionDao.xml @@ -34,6 +34,7 @@ INNER JOIN hrms_dept_position dp ON p.id = dp.position_id INNER JOIN hrms_dept d ON dp.dept_id = d.id INNER JOIN hrms_employee e ON p.create_user = e.id + INNER JOIN hrms_user u ON e.user_id = u.id WHERE ( @@ -41,6 +42,7 @@ OR p.`name` LIKE CONCAT('%',#{queryMsg},'%') ) + AND u.del_or_not = 0 GROUP BY p.id ORDER BY diff --git a/dq-financial-hrms/target/classes/application.yml b/dq-financial-hrms/target/classes/application.yml new file mode 100644 index 00000000..30e77ef2 --- /dev/null +++ b/dq-financial-hrms/target/classes/application.yml @@ -0,0 +1,12 @@ +#security: +# oauth2: +# client: +# client-id: user-client +# client-secret: user-secret-8888 +# user-authorization-uri: http://localhost:7000/oauth/authorize +# access-token-uri: http://localhost:7000/oauth/token +# resource: +# id: user-client +# user-info-uri: user-info +# authorization: +# check-token-access: http://localhost:7000/oauth/check_token \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/bootstrap.properties b/dq-financial-hrms/target/classes/bootstrap.properties index d1c6bdec..b5a7eb56 100644 --- a/dq-financial-hrms/target/classes/bootstrap.properties +++ b/dq-financial-hrms/target/classes/bootstrap.properties @@ -15,4 +15,14 @@ spring.cloud.nacos.config.ext-config[1].refresh=true spring.cloud.nacos.config.ext-config[2].data-id=other.yml spring.cloud.nacos.config.ext-config[2].group=dev -spring.cloud.nacos.config.ext-config[2].refresh=true \ No newline at end of file +spring.cloud.nacos.config.ext-config[2].refresh=true + +#spring.redis.host=127.0.0.1 +#spring.redis.port=6379 +#spring.redis.password=123456 +#spring.redis.database=0 +#spring.redis.timeout=30000 +#spring.redis.jedis.pool.max-active=8 +#spring.redis.jedis.pool.max-wait=-1 +#spring.redis.jedis.pool.max-idle=8 +#spring.redis.jedis.pool.min-idle=0 \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class index 528d4b0ad497e12fbd30a234eaf03d1e354e9ab3..f33da307e3b501ca7cd0dce53490f4f76fa9d4ce 100644 GIT binary patch delta 984 zcmZuu%T7~K6kVsKURzGDNJ1M^+lYXXQYeMu1FVQr1Y4-KR8Z8~!WF80*#`=~9|_Kk zxdWY=NManR3``v8+{90CNaDbW6NkoqF10P_;Ox84?pkZFv-+m_eM{`i?~k7Vc=6bT zM#PNRiOcnfBOzhdggV4TnG+L5!WD6u7ncQ5k|tcmHPNL+NsE#ZB`YB(;ktzUyV$Bu z=L)JrM(cRIR9tY!Gns5LUQA{)?qGI)fMMI5Qj8~441E3Bi}eqy>rbA4fBBlhkWv1_sMfuo2LLy!8FHK||qb~DE!ZgAYh5`&wj?hY}T<`}{<$1N;NxXp0~cRB9i zK1T=-IHGvSF@;BKpSQd8%%T3Mj~Ln^!>JDQ@T?O$w1dGp16Du>ToiI=0bOv9p&K3r zJ?Mp3K_3p_Amw2Mv*>_B)E=f|*Aus2@C#_Jwk^~O2*Uu5sNcB9+e;h0*iExN5VkOshHzZ{X|}2>W~;%6dJL+q za<}7z0B8>x)>x8Y`ALmoL?d(=MhSdM1D~vbN4J8<2$GjQkqDWJYNjn@YqRM9f+SG3 z8lWF7bYvQhS9B+~>V`=7m)t)RCt#u`3|l1(8#Z)hm~k3sXls~cIZ19zBGq^TT0E20 zc*=i6fWT2o{nd`Xed!wWmdX-KIq^+7pZ!NjqkTKTm#in9-iw NNZkdxU#vX&(jStyp~(OM delta 769 zcmaKp%TiN85Qe{#cs!mkIfrBs%2Ft)7)vxlf(a22jT%6ai$D|*A&OT(MT{5pHRc)I zs0)>y3m(8H@CDqvbwk;6hzVkqi|*;}`TOslf4(H&w^zPxf87FdyonH}>=NU86E~P~ zn2oTHvT<{!a?@enB)3emVBBJa3b##k$G9cq?izQ`;l9HIhligl??RhD!w2pCj}*(S zXx}XySmm+e2~YL7o9kF*Owq%d;u&iW>x$=86)$+HDDg@$!fVAS8=D{8bl5tizpH6G zg~u_SiB1iBSagV;n8&JelC(U=#Y%+Wl!TpPtzo(EGMFmujW8*pfmme7>L1bUQkSr1 zI4rdzgvG~crA$H1m zqF<-|OxqcA87$r#bU3D?Pv|WA1^i3EB>@iw;Inn`z+Uh<&g-{+)}D|(CiN%3rBLL8 zz-vnucP)9b&T?rlOG#L^{XTm^SQhm_bIa@wi$|0}hUC%1LZpOXr*gR=!|n-<-?-9{ zp(cM(nny(KkInh=a-eiVNQ{Jklup!?{;$4Q{~JV diff --git a/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDao.xml index 69baabd7..0988e6e1 100644 --- a/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDao.xml +++ b/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDao.xml @@ -95,6 +95,7 @@ AND e.job_number = #{employee.jobNumber} + AND u.del_or_not = 0 \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/mapper/hrms/PositionDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/PositionDao.xml index 343ac5b5..88fb9584 100644 --- a/dq-financial-hrms/target/classes/mapper/hrms/PositionDao.xml +++ b/dq-financial-hrms/target/classes/mapper/hrms/PositionDao.xml @@ -34,6 +34,7 @@ INNER JOIN hrms_dept_position dp ON p.id = dp.position_id INNER JOIN hrms_dept d ON dp.dept_id = d.id INNER JOIN hrms_employee e ON p.create_user = e.id + INNER JOIN hrms_user u ON e.user_id = u.id WHERE ( @@ -41,6 +42,7 @@ OR p.`name` LIKE CONCAT('%',#{queryMsg},'%') ) + AND u.del_or_not = 0 GROUP BY p.id ORDER BY diff --git a/dq-framework-common/src/main/java/com/daqing/framework/exception/ExceptionCatch.java b/dq-framework-common/src/main/java/com/daqing/framework/exception/ExceptionCatch.java index 742da376..ee80102e 100644 --- a/dq-framework-common/src/main/java/com/daqing/framework/exception/ExceptionCatch.java +++ b/dq-framework-common/src/main/java/com/daqing/framework/exception/ExceptionCatch.java @@ -46,10 +46,10 @@ public class ExceptionCatch { return new ResponseResult(CommonCode.SERVER_ERROR); } - static { + /*static { //瀹氫箟寮傚父绫诲瀷鎵瀵瑰簲鐨勯敊璇唬鐮 builder.put(HttpMessageNotReadableException.class, CommonCode.INVALID_PARAM); - } + }*/ @ExceptionHandler(CustomException.class)//鎹曡幏CustomException绫诲瀷寮傚父 @ResponseBody diff --git a/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java b/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java index 4e293dbf..55e79037 100644 --- a/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java +++ b/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java @@ -8,25 +8,10 @@ package com.daqing.framework.model.response; */ public class PromptSuccess { - private static final String DELETE_SUCCESS = "鍒犻櫎鎴愬姛!"; + public static final String DELETE_SUCCESS = "鍒犻櫎鎴愬姛!"; - private static final String DELETE_FAIL = "鍒犻櫎澶辫触!"; + public static final String DELETE_FAIL = "鍒犻櫎澶辫触!"; - private static final String NO_BEING = "璇ュ憳宸ュ凡涓嶅瓨鍦"; - - public static String getDeleteSuccess(){ - - return PromptSuccess.DELETE_SUCCESS; - } - - public static String getDeleteFail(){ - - return PromptSuccess.DELETE_FAIL; - } - - public static String getNoBeing(){ - - return PromptSuccess.NO_BEING; - } + public static final String NOT_BEING = "璇ュ憳宸ュ凡涓嶅瓨鍦"; } diff --git a/dq-framework-common/src/main/java/com/daqing/framework/util/Md5Util.java b/dq-framework-common/src/main/java/com/daqing/framework/util/Md5Util.java index 870f5e5a..06d39348 100644 --- a/dq-framework-common/src/main/java/com/daqing/framework/util/Md5Util.java +++ b/dq-framework-common/src/main/java/com/daqing/framework/util/Md5Util.java @@ -25,5 +25,6 @@ public class Md5Util { //System.out.printf(md5("1234561")); String s = URLEncoder.encode("www.occupationlab.com", "utf-8"); System.out.println(s); + System.out.println(md5("1234564")); } } diff --git a/dq-framework-common/target/classes/com/daqing/framework/SpringContextHolder.class b/dq-framework-common/target/classes/com/daqing/framework/SpringContextHolder.class new file mode 100644 index 0000000000000000000000000000000000000000..50fa758b351c0064e2f3b3b1c5c258805c19ed58 GIT binary patch literal 1981 zcmb7ETUQfT7~LlqLME{&RjL-OikAcmgP>9+Vlgh44_S6qvUup*VREEnCo^$oqJ>{o z^})-7KfoX5a-TU<7+~;{wQ{ce+xt7;Wj=m-{{g@fez#D?QWc}PUc(LC)WfpH?QeQ@ zORsKMuu?&*f;$zg3XIFaz;hiLyMf;h{8;@P3oLYkaLbMcq3drw31wfs2*Q7C$6VWM zhb&eEMp~}##w08@ni~S8cFd;$!CzvMG6`aOr>0@ZbQ%a`#mBw()9y`90N_N#d^-7a}AXK&h`jG}z~ zdZ?Za-B9(q+XKp+$Y>ZVfr9>JUSqvm)@hNeDP9#MXIEH%EjI&?W(?2_H?sPt46hrzbMXv^`^vbWZQ zVd$s_t}gP^IVC%<>qOwpGN z6ga-u1*XCUmhv8R^fzSfh1Bh`kY}~Y){N{Y(usp`+rIBcgCNqM57V;qc_v2-;R3&c zRTN;M2BucWfkCNq&9HDh&YjI!a4yfhfq2P90Vg<)B!@MOb6qz8{D_m>Rdw)qqKzk$ z8=&+Gh5xu`cXBkgCy8Xh$)}OmIcph<$eDL27NGH2t;vj*g)=zI`=1lcWWqF+GCkPO zR5DD(jPmq8rgQj(Ea&+*@33%=f%%{NV!}P0a{q}US3vD8<1zaVBgMqcEcw-he8Rv| zH)()Nlo1&jeR6>(<_VW6!%E{`2ScChUs=3HLC4(0%}Pk;QA(0>6^#^rhqLyoJe$Hz z*bMw8;maAH%4wPiN0a&1*`3){UQEQ8u(zn}CEGBq^6_^wp(~|KqnO>bpCX(79q`;_ a{20Cbm6rv~VV?6CS2pJb8eRJfi=P2RlFZHk literal 0 HcmV?d00001 diff --git a/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCatch.class b/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCatch.class index f9d340bb0754765d542aa3bec2b6b0fcf8f05a08..5433d84a5b2d973a2735dc3ad76f53128549d1e2 100644 GIT binary patch delta 859 zcmZXT%TH5L5XOI}fTz8^1=BzvRG|1Ol$X>80wM~&6-4DBf&x|)d;lUUidYrjih?(B zOI*9rbRoJhackn=g9~m1Q9;%s`w7JZv=8DZ2S8WPeZL^MIn`>OR8Rv%Prp*MmoG-qJ zGiO=Oj}=wrB}{5=+a$Q7xodNeDb0PG2Rzg~vU$uC%~OMWrieN#Q!|}zo#TJbsLeDl z6lKngFU$Gn$q8s)+RQL(WM3t{-s#kYbPC~>2bmDoT)&oDtEpIBJHL!EN#Hv z#Y*GF*d&Mwd5g_#5mc4j`|uS0CRekSY6*jqu92eJE>v8~w@FS>$95y)w53<}n1+I+ zimet~D}Ei>a{pg4yd)WxyL!QAi_Bli8hWMDYCq;81VF delta 998 zcmZWo$x;(h6g@8iU(&o}k)jMm1Og6(h=fE@1__2iL4h!6P(d&>ErXauXb?q>y0FRt z6&hztf53&3Dn+aG1KjvCE-lLY8q9`8-@fFMSmVnk&;wbrP2(??DFa#re_|od$bWyvJK;c0!mEcX(V>pJ0R5Bhqf+O-&F62u< diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/response/PromptSuccess.class b/dq-framework-common/target/classes/com/daqing/framework/model/response/PromptSuccess.class index ac2567bafcdc3fbbc1e0dba12cd83b6417e345f0..41b580d31e3f6ef378484d1ceea2a9e9edf798c0 100644 GIT binary patch delta 155 zcmcb_I*~>6)W2Q(7#J9g8Kk)wm>ERb8N}Eb#3#y`DRVGLFfwqvxcaz;xW>CVdiroM zNHQ{T`uT^%JGpxLxpOc`P0X#CY`_>j`7op4$48jZ|KwW%5UD7}r1ek@G rHvlO{27VyP1{M?s8Y_xLAq%=f37|qTEDBlC70Lq56=z@txm5xH%G@DwB9Lfe^wr;FjAwSY&;Zdiop0uw&YU@CzW)02^*exZ%tR5xSSvK#5OdSOc$DWY zF}KCsF>p7E2*x6~C+CEi$p~^0Oo=;f;J$*kZLQl1YL0Hrc}urt$|*Z8Q{iN4g}09@ z1>SbdJ7xQ6eQV9GKDX9Nyot|O@>XfZsyY$}mzrC2Y6^q%`N~$dVC^{N_3W#vwPnAl zR5!DA*C}OZteU+@(42y?ZoA@oSe!uOWp40Yupn%{@kJ?L)!Muzd{7EiR1 ziTh6P)1Mceha_^iia~;Q;TndxkPuHisJF E7cAoKF#rGn literal 0 HcmV?d00001 diff --git a/dq-framework-common/target/classes/com/daqing/framework/util/JwtUtils.class b/dq-framework-common/target/classes/com/daqing/framework/util/JwtUtils.class new file mode 100644 index 0000000000000000000000000000000000000000..a23983f93955fb3f5fa292c79bf9bde68f2ea103 GIT binary patch literal 4264 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 literal 0 HcmV?d00001 diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CompanyCustomerEntity.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CompanyCustomerEntity.java index 068eed16..a56b57f8 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CompanyCustomerEntity.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CompanyCustomerEntity.java @@ -10,6 +10,8 @@ import java.util.Date; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.Pattern; + /** * 浼佷笟绫诲瀷瀹㈡埛淇℃伅琛 * @@ -25,6 +27,7 @@ public class CompanyCustomerEntity implements Serializable { /** * 涓婚敭 */ + //@Pattern(regexp = "^\\\\d+$",message = "鎴愮珛骞撮檺鍙兘涓烘暣褰㈡暟瀛") @ApiModelProperty(value = "id") @TableId(value = "id", type = IdType.INPUT) private Long id; @@ -42,6 +45,7 @@ public class CompanyCustomerEntity implements Serializable { * 鎴愮珛骞撮檺 */ @ApiModelProperty(value = "鎴愮珛骞撮檺") + @Pattern(regexp = "^\\\\d+$",message = "鎴愮珛骞撮檺鍙兘涓烘暣褰㈡暟瀛") private Integer years; /** * 鎵鍦ㄥ尯鍩 @@ -76,6 +80,7 @@ public class CompanyCustomerEntity implements Serializable { /** * 瀹㈡埛鍩烘湰淇℃伅琛╥d */ + //@Pattern(regexp = "^\\\\d+$",message = "鎴愮珛骞撮檺鍙兘涓烘暣褰㈡暟瀛") @ApiModelProperty(value = "瀹㈡埛鍩烘湰淇℃伅琛╥d") private Long customerId; diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CustomerEntity.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CustomerEntity.java index 9a30c284..c145a93a 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CustomerEntity.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CustomerEntity.java @@ -11,6 +11,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; /** * 璁板綍瀹㈡埛鍩烘湰淇℃伅 @@ -41,6 +42,7 @@ public class CustomerEntity implements Serializable { */ @NotNull(message = "瀹㈡埛绫诲瀷涓嶈兘涓虹┖") @ApiModelProperty(value = "瀹㈡埛绫诲瀷") + //@Pattern(regexp = "^\\\\d+$",message = "鎴愮珛骞撮檺鍙兘涓烘暣褰㈡暟瀛") private Integer type; /** * 瀹㈡埛鐨勭粡鐞嗕汉id diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/PersonalCustomerEntity.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/PersonalCustomerEntity.java index d4004855..10980dfc 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/PersonalCustomerEntity.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/PersonalCustomerEntity.java @@ -10,6 +10,8 @@ import java.util.Date; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; /** * 涓汉绫诲瀷瀹㈡埛淇℃伅琛 @@ -38,6 +40,7 @@ public class PersonalCustomerEntity implements Serializable { /** * 韬唤璇佸彿 */ + @NotNull(message = "韬唤璇佸彿涓嶈兘涓虹┖") @ApiModelProperty(value = "韬唤璇佸彿") private String idCard; /** @@ -73,6 +76,7 @@ public class PersonalCustomerEntity implements Serializable { /** * 宸ヤ綔骞撮檺 */ + @Pattern(regexp = "^\\d+$",message = "宸ヤ綔骞撮檺鍙兘涓烘暟瀛") @ApiModelProperty(value = "宸ヤ綔骞撮檺") private Integer workingYears; /** diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CompanyTemplate.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CompanyTemplate.java new file mode 100644 index 00000000..f8f732b5 --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CompanyTemplate.java @@ -0,0 +1,83 @@ +package com.daqing.framework.domain.crms.ext; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.metadata.BaseRowModel; +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; + +/** + * 瀵煎嚭excel妯℃澘(浼佷笟绫诲瀷) + * @auther River + * @date 2020/10/9 11:38 + */ +@Data +@ToString +public class CompanyTemplate extends BaseRowModel implements Serializable { + /** + * 瀹㈡埛缁忕悊 + */ + @ExcelProperty(value = "瀹㈡埛缁忕悊(璇峰～鍐欐湰鍏徃瀛樺湪鐨勫憳宸ュ鍚)",index = 0) + private String manager; + /** + * 瀹㈡埛鍚嶇О + */ + @ExcelProperty(value = "濮撳悕",index = 1) + private String name; + /** + * 鑱旂郴鍦板潃 + */ + @ExcelProperty(value = "鍦板潃",index = 2) + private String addr; + /** + * 鑱旂郴鐢佃瘽 + */ + @ExcelProperty(value = "鐢佃瘽",index = 3) + private String phone; + /** + * 娉ㄥ唽璧勯噾 + */ + @ExcelProperty(value = "娉ㄥ唽璧勯噾",index = 4) + private String registeredCapital; + /** + * 鎵灞炶涓 + */ + @ExcelProperty(value = "鎵灞炶涓",index = 5) + private String industry; + /** + * 鎴愮珛骞撮檺 + */ + @ExcelProperty(value = "鎴愮珛骞撮檺",index = 6) + private Integer years; + /** + * 鎵鍦ㄥ尯鍩 + */ + @ExcelProperty(value = "鎵鍦ㄥ尯鍩",index = 7) + private String region; + /** + * 鑲′笢鍚嶇О + */ + @ExcelProperty(value = "鑲′笢鍚嶇О",index = 8) + private String shareholder; + /** + * 鍏宠仈浼佷笟 + */ + @ExcelProperty(value = "鍏宠仈浼佷笟",index = 9) + private String affiliatedCompany; + /** + * 鍛樺伐涓暟 + */ + @ExcelProperty(value = "鍛樺伐涓暟",index = 10) + private String empNum; + /** + * 鑱旂郴浜 + */ + @ExcelProperty(value = "鑱旂郴浜",index = 11) + private String linkman; + /** + * 涓氬姟鏉ユ簮 + */ + @ExcelProperty(value = "涓氬姟鏉ユ簮",index = 12) + private String businessSource; +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.java index 3e7ce1b5..18281a58 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.java @@ -7,6 +7,7 @@ import lombok.ToString; import java.io.Serializable; /** + * 瀹㈡埛淇℃伅璇︽儏(浼佷笟绫诲瀷) * @auther River * @date 2020/9/29 11:00 */ diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.java deleted file mode 100644 index 82166d16..00000000 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.daqing.framework.domain.crms.ext; - -import com.daqing.framework.domain.crms.CompanyCustomerEntity; -import com.daqing.framework.domain.crms.CustomerEntity; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.ToString; - -import java.io.Serializable; - -/** - * @auther River - * @date 2020/9/15 20:20 - */ -@Data -@ToString -public class CustomerCompanyTO implements Serializable { - - /** - * 瀹㈡埛鍩烘湰淇℃伅 - */ - @ApiModelProperty(value = "瀹㈡埛鍩烘湰淇℃伅") - private CustomerEntity customerEntity; - /** - * 浼佷笟绫诲瀷淇℃伅 - */ - @ApiModelProperty(value = "瀹㈡埛浼佷笟淇℃伅") - private CompanyCustomerEntity companyCustomerEntity; -} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTOI.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTOI.java new file mode 100644 index 00000000..8a28b8ca --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTOI.java @@ -0,0 +1,107 @@ +package com.daqing.framework.domain.crms.ext; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +import javax.validation.constraints.*; +import java.io.Serializable; + +/** + * 浼佷笟绫诲瀷瀹㈡埛淇℃伅鏂板 + * @auther River + * @date 2020/10/9 10:32 + */ +@Data +@ToString +public class CustomerCompanyTOI implements Serializable { + /** + * 瀹㈡埛绫诲瀷锛1銆佷紒涓氱被鍨嬶紝0锛氫釜浜虹被鍨 + */ + @Min(value = 0,message = "瀹㈡埛绫诲瀷鏍煎紡鏈夎") + @Max(value = 1,message = "瀹㈡埛绫诲瀷鏍煎紡鏈夎") + @NotNull(message = "瀹㈡埛绫诲瀷涓嶈兘涓虹┖") + @ApiModelProperty(value = "瀹㈡埛绫诲瀷") + private Integer type; + /** + * 瀹㈡埛鐨勭粡鐞嗕汉id + */ + @NotNull(message = "瀹㈡埛缁忕悊浜轰笉鑳戒负绌") + @ApiModelProperty(value = "瀹㈡埛缁忕悊浜篿d") + private Long manager; + /** + * 瀹㈡埛鍚嶇О + */ + @NotNull(message = "瀹㈡埛鍚嶇О涓嶈兘涓虹┖") + @ApiModelProperty(value = "瀹㈡埛鍚嶇О") + private String name; + /** + * 鑱旂郴鍦板潃 + */ + @NotNull(message = "鑱旂郴鍦板潃涓嶈兘涓虹┖") + @ApiModelProperty(value = "鑱旂郴鍦板潃") + private String addr; + /** + * 鑱旂郴鐢佃瘽 + */ + @NotNull(message = "鑱旂郴鐢佃瘽涓嶈兘涓虹┖") + @Pattern(regexp = "^[0-9]*$",message = "鑱旂郴鐢佃瘽鏍煎紡閿欒") + @ApiModelProperty(value = "鑱旂郴鐢佃瘽") + private String phone; + /** + * 娉ㄥ唽璧勯噾 + */ + @Pattern(regexp = "^[0-9]+\\.{0,1}[0-9]{0,2}$",message = "娉ㄥ唽璧勯噾鏍煎紡鏈夎") + @NotNull(message = "娉ㄥ唽璧勯噾涓嶈兘涓虹┖") + @ApiModelProperty(value = "娉ㄥ唽璧勯噾") + private String registeredCapital; + /** + * 鎵灞炶涓 + */ + @NotNull(message = "鎵灞炶涓氫笉鑳戒负绌") + @ApiModelProperty(value = "鎵灞炶涓") + private String industry; + /** + * 鎴愮珛骞撮檺 + */ + @NotNull(message = "鎴愮珛骞撮檺涓嶈兘涓虹┖") + @ApiModelProperty(value = "鎴愮珛骞撮檺") + private Integer years; + /** + * 鎵鍦ㄥ尯鍩 + */ + @NotNull(message = "鎵鍦ㄥ尯鍩熶笉鑳戒负绌") + @ApiModelProperty(value = "鎵鍦ㄥ尯鍩") + private String region; + /** + * 鑲′笢鍚嶇О + */ + @NotNull(message = "鑲′笢鍚嶇О涓嶈兘涓虹┖") + @ApiModelProperty(value = "鑲′笢鍚嶇О") + private String shareholder; + /** + * 鍏宠仈浼佷笟 + */ + @NotNull(message = "鍏宠仈浼佷笟涓嶈兘涓虹┖") + @ApiModelProperty(value = "鍏宠仈浼佷笟") + private String affiliatedCompany; + /** + * 鍛樺伐涓暟 + */ + @Pattern(regexp = "^[0-9]*$",message = "鍛樺伐涓暟鏍煎紡閿欒") + @NotNull(message = "鍛樺伐涓暟涓嶈兘涓虹┖") + @ApiModelProperty(value = "鍛樺伐涓暟") + private String empNum; + /** + * 鑱旂郴浜 + */ + @NotNull(message = "鑱旂郴浜轰笉鑳戒负绌") + @ApiModelProperty(value = "鑱旂郴浜") + private String linkman; + /** + * 涓氬姟鏉ユ簮 + */ + @NotNull(message = "涓氬姟鏉ユ簮涓嶈兘涓虹┖") + @ApiModelProperty(value = "涓氬姟鏉ユ簮") + private String businessSource; +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTOU.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTOU.java new file mode 100644 index 00000000..4ebd2268 --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyTOU.java @@ -0,0 +1,128 @@ +package com.daqing.framework.domain.crms.ext; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.daqing.framework.domain.crms.CompanyCustomerEntity; +import com.daqing.framework.domain.crms.CustomerEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import java.io.Serializable; + +/** + * 浼佷笟绫诲瀷瀹㈡埛淇℃伅鏇存柊 + * @auther River + * @date 2020/9/15 20:20 + */ +@Data +@ToString +public class CustomerCompanyTOU implements Serializable { + + /** + * 涓婚敭 + */ + @NotNull(message = "id涓嶈兘涓虹┖") + @ApiModelProperty(value = "id") + @TableId(value = "id", type = IdType.INPUT) + private Long id; + /** + * 瀹㈡埛缂栧彿 + */ + @NotNull(message = "瀹㈡埛缂栧彿涓嶈兘涓虹┖") + @ApiModelProperty(value = "瀹㈡埛缂栧彿") + private String code; + /** + * 瀹㈡埛绫诲瀷锛1銆佷紒涓氱被鍨嬶紝0锛氫釜浜虹被鍨 + */ + @Min(value = 0,message = "瀹㈡埛绫诲瀷鏍煎紡鏈夎") + @Max(value = 1,message = "瀹㈡埛绫诲瀷鏍煎紡鏈夎") + @NotNull(message = "瀹㈡埛绫诲瀷涓嶈兘涓虹┖") + @ApiModelProperty(value = "瀹㈡埛绫诲瀷") + private Integer type; + /** + * 瀹㈡埛鐨勭粡鐞嗕汉id + */ + @NotNull(message = "瀹㈡埛缁忕悊浜轰笉鑳戒负绌") + @ApiModelProperty(value = "瀹㈡埛缁忕悊浜篿d") + private Long manager; + /** + * 瀹㈡埛鍚嶇О + */ + @NotNull(message = "瀹㈡埛鍚嶇О涓嶈兘涓虹┖") + @ApiModelProperty(value = "瀹㈡埛鍚嶇О") + private String name; + /** + * 鑱旂郴鍦板潃 + */ + @NotNull(message = "鑱旂郴鍦板潃涓嶈兘涓虹┖") + @ApiModelProperty(value = "鑱旂郴鍦板潃") + private String addr; + /** + * 鑱旂郴鐢佃瘽 + */ + @Pattern(regexp = "^[0-9]*$",message = "鑱旂郴鐢佃瘽鏍煎紡閿欒") + @NotNull(message = "鑱旂郴鐢佃瘽涓嶈兘涓虹┖") + @ApiModelProperty(value = "鑱旂郴鐢佃瘽") + private String phone; + /** + * 娉ㄥ唽璧勯噾 + */ + @Pattern(regexp = "^[0-9]+\\.{0,1}[0-9]{0,2}$",message = "娉ㄥ唽璧勯噾鏍煎紡鏈夎") + @NotNull(message = "娉ㄥ唽璧勯噾涓嶈兘涓虹┖") + @ApiModelProperty(value = "娉ㄥ唽璧勯噾") + private String registeredCapital; + /** + * 鎵灞炶涓 + */ + @NotNull(message = "鎵灞炶涓氫笉鑳戒负绌") + @ApiModelProperty(value = "鎵灞炶涓") + private String industry; + /** + * 鎴愮珛骞撮檺 + */ + @NotNull(message = "鎴愮珛骞撮檺涓嶈兘涓虹┖") + @ApiModelProperty(value = "鎴愮珛骞撮檺") + private Integer years; + /** + * 鎵鍦ㄥ尯鍩 + */ + @NotNull(message = "鎵鍦ㄥ尯鍩熶笉鑳戒负绌") + @ApiModelProperty(value = "鎵鍦ㄥ尯鍩") + private String region; + /** + * 鑲′笢鍚嶇О + */ + @NotNull(message = "鑲′笢鍚嶇О涓嶈兘涓虹┖") + @ApiModelProperty(value = "鑲′笢鍚嶇О") + private String shareholder; + /** + * 鍏宠仈浼佷笟 + */ + @NotNull(message = "鍏宠仈浼佷笟涓嶈兘涓虹┖") + @ApiModelProperty(value = "鍏宠仈浼佷笟") + private String affiliatedCompany; + /** + * 鍛樺伐涓暟 + */ + @Pattern(regexp = "^[0-9]*$",message = "鍛樺伐涓暟鏍煎紡閿欒") + @NotNull(message = "鍛樺伐涓暟涓嶈兘涓虹┖") + @ApiModelProperty(value = "鍛樺伐涓暟") + private String empNum; + /** + * 鑱旂郴浜 + */ + @NotNull(message = "鑱旂郴浜轰笉鑳戒负绌") + @ApiModelProperty(value = "鑱旂郴浜") + private String linkman; + /** + * 涓氬姟鏉ユ簮 + */ + @NotNull(message = "涓氬姟鏉ユ簮涓嶈兘涓虹┖") + @ApiModelProperty(value = "涓氬姟鏉ユ簮") + private String businessSource; +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.java index 1c19f6b3..0980fcc9 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.java @@ -24,74 +24,69 @@ public class CustomerCompanyVO extends BaseRowModel implements Serializable { */ @ExcelProperty(value = "缂栧彿",index = 0) private String code; - /** - * 瀹㈡埛绫诲瀷锛1銆佷紒涓氱被鍨嬶紝0锛氫釜浜虹被鍨 - */ - @ExcelProperty(value = "浼佷笟绫诲瀷",index = 1) - private Integer type; /** * 瀹㈡埛缁忕悊 */ - @ExcelProperty(value = "瀹㈡埛缁忕悊",index = 2) + @ExcelProperty(value = "瀹㈡埛缁忕悊",index = 1) private String manager; /** * 瀹㈡埛鍚嶇О */ - @ExcelProperty(value = "濮撳悕",index = 3) + @ExcelProperty(value = "濮撳悕",index = 2) private String name; /** * 鑱旂郴鍦板潃 */ - @ExcelProperty(value = "鍦板潃",index = 4) + @ExcelProperty(value = "鍦板潃",index = 3) private String addr; /** * 鑱旂郴鐢佃瘽 */ - @ExcelProperty(value = "鐢佃瘽",index = 5) + @ExcelProperty(value = "鐢佃瘽",index = 4) private String phone; /** * 娉ㄥ唽璧勯噾 */ - @ExcelProperty(value = "娉ㄥ唽璧勯噾",index = 6) + @ExcelProperty(value = "娉ㄥ唽璧勯噾",index = 5) private String registeredCapital; /** * 鎵灞炶涓 */ - @ExcelProperty(value = "鎵灞炶涓",index = 7) + @ExcelProperty(value = "鎵灞炶涓",index = 6) private String industry; /** * 鎴愮珛骞撮檺 */ - @ExcelProperty(value = "鎴愮珛骞撮檺",index = 8) + @ExcelProperty(value = "鎴愮珛骞撮檺",index = 7) private Integer years; /** * 鎵鍦ㄥ尯鍩 */ - @ExcelProperty(value = "鎵鍦ㄥ尯鍩",index = 9) + @ExcelProperty(value = "鎵鍦ㄥ尯鍩",index = 8) private String region; /** * 鑲′笢鍚嶇О */ - @ExcelProperty(value = "鑲′笢鍚嶇О",index = 10) + @ExcelProperty(value = "鑲′笢鍚嶇О",index = 9) private String shareholder; /** * 鍏宠仈浼佷笟 */ - @ExcelProperty(value = "鍏宠仈浼佷笟",index = 11) + @ExcelProperty(value = "鍏宠仈浼佷笟",index = 10) private String affiliatedCompany; /** * 鍛樺伐涓暟 */ - @ExcelProperty(value = "鍛樺伐涓暟",index = 12) + @ExcelProperty(value = "鍛樺伐涓暟",index = 11) private String empNum; /** * 鑱旂郴浜 */ - @ExcelProperty(value = "鑱旂郴浜",index = 13) + @ExcelProperty(value = "鑱旂郴浜",index = 12) private String linkman; /** * 涓氬姟鏉ユ簮 */ - @ExcelProperty(value = "涓氬姟鏉ユ簮",index = 14) + @ExcelProperty(value = "涓氬姟鏉ユ簮",index = 13) private String businessSource; } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalDTO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalDTO.java index 5dbbadec..03a45af1 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalDTO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalDTO.java @@ -6,6 +6,7 @@ import lombok.ToString; import java.io.Serializable; /** + * 瀹㈡埛淇℃伅璇︽儏(涓汉绫诲瀷) * @auther River * @date 2020/9/29 11:01 */ diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.java deleted file mode 100644 index b8ae1334..00000000 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.daqing.framework.domain.crms.ext; - -import com.daqing.framework.domain.crms.CustomerEntity; -import com.daqing.framework.domain.crms.PersonalCustomerEntity; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.ToString; - -import java.io.Serializable; - -/** - * @auther River - * @date 2020/9/15 19:57 - */ -@Data -@ToString -public class CustomerPersonalTO implements Serializable { - - /** - * 瀹㈡埛鍩烘湰淇℃伅 - */ - @ApiModelProperty(value = "瀹㈡埛鍩烘湰淇℃伅") - private CustomerEntity customerEntity; - - /** - * 瀹㈡埛涓汉淇℃伅 - */ - @ApiModelProperty(value = "瀹㈡埛涓汉淇℃伅") - private PersonalCustomerEntity personalCustomerEntity; -} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTOI.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTOI.java new file mode 100644 index 00000000..5796f32e --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTOI.java @@ -0,0 +1,152 @@ +package com.daqing.framework.domain.crms.ext; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import java.io.Serializable; + +/** + * 涓汉绫诲瀷瀹㈡埛淇℃伅鏂板 + * @auther River + * @date 2020/10/9 10:32 + */ +@Data +@ToString +public class CustomerPersonalTOI implements Serializable { + + /** + * 瀹㈡埛绫诲瀷锛1銆佷紒涓氱被鍨嬶紝0锛氫釜浜虹被鍨 + */ + @Min(value = 0,message = "瀹㈡埛绫诲瀷鏍煎紡鏈夎") + @Max(value = 1,message = "瀹㈡埛绫诲瀷鏍煎紡鏈夎") + @NotNull(message = "瀹㈡埛绫诲瀷涓嶈兘涓虹┖") + @ApiModelProperty(value = "瀹㈡埛绫诲瀷") + private Integer type; + /** + * 瀹㈡埛鐨勭粡鐞嗕汉id + */ + @NotNull(message = "瀹㈡埛缁忕悊浜轰笉鑳戒负绌") + @ApiModelProperty(value = "瀹㈡埛缁忕悊浜篿d") + private Long manager; + /** + * 瀹㈡埛鍚嶇О + */ + @NotNull(message = "瀹㈡埛鍚嶇О涓嶈兘涓虹┖") + @ApiModelProperty(value = "瀹㈡埛鍚嶇О") + private String name; + /** + * 鑱旂郴鍦板潃 + */ + @NotNull(message = "鑱旂郴鍦板潃涓嶈兘涓虹┖") + @ApiModelProperty(value = "鑱旂郴鍦板潃") + private String addr; + /** + * 鑱旂郴鐢佃瘽 + */ + @Pattern(regexp = "^[0-9]*$",message = "鑱旂郴鐢佃瘽鏍煎紡閿欒") + @NotNull(message = "鑱旂郴鐢佃瘽涓嶈兘涓虹┖") + @ApiModelProperty(value = "鑱旂郴鐢佃瘽") + private String phone; + /** + * 韬唤璇佸彿 + */ + @NotNull(message = "韬唤璇佸彿涓嶈兘涓虹┖") + @ApiModelProperty(value = "韬唤璇佸彿") + private String idCard; + /** + * 骞撮緞 + */ + @NotNull(message = "骞撮緞涓嶈兘涓虹┖") + @ApiModelProperty(value = "骞撮緞") + private Integer age; + /** + * 鎬у埆锛1銆佺敺锛0銆佸コ + */ + @Min(value = 0,message = "鎬у埆鏍煎紡鏈夎") + @Max(value = 1,message = "鎬у埆鏍煎紡鏈夎") + @NotNull(message = "鎬у埆涓嶈兘涓虹┖") + @ApiModelProperty(value = "鎬у埆") + private Integer gender; + /** + * 濠氬Щ鐘跺喌,0:鏈,1:宸插,2:绂诲紓,3:鍐嶅 + */ + @Min(value = 0,message = "濠氬Щ鐘跺喌鏍煎紡鏈夎") + @Max(value = 3,message = "濠氬Щ鐘跺喌鏍煎紡鏈夎") + @NotNull(message = "濠氬Щ鐘跺喌涓嶈兘涓虹┖") + @ApiModelProperty(value = "濠氬Щ鐘跺喌") + private Integer maritalStatus; + /** + * 瀛﹀巻,0:鏈,1:澶т笓,2:楂樿亴,3:涓笓,4:鍏朵粬 + */ + @Min(value = 0,message = "瀛﹀巻鏍煎紡鏈夎") + @Max(value = 4,message = "瀛﹀巻鏍煎紡鏈夎") + @NotNull(message = "瀛﹀巻涓嶈兘涓虹┖") + @ApiModelProperty(value = "瀛﹀巻") + private Integer education; + /** + * 宸ヤ綔鍗曚綅 + */ + @NotNull(message = "宸ヤ綔鍗曚綅涓嶈兘涓虹┖") + @ApiModelProperty(value = "宸ヤ綔鍗曚綅") + private String employer; + /** + * 鑱屽姟 + */ + @NotNull(message = "鑱屽姟涓嶈兘涓虹┖") + @ApiModelProperty(value = "鑱屽姟") + private String position; + /** + * 宸ヤ綔骞撮檺 + */ + @NotNull(message = "宸ヤ綔骞撮檺涓嶈兘涓虹┖") + @ApiModelProperty(value = "宸ヤ綔骞撮檺") + private Integer workingYears; + /** + * 绀句繚璐﹀彿 + */ + @NotNull(message = "绀句繚璐﹀彿涓嶈兘涓虹┖") + @ApiModelProperty(value = "绀句繚璐﹀彿") + private String socialSecurityNum; + /** + * 灞呬綇鎯呭喌 + */ + @NotNull(message = "灞呬綇鎯呭喌涓嶈兘涓虹┖") + @ApiModelProperty(value = "灞呬綇鎯呭喌") + private String livingSituation; + /** + * 鎴风睄鍦板潃 + */ + @NotNull(message = "鎴风睄鍦板潃涓嶈兘涓虹┖") + @ApiModelProperty(value = "鎴风睄鍦板潃") + private String residenceAddr; + /** + * 涓氬姟鏉ユ簮 + */ + @NotNull(message = "涓氬姟鏉ユ簮涓嶈兘涓虹┖") + @ApiModelProperty(value = "涓氬姟鏉ユ簮") + private String businessSource; + /** + * 绱фヨ仈绯讳汉 + */ + @NotNull(message = "绱фヨ仈绯讳汉涓嶈兘涓虹┖") + @ApiModelProperty(value = "绱фヨ仈绯讳汉") + private String emergencyLinkman; + /** + * 绱фヨ仈绯讳汉鍏崇郴 + */ + @NotNull(message = "绱фヨ仈绯讳汉鍏崇郴涓嶈兘涓虹┖") + @ApiModelProperty(value = "绱фヨ仈绯讳汉鍏崇郴") + private String emergencyLinkmanRelationship; + /** + * 绱фヨ仈绯讳汉鐢佃瘽 + */ + @Pattern(regexp = "^[0-9]*$",message = "绱фヨ仈绯讳汉鐢佃瘽鏍煎紡閿欒") + @NotNull(message = "绱фヨ仈绯讳汉鐢佃瘽涓嶈兘涓虹┖") + @ApiModelProperty(value = "绱фヨ仈绯讳汉鐢佃瘽") + private String emergencyLinkmanPhone; +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTOU.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTOU.java new file mode 100644 index 00000000..928bbe6a --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalTOU.java @@ -0,0 +1,167 @@ +package com.daqing.framework.domain.crms.ext; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import java.io.Serializable; + +/** + * 涓汉绫诲瀷瀹㈡埛淇℃伅鏇存柊 + * @auther River + * @date 2020/9/15 19:57 + */ +@Data +@ToString +public class CustomerPersonalTOU implements Serializable { + + /** + * 涓婚敭 + */ + @NotNull(message = "id涓嶈兘涓虹┖") + @ApiModelProperty(value = "id") + @TableId(value = "id", type = IdType.INPUT) + private Long id; + /** + * 瀹㈡埛缂栧彿 + */ + @NotNull(message = "瀹㈡埛缂栧彿涓嶈兘涓虹┖") + @ApiModelProperty(value = "瀹㈡埛缂栧彿") + private String code; + /** + * 瀹㈡埛绫诲瀷锛1銆佷紒涓氱被鍨嬶紝0锛氫釜浜虹被鍨 + */ + @Min(value = 0,message = "瀹㈡埛绫诲瀷鏍煎紡鏈夎") + @Max(value = 1,message = "瀹㈡埛绫诲瀷鏍煎紡鏈夎") + @NotNull(message = "瀹㈡埛绫诲瀷涓嶈兘涓虹┖") + @ApiModelProperty(value = "瀹㈡埛绫诲瀷") + private Integer type; + /** + * 瀹㈡埛鐨勭粡鐞嗕汉id + */ + @NotNull(message = "瀹㈡埛缁忕悊浜轰笉鑳戒负绌") + @ApiModelProperty(value = "瀹㈡埛缁忕悊浜篿d") + private Long manager; + /** + * 瀹㈡埛鍚嶇О + */ + @NotNull(message = "瀹㈡埛鍚嶇О涓嶈兘涓虹┖") + @ApiModelProperty(value = "瀹㈡埛鍚嶇О") + private String name; + /** + * 鑱旂郴鍦板潃 + */ + @NotNull(message = "鑱旂郴鍦板潃涓嶈兘涓虹┖") + @ApiModelProperty(value = "鑱旂郴鍦板潃") + private String addr; + /** + * 鑱旂郴鐢佃瘽 + */ + @Pattern(regexp = "^[0-9]*$",message = "鑱旂郴鐢佃瘽鏍煎紡閿欒") + @NotNull(message = "鑱旂郴鐢佃瘽涓嶈兘涓虹┖") + @ApiModelProperty(value = "鑱旂郴鐢佃瘽") + private String phone; + /** + * 韬唤璇佸彿 + */ + @NotNull(message = "韬唤璇佸彿涓嶈兘涓虹┖") + @ApiModelProperty(value = "韬唤璇佸彿") + private String idCard; + /** + * 骞撮緞 + */ + @NotNull(message = "骞撮緞涓嶈兘涓虹┖") + @ApiModelProperty(value = "骞撮緞") + private Integer age; + /** + * 鎬у埆锛1銆佺敺锛0銆佸コ + */ + @Min(value = 0,message = "鎬у埆鏍煎紡鏈夎") + @Max(value = 1,message = "鎬у埆鏍煎紡鏈夎") + @NotNull(message = "鎬у埆涓嶈兘涓虹┖") + @ApiModelProperty(value = "鎬у埆") + private Integer gender; + /** + * 濠氬Щ鐘跺喌,0:鏈,1:宸插,2:绂诲紓,3:鍐嶅 + */ + @Min(value = 0,message = "濠氬Щ鐘跺喌鏍煎紡鏈夎") + @Max(value = 3,message = "濠氬Щ鐘跺喌鏍煎紡鏈夎") + @NotNull(message = "濠氬Щ鐘跺喌涓嶈兘涓虹┖") + @ApiModelProperty(value = "濠氬Щ鐘跺喌") + private Integer maritalStatus; + /** + * 瀛﹀巻,0:鏈,1:澶т笓,2:楂樿亴,3:涓笓,4:鍏朵粬 + */ + @Min(value = 0,message = "瀛﹀巻鏍煎紡鏈夎") + @Max(value = 4,message = "瀛﹀巻鏍煎紡鏈夎") + @NotNull(message = "瀛﹀巻涓嶈兘涓虹┖") + @ApiModelProperty(value = "瀛﹀巻") + private Integer education; + /** + * 宸ヤ綔鍗曚綅 + */ + @NotNull(message = "宸ヤ綔鍗曚綅涓嶈兘涓虹┖") + @ApiModelProperty(value = "宸ヤ綔鍗曚綅") + private String employer; + /** + * 鑱屽姟 + */ + @NotNull(message = "鑱屽姟涓嶈兘涓虹┖") + @ApiModelProperty(value = "鑱屽姟") + private String position; + /** + * 宸ヤ綔骞撮檺 + */ + @NotNull(message = "宸ヤ綔骞撮檺涓嶈兘涓虹┖") + @ApiModelProperty(value = "宸ヤ綔骞撮檺") + private Integer workingYears; + /** + * 绀句繚璐﹀彿 + */ + @NotNull(message = "绀句繚璐﹀彿涓嶈兘涓虹┖") + @ApiModelProperty(value = "绀句繚璐﹀彿") + private String socialSecurityNum; + /** + * 灞呬綇鎯呭喌 + */ + @NotNull(message = "灞呬綇鎯呭喌涓嶈兘涓虹┖") + @ApiModelProperty(value = "灞呬綇鎯呭喌") + private String livingSituation; + /** + * 鎴风睄鍦板潃 + */ + @NotNull(message = "鎴风睄鍦板潃涓嶈兘涓虹┖") + @ApiModelProperty(value = "鎴风睄鍦板潃") + private String residenceAddr; + /** + * 涓氬姟鏉ユ簮 + */ + @NotNull(message = "涓氬姟鏉ユ簮涓嶈兘涓虹┖") + @ApiModelProperty(value = "涓氬姟鏉ユ簮") + private String businessSource; + /** + * 绱фヨ仈绯讳汉 + */ + @NotNull(message = "绱фヨ仈绯讳汉涓嶈兘涓虹┖") + @ApiModelProperty(value = "绱фヨ仈绯讳汉") + private String emergencyLinkman; + /** + * 绱фヨ仈绯讳汉鍏崇郴 + */ + @NotNull(message = "绱фヨ仈绯讳汉鍏崇郴涓嶈兘涓虹┖") + @ApiModelProperty(value = "绱фヨ仈绯讳汉鍏崇郴") + private String emergencyLinkmanRelationship; + /** + * 绱фヨ仈绯讳汉鐢佃瘽 + */ + @Pattern(regexp = "^[0-9]*$",message = "绱фヨ仈绯讳汉鐢佃瘽鏍煎紡閿欒") + @NotNull(message = "绱фヨ仈绯讳汉鐢佃瘽涓嶈兘涓虹┖") + @ApiModelProperty(value = "绱фヨ仈绯讳汉鐢佃瘽") + private String emergencyLinkmanPhone; +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.java index 411c3799..daa100f4 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.java @@ -5,6 +5,8 @@ import com.alibaba.excel.metadata.BaseRowModel; import lombok.Data; import lombok.ToString; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; import java.io.Serializable; /** @@ -22,104 +24,99 @@ public class CustomerPersonalVO extends BaseRowModel implements Serializable { */ @ExcelProperty(value = "缂栧彿",index = 0) private String code; - /** - * 瀹㈡埛绫诲瀷锛1銆佷紒涓氱被鍨嬶紝0锛氫釜浜虹被鍨 - */ - @ExcelProperty(value = "涓汉绫诲瀷",index = 1) - private Integer type; /** * 瀹㈡埛缁忕悊 */ - @ExcelProperty(value = "瀹㈡埛缁忕悊",index = 2) + @ExcelProperty(value = "瀹㈡埛缁忕悊",index = 1) private String manager; /** * 瀹㈡埛鍚嶇О */ - @ExcelProperty(value = "濮撳悕",index = 3) + @ExcelProperty(value = "濮撳悕",index = 2) private String name; /** * 鑱旂郴鍦板潃 */ - @ExcelProperty(value = "鍦板潃",index = 4) + @ExcelProperty(value = "鍦板潃",index = 3) private String addr; /** * 鑱旂郴鐢佃瘽 */ - @ExcelProperty(value = "鐢佃瘽",index = 5) + @ExcelProperty(value = "鐢佃瘽",index = 4) private String phone; /** * 韬唤璇佸彿 */ - @ExcelProperty(value = "韬唤璇佸彿",index = 6) + @ExcelProperty(value = "韬唤璇佸彿",index = 5) private String idCard; /** * 骞撮緞 */ - @ExcelProperty(value = "骞撮緞",index = 7) + @ExcelProperty(value = "骞撮緞",index = 6) private Integer age; /** * 鎬у埆锛1銆佺敺锛0銆佸コ */ - @ExcelProperty(value = "鎬у埆(1:鐢,0:濂)",index = 8) + @ExcelProperty(value = "鎬у埆(1:鐢,0:濂)",index = 7) private Integer gender; /** * 濠氬Щ鐘跺喌锛1銆佸凡濠氾紝0銆佹湭濠 */ - @ExcelProperty(value = "濠氬Щ鐘跺喌(0:鏈,1:宸插,2:绂诲紓,3:鍐嶅)",index = 9) + @ExcelProperty(value = "濠氬Щ鐘跺喌(0:鏈,1:宸插,2:绂诲紓,3:鍐嶅)",index = 8) private Integer maritalStatus; /** * 瀛﹀巻 */ - @ExcelProperty(value = "瀛﹀巻(0:鏈,1:澶т笓,2:楂樿亴,3:涓笓,4:鍏朵粬)",index = 10) + @ExcelProperty(value = "瀛﹀巻(0:鏈,1:澶т笓,2:楂樿亴,3:涓笓,4:鍏朵粬)",index = 9) private Integer education; /** * 宸ヤ綔鍗曚綅 */ - @ExcelProperty(value = "宸ヤ綔鍗曚綅",index = 11) + @ExcelProperty(value = "宸ヤ綔鍗曚綅",index = 10) private String employer; /** * 鑱屽姟 */ - @ExcelProperty(value = "鑱屽姟",index = 12) + @ExcelProperty(value = "鑱屽姟",index = 11) private String position; /** * 宸ヤ綔骞撮檺 */ - @ExcelProperty(value = "宸ヤ綔骞撮檺",index = 13) + @ExcelProperty(value = "宸ヤ綔骞撮檺",index = 12) private Integer workingYears; /** * 绀句繚璐﹀彿 */ - @ExcelProperty(value = "绀句繚璐﹀彿",index = 14) + @ExcelProperty(value = "绀句繚璐﹀彿",index = 13) private String socialSecurityNum; /** * 灞呬綇鎯呭喌 */ - @ExcelProperty(value = "灞呬綇鎯呭喌",index = 15) + @ExcelProperty(value = "灞呬綇鎯呭喌",index = 14) private String livingSituation; /** * 鎴风睄鍦板潃 */ - @ExcelProperty(value = "鎴风睄鍦板潃",index = 16) + @ExcelProperty(value = "鎴风睄鍦板潃",index = 15) private String residenceAddr; /** * 涓氬姟鏉ユ簮 */ - @ExcelProperty(value = "涓氬姟鏉ユ簮",index = 17) + @ExcelProperty(value = "涓氬姟鏉ユ簮",index = 16) private String businessSource; /** * 绱фヨ仈绯讳汉 */ - @ExcelProperty(value = "绱фヨ仈绯讳汉",index = 18) + @ExcelProperty(value = "绱фヨ仈绯讳汉",index = 17) private String emergencyLinkman; /** * 绱фヨ仈绯讳汉鍏崇郴 */ - @ExcelProperty(value = "绱фヨ仈绯讳汉鍏崇郴",index = 19) + @ExcelProperty(value = "绱фヨ仈绯讳汉鍏崇郴",index = 18) private String emergencyLinkmanRelationship; /** * 绱фヨ仈绯讳汉鐢佃瘽 */ - @ExcelProperty(value = "绱фヨ仈绯讳汉鐢佃瘽",index = 20) + @ExcelProperty(value = "绱фヨ仈绯讳汉鐢佃瘽",index = 19) private String emergencyLinkmanPhone; } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/PersonalTemplate.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/PersonalTemplate.java new file mode 100644 index 00000000..702584c8 --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/PersonalTemplate.java @@ -0,0 +1,133 @@ +package com.daqing.framework.domain.crms.ext; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.metadata.BaseRowModel; +import lombok.Data; +import lombok.ToString; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 瀵煎嚭excel妯℃澘(涓汉绫诲瀷) + * @auther River + * @date 2020/10/9 11:32 + */ +@Data +@ToString +public class PersonalTemplate extends BaseRowModel implements Serializable { + /** + * 瀹㈡埛缁忕悊 + */ + @NotNull(message = "瀹㈡埛缁忕悊涓嶈兘涓虹┖") + @ExcelProperty(value = "瀹㈡埛缁忕悊(璇峰～鍐欐湰鍏徃瀛樺湪鐨勫憳宸ュ鍚)",index = 0) + private String manager; + /** + * 瀹㈡埛鍚嶇О + */ + @NotNull(message = "瀹㈡埛鍚嶇О涓嶈兘涓虹┖") + @ExcelProperty(value = "濮撳悕",index = 1) + private String name; + /** + * 鑱旂郴鍦板潃 + */ + @NotNull(message = "鑱旂郴鍦板潃涓嶈兘涓虹┖") + @ExcelProperty(value = "鍦板潃",index = 2) + private String addr; + /** + * 鑱旂郴鐢佃瘽 + */ + @NotNull(message = "鑱旂郴鐢佃瘽涓嶈兘涓虹┖") + @ExcelProperty(value = "鐢佃瘽",index = 3) + private String phone; + /** + * 韬唤璇佸彿 + */ + @NotNull(message = "韬唤璇佸彿涓嶈兘涓虹┖") + @ExcelProperty(value = "韬唤璇佸彿",index = 4) + private String idCard; + /** + * 骞撮緞 + */ + @NotNull(message = "骞撮緞涓嶈兘涓虹┖") + @ExcelProperty(value = "骞撮緞",index = 5) + private Integer age; + /** + * 鎬у埆锛1銆佺敺锛0銆佸コ + */ + @NotNull(message = "鎬у埆涓嶈兘涓虹┖") + @ExcelProperty(value = "鎬у埆(1:鐢,0:濂)",index = 6) + private Integer gender; + /** + * 濠氬Щ鐘跺喌锛1銆佸凡濠氾紝0銆佹湭濠 + */ + @NotNull(message = "濠氬Щ鐘跺喌涓嶈兘涓虹┖") + @ExcelProperty(value = "濠氬Щ鐘跺喌(0:鏈,1:宸插,2:绂诲紓,3:鍐嶅)",index = 7) + private Integer maritalStatus; + /** + * 瀛﹀巻 + */ + @NotNull(message = "瀛﹀巻涓嶈兘涓虹┖") + @ExcelProperty(value = "瀛﹀巻(0:鏈,1:澶т笓,2:楂樿亴,3:涓笓,4:鍏朵粬)",index = 8) + private Integer education; + /** + * 宸ヤ綔鍗曚綅 + */ + @NotNull(message = "宸ヤ綔鍗曚綅涓嶈兘涓虹┖") + @ExcelProperty(value = "宸ヤ綔鍗曚綅",index = 9) + private String employer; + /** + * 鑱屽姟 + */ + @NotNull(message = "鑱屽姟涓嶈兘涓虹┖") + @ExcelProperty(value = "鑱屽姟",index = 10) + private String position; + /** + * 宸ヤ綔骞撮檺 + */ + @NotNull(message = "宸ヤ綔骞撮檺涓嶈兘涓虹┖") + @ExcelProperty(value = "宸ヤ綔骞撮檺",index = 11) + private Integer workingYears; + /** + * 绀句繚璐﹀彿 + */ + @NotNull(message = "绀句繚璐﹀彿涓嶈兘涓虹┖") + @ExcelProperty(value = "绀句繚璐﹀彿",index = 12) + private String socialSecurityNum; + /** + * 灞呬綇鎯呭喌 + */ + @NotNull(message = "灞呬綇鎯呭喌涓嶈兘涓虹┖") + @ExcelProperty(value = "灞呬綇鎯呭喌",index = 13) + private String livingSituation; + /** + * 鎴风睄鍦板潃 + */ + @NotNull(message = "鎴风睄鍦板潃涓嶈兘涓虹┖") + @ExcelProperty(value = "鎴风睄鍦板潃",index = 14) + private String residenceAddr; + /** + * 涓氬姟鏉ユ簮 + */ + @NotNull(message = "涓氬姟鏉ユ簮涓嶈兘涓虹┖") + @ExcelProperty(value = "涓氬姟鏉ユ簮",index = 15) + private String businessSource; + /** + * 绱фヨ仈绯讳汉 + */ + @NotNull(message = "绱фヨ仈绯讳汉涓嶈兘涓虹┖") + @ExcelProperty(value = "绱фヨ仈绯讳汉",index = 16) + private String emergencyLinkman; + /** + * 绱фヨ仈绯讳汉鍏崇郴 + */ + @NotNull(message = "绱фヨ仈绯讳汉鍏崇郴涓嶈兘涓虹┖") + @ExcelProperty(value = "绱фヨ仈绯讳汉鍏崇郴",index = 17) + private String emergencyLinkmanRelationship; + /** + * 绱фヨ仈绯讳汉鐢佃瘽 + */ + @NotNull(message = "绱фヨ仈绯讳汉鐢佃瘽涓嶈兘涓虹┖") + @ExcelProperty(value = "绱фヨ仈绯讳汉鐢佃瘽",index = 18) + private String emergencyLinkmanPhone; +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java index c4e8e7fb..9e91ff7e 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CrmsCode.java @@ -18,7 +18,9 @@ public enum CrmsCode implements ResultCode { CUSTOMER_IMPORT_EXSIT(false,20001,"瀵煎叆鏁版嵁澶辫触,璇锋鏌ユ枃浠跺拰鏁版嵁鏍煎紡鎴栫◢鍚庡啀璇!"), CUSTOMER_EXPORT_EXSIT(false,20002,"瀵煎嚭鏁版嵁澶辫触,璇风◢鍚庡啀璇!"), CUSTOMER_EXPORTTEMPLATE_EXSIT(false,20003,"瀵煎嚭excel妯℃澘澶辫触,璇风◢鍚庡啀璇!"), - NOT_NULL(false,20004,"涓婁紶鐨勬枃浠朵笉鑳戒负绌"); + NOT_NULL(false,20004,"涓婁紶鐨勬枃浠朵笉鑳戒负绌"), + CUSTOMER_IS_NULL(false,20005,"瀵煎叆鏁版嵁澶辫触,褰撳墠鍛樺伐涓嶅瓨鍦!"); + /** * 鎿嶄綔鏄惁鎴愬姛 diff --git a/dq-framework-model/target/classes/META-INF/dq-framework-model.kotlin_module b/dq-framework-model/target/classes/META-INF/dq-framework-model.kotlin_module new file mode 100644 index 0000000000000000000000000000000000000000..8fb60192d378759239a3ecbf60eac8c8de446e9c GIT binary patch literal 16 RcmZQzU|?ooU|@t|UH|}6022TJ literal 0 HcmV?d00001 diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class index 38424ed800ae5c4327e2f4f67c24b25abf22792c..2a0b2e0825ceb76eb074c833e1b847bb2de2a955 100644 GIT binary patch delta 2588 zcma);ZBSHI7{~u-m)*U)dl$=Ki3*F6uwa~xri{svVe*9}P%^bLqE^`ugGJbt=#90k z&@g4Y5NRf6nTEZ{047W}(~I=-sTX=t`(RB=HGSxFQ&auV-Bs50G_zlx`@46a|Noxz zoM+Fuzx#f=&hz;{GCc-MhrE?&oE7?;T{c|H$5 zkhdSo@R1B3%W#6fV#0w>T(|;nYWP%MKVygvWnHG>OATLX_*%oHhHvCg-#YM}1K$sQ z(Ip~6{tjQezp1g_A8u?3`qs4sL*X`mV=x@@)%e5VKwEIWfW0ly5a`%QsH?55 zFD?*pGzUTWS?f{B_ImpO1}C^^L@i@1N>B5__vZuBW?z zKDBLgY|o+C_VL)jz;LrA-)_ANcN-hYhSkP|wqVf<{26R3)ylF>6=GMaIImKvW`9ey z(VFRKMT*xDchHHkcGbh9aTle3{<&Hgi zwy>nf(aH2|v5)hvTpV&syaT=%aEXji(F^O(cCO4r`Y$weScD#e< zNEeB#(SseNi$yW>camm`N}iiNq)S8%_wOhvOSE7Ko+o9CO(=&!@`_&MBe$2BBX;vh z>myytx$vx(Iiv2OV#k4?6M1sx&xUk>fA(8t)d9Ku$$>N zaSdJ~S>O`0v4>Vx%oZ-ZOv>Q0|ADk#RpBi{NBXodfr8JU+ZB3s@(yJ?72Z|YrLbG! zJ%v3A?oG6D4a#m*xJlt=gygiIOV)dR_&z`% ze#rls?2f&PxrHvjN`|E%sN;YAB20&a8F>jR+y=5n!!9IiGHfPUvtbvJwHS6W*(_yY zE7@#JqS4trsEFw$IGKZt0P%9(s^wL9b+bDmJtPk15aVXB0#}d+#R<3)SMitV!xN7c zZ-=ujA|9=lqpWHMOx5etnQ&mCYU@;n)v{1obRk`5oK?)@u!!A=IOKgWw`|YIbF`@A z5w#Idw2FED7I9**_|!V9nu(+8{Dkt%*ntS0XPwLZGIQI@qtU#;I+tl^*_A(dR}EG% z)7K(SMa0EuHe1!qdy6`VsCgS`wTjztd%yTxCa1%B@oY^moI%MNqL{6j;*|bu)lBA_ zP6NRmxYK478)S4`9~KMaGvDeHqO4RS793-A7uszba!d7L%`!dFYVka?1OYB)4l)9l}aTjeu^kXqDEE{n^A|HvEH;EZMzB-v+Y# zk)xneHeo62xq~s%fd@DiLsnK}8Ce+`r5z8FxoD9#EGLU&zBKU}b4XyJOv6KD9y(+U z9wtj-gN(u>$c6B+1OMVt4yLdNf8jB*06*g=tRPF{SGK&z$;$b{_hKd42@=OUSVcBW zPRBYtK{i}!@Ff3o7$Gwm^3`M~N-JCGQ)Csg01bGWtWuV+eXk+QNGC>P-dfTs>0*;x zM|KjQh5fo1Ae_UimJhdPKhkfL9Phl`qv2uzmeNLx2fMb~6gE~)85-p^C})(%_se3E zMJJx&bXUgVSuzK{RAU3JVyG4$&ykfe5&ppQWG>I44_#z&EXFRpK$gH-Y{ZLX9=0-^ zFOem25N#aIWf|pP_+j!g2UGYP6S0XbkPNEu3R#*<^MgY7n_p42xqhIFL>qc%|8^a` SW@7RB|DOt*spR*^mj3`JQ7r5L diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class index 8eff526a86e2fd290f4392ba023d95b35c0c5ac8..3174291e9a2f33a8b7b9ce555da6c0d233d0a9de 100644 GIT binary patch delta 273 zcmbPlI^T2yD=(w?h>4907fGlG$i=R)O(E`l!0kUkt ztWF@y8OX9>^Z@gj`PCVH!7K+LD+tW01+v1ytX)7>44CyD$VvpWOawH5?uZp|2b1EH z_XrpOS#RNdA3+emRuCqC2h8Ucg7I^NK=O0p{6Ap6t}sl#M;Iu-d9Sbo6Oj5R8o~&q Sg2k7Bs2>uQKx%T4lr8}J2TO+l delta 273 zcmbPlI^T2yD=(wih>3~_6fGk5Wi=R)O(G1M;0kW*Y ztWF@y5y-M(bOZC5`PCV{!7K+LD*()@1+qfHtX)7>6qxlL$chKEOawH5?uZp|2b1EH z_XrpOS#RNdA3+emRuCqC2h8Ucg7I^NK=O0p{6Ap6t}sl#M;Iu-d9Sbo6Oj5R8o~&q Sg2k7Bs2>uQKx%T4lr8|`jZ0ks diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class index ba4648c3871a9064fd116f6f029f8a865695763c..1ef94e7f64b99f053d3e6c8c4b92523856d02083 100644 GIT binary patch literal 9061 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 literal 8872 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 lw$qW$SEE+jtI>{<8h zwf4Q|?6dbddFj7LpC+PH>0f?2osRn`Oy6enG@EDGJj>=eHs4|MT{hoi^E{gu*u2Q* z`)q#TrI-Bp{UMtl`RT{>6GlH}^D{O-XY&g-zhv_=n^)Mp%H~&We$D1LY+mC4uY2jY zerluR8vTxc-_Ypy8ojB}TN?dAqd#gi#=`}T#xQTZz{1QozCQ~d@_^H z3F=zWml=#(sbsI!YsC}S^d(Ypt3-$|=Ydt(%uphm--J-^tE|*;LeQCo#~v8J`Ow6% zJ0`YmnK$|Pp~9X=3R~_S-!)RWainm^;liW$6n5>K*m*-?`#pt24;J>`S=e^_eCU(u z{=_xaNDK*brL954@<=Za3JhBP{g{ZSuxo!|_hufff^29YlV<9~j)Rkr@8;2JLABY$ zhGZ_E$R_%iSwqRZl@g?nAJ|vevUT#{4R7DHop~-n8eTe_%V#&S`?ii_XNHFFw$`strjk}3-<=s8veNuvg&Pk{ zUbkcH_;t>Q`S6;=;Lyt9L3Y}!ICl8q@w@CGe&jrrOkaV#3-UoXap2h4(W4wcASl#3 zoJ*z?x!jt}aJCQ2rXyzI);;699~?hw&p}7(#ygHM;BHo`Fw36v~Uv@Bu z9hHwele`$yNnz4hRR4xVzNffnqx0sMt$b|LP&t&&?I3b=Y^{sS29 zE~T6K>tuH8r@dt=zdk1pr!xe+raXK6k|i^f#hT?#Zg?tKG?|K8JS?qPe1EQNuJ!X~ zPL-G63z9QgAZM~b#mNGyCX3;+$>PbGY(x2LigV@n_?$rYY=NiG76Yo;Vz@M0;HlZ- zp>npK#FfKV3VUPPOfTx)nCQzdoPUWRk(u7592d$klOM1vhWA#i)X{?W@YJ)iK=u?gm~NzZ)#~n^<;XuU`e$x9l?Q7oukM&kqdO+E=7~8uio_II@WrMU z+!J$_*K0HFrHxHnvq(&_D&AOe3A9*gy5ZQ2Ips65C82A{etKS#`(m`BtDV9JuTH(x zr_-5qmQIV)3pX&1dK=L1*xx{QveBbsqa2$&n_)IrvALSfUfL(9vGP8#bT}zbwx)^& znCF!2BAxzD|3FLYYU7M9vJvMLNb72|vkDmPYMYT)3#v zsH?3k$ui=MG-DVVnP^~tSDTY+Jk)lzO;0w)#C)BO&_+Qga|Whgiv|;UtKZ67@ugNS zu{v{g4^B+%^r*c;$xM7r0%v3@d96G*Yo-=Xwm58iYiKBu?iaM6ygfSy-pn)5S!o=X z)A+?+I^!TI^65m}Fi*$*>I@1}6>mo158`T2hu;rj?Kw$fk zt~h=Le%&31NIU^hMG07sJs76-z`7*R1{%PV;M#|sE`Ext_E(4-lw$M>g}Ay>+@cht z$0)?EN^zS~jNYUWyDP;fDaGh%3bChB+@Tbs7b?WwN^x8%Mh{hpwMy|BN-=t`LhP#) zpRE+5XDh`1O7UW)7`3o*LJzX86RAWB^)UND;FiTtg&b1Q2$hkV%rHnzW{nYMQjJ3j8#QGl z!>k3#Fe64SlOhhO)`*mmn$0?pn$4(D$E2u3sxzWxq!zOtq!zQmsAp1xL#j6#%1Etd zBS@`glhMeeCWq8$G?kI&mYYckM02q3lII9?ggq5C(&!P6R1{n(#!NUpoqAT4$>~5IgS+`RfSSb{xb=S%s6~uX3q1(b ziW%b{LZ^+MjbA?Y++0V>MJ0Laxr>X6Wx5Sv_zsHy1Z9}2b_A(GRrb{^Jjb=juD#Zp zg#)NOt)_D?c^8b*377MDo#|qS;c`40*Q0brO}FhrDcT~Z}9aW&{YB6=& zrI%cK(bZ}OZ5PVfQ3Z>xIcCUqg-R|IxqR1LGih4D4`7g}x@ zdKF*9|HOCd*uBR*E2p@Vl<%k$UKP~8PAs( zJ*OkmDY3!hXeb;XZKgef-N?9w@hK9cv$RLz63=1$0g2}_J{4w^POH39)|6c-N1T-x Kbky!l$NmRwa)f#S literal 0 HcmV?d00001 diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.class new file mode 100644 index 0000000000000000000000000000000000000000..bb996577a16c406631459160b12303d51f35e220 GIT binary patch literal 7330 zcmbVRd7M+#6+SnUn;jZ+$drh!_hoqQ-9wKN(FsC$Xf8eNrT{&|=29uSvuf zC6lRaG#gJPGlDvMPCPr}+HTU4% zN3T6FapczArUSTjcKrxuYm08(lg!2t5I*Yok;}&qZkyP9ICtj_f?UJVWE6}bf04X5 zWjtp-?%_=no3BRPWOR7)Zn@1jPVCx)+33Ik+|^^3Z=Kk8IJbRIZpQ{Z+Q?8U$znM@ zv338khjs`Gq+^5eOg5H|4J?k1#Iw-^BuDq%m%Do7vHe%Re$5s^N<29*n#rcuGjrXB z+}=Bn?c9hbM$GlGXc{R}k6ycZ;(;4-k3RDH9h(I?Ic6$p%D3N_+juB<*Ik0VnW1Pp zHk3*X@aw6^uGl$#aC`o#1JSi>@=<;x{FMPwEX$5?6<38O_uVJJY$WHHnME-xpWMGNKI{RCWSqk$`0{%b92RpWe@ZibLK!2 zvO}4K9H@pzp&eCAr@~nJ$qr=t$$=zf6EX>NU<5S#kXME?M-2vL(Tf_T%z~*lTqb*y zPbw!TJcht*QReOPqr&ZsHZ^$<9{LS(O0Nn?#gsYu$QE78d}Is8YeX(|F&VTlG{{0L zGt*rd*BW$bPpgwLN~e|nXmSZx47&GFG&3ao3>sYz3S!yvp1vih7+`ej%xEHuNwXLn zVY&87xUkNSuv}J0SgxWoY_3@_Y_Tft@Z(8(y~f)8pK)8_T=x@qFZ~^l7?4rFk@8rA2hAN~h5hmCoQ{51Ws&>0@&? zn~$+%1*4C%Ifu<^Hs`VVB+VCe^8eZVRr&_qpwe0zROxy~Lljr(Lb^z$1kVk#NwP_? z8DVoVOVW%oY_e=d*{ox837ZG$A-sL**UhP;ae3Z0mFHy^w}S;Ly-V+*v37@e?Rkje zAWwJ5EP(|E$3-9!mjRH{9Wn|5u&z5)RtlK*c8BuCAoWH$0J^0?3Qw3ISA~aa$+S2 z?5c8N6$tFKa^e#pu=~o1b3tH7mJ{cLz%DH(K1Ii261@O6io{276}UQPA0V+8z(#9e zoyMe(`his`paF_uBzWh-PIZ2SYO9xd8BN#1*;DGg z(9#*r+QQje>b%&}8BN~8SuJ%w)6yA-gN1W-sdJyDGY%CCXJ4uFa!Y3%Mi$OBrOxMA zI^z(taQ2rvpKs}WDXll1b!=c8Z{XQo`^jd#p&O*a+|az)Wg`}J8GXhoPF1CGWZxF_ zS^At+9DAj4WSbZCdF%IbR2oN~3WC019miQ|9C?Tc+F%{WRcRb~<_NmnI*w9l9C<_u zy23h+yV5xFL=*Hy>vi{38b=<0g08fF9&e>_h=c_A#oRr9h) zHAO&0B2BM`NYi~LB{DXP)@MWPlx08xt`)B-FDnxcRf zEE2WqwGg%Hby_Wp>P%6sR#zly)9WE>(;KvU7B!fndaa>I)UG!|)UG#ajVx+1MU7fh zk*Gu0AnMSYHH}5hrbyG8i$o#41)`ANsQHK`Fi|o5gJ_n6&Nzp5dEPwRadT1lvh!U)~okTa``_e{X+YH)- zxhk4%>!8g*b~?jmqb)!V>J#tKmw=p<5HHisKrTv)7icSxLR-W^x&_Ehw~2@8Rv-_J ziJR#*ATJ#eH`47uD!n9CsOnx?F6b9qx3x84b&jE(ti3XP@~vJ57F0vn#7}cpL>8b z@i?~Ly+F<46@1g~0%{TCc>nu=T5VNyI(;3e&F03>q5FZ_ZL^TM2Y@Jog>>2~+Q8wToPH#^|^Uc)nh@Gojf{M&S-1sRrF)P}uy2lcG8DRHN=RC})8}OOReoy33%@ z4NNarp3-#1pp*iI9wEJ&b+CGkA^;>;lGl(EM6c!|*pX9gn@w=jOc#OQvV z!4o8Iw+j6PiY* literal 0 HcmV?d00001 diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTO.class deleted file mode 100644 index 4d6d7b5fb1ea927baf9ff035e302c846adebbef9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2446 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 diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalDTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalDTO.class new file mode 100644 index 0000000000000000000000000000000000000000..a931c9677f92e7157f8f408ed198da7041dc3d0e GIT binary patch literal 9335 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%0D5R-jelaj}_h1L_n{iH&qSP?zBoDY^rw+X#yu zx)Z3!7^au#D?q)*8hW1Y0!kWN=n=XbsL$9=Kcstr`i(_=>b*b%#s&E9_W`Aht8h*D zD$t;D4K8^11Fbgh#M^!VXvnw^KLtDpG;BOc$IwGSBgWITfxZSb>I>orj;{la`J&WG z4+Eu<5&S5p+9Dl_k*~i2?uXi>le+zuemnpbspg~${-I5U@tuGm9r*EJeSH04{=;Pt z?TW9TMF%zGV|ytyzMm$}O+&koz~dQ9%C%GKorqzf%oicC9Da&USEX3tiY%HI!Tf zPE@+0WmmN1N;xs9Wc$v~#5zby}ngo!nKmlw4y@t8}%NUFh#hm39)+h1Tw>5+&ET z(%?XB6QD3XAkL$o0!8Qv zaXS4BsDWM(8?ZysaYUOKq(^~bVlDm)$eVH|Fg)}adbGIkWk zc{XXSSGbS0hbfFBY@Kzu!UK$tP#CAyI_u>M4`Q%3D2#(@(mGP%A?6&VFwUk)Yoo#= zjE`0rk1%O%Qh1E%}YOSaVfo^Nj+61bU(iROL0y3jlE@35GlPukATI-#6 zUib?fXB@qd8HcGlqrt%$KW^%b7yb&$&v1NBb_0ZLr#K8}-#zcwbDsA(JNf(Ho!6;+OFYRcC{vuDOk2%yJxJgn~rWAc=X8)Yt~*f%L|UZVLI-8)=}>o z<+>@5eDvU(z0bBEeYLaq<<{=+U+;bTy+A*sYIfBqx3?F#@?^vdfvN21ciR2syWO3g zR;S3gRkhr!0^xLKML?M%Oo5()RW;}8l~vPOHh4-V7wn=@UNIa?zWbYsTe5iUV}LS0 zcK4}l0bHIZsNQwcJ$lGX>CBUl*`6c^!%D5v?M{LGaViEUON_NnjAQBl4N>x&VyWOh z0^`Rh8JwG!r6cB@x>4ph`qG8l#$7`%8&viD>TR>=<}>dL2wRS^!$m3DZpm~6o|5An zDz+(J;8fGwv3$7I*C>*Wr~WcFz6az}_wg8eg*OPSLz!No5bT#M0t+dH%f2(QpROYB+^H z4bR}Tz~v`?EP_?8;Z=-k7{ZGhMx^x;Ue@p$F0=PhaM$Wqc}>pZTqmk@`(!3GEMZwL z?^0JIXM^dOAdwjj6W|q39CY(!L4ulF{Aw+kyxC>z6YsW1jExPmx+XAsSW7;Cos{~h z$!uGEOM4w7XvO1se#4WX@(|)5sixh}?|(O+1N?uwh7=v7ztb^@E^cy0T%Ti(&Zpp0 z9o~lckwyq-xkj3sJ!}PNUI5PF1-=P660YsZKOyu3orjYL0+Tt#faLJej7#)d?TBj>oK!y7cS(!(LJ1DP@Phg{o|2|Ag`d z)bLjJ4=A%E!wsm-R~nJI5iU7p^e=R$l!xfugf^N|8i=+cVmXx|v0Nmj%9zMQBsXy) zrKTdSAZ6^3$@=(EzJ*w6H#wy!+%HoCf%Y4ovD$C>&`Eg~UNyK0xUm^{$M0OL= z(FVFcko&QmA{{Bk_rxSQbPWdg9`maDy~FJHIwWM3N666%@yE;sJUb@s1nmZTkBT*MNUUiehrk=n5xw~zDq}^H diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOI.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOI.class new file mode 100644 index 0000000000000000000000000000000000000000..80516b0c4844ceb282c759176d1fa2f12f1e2f84 GIT binary patch literal 10958 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 Q8Pj9`=!Zgz@*-OQ4@o=4AOHXW literal 0 HcmV?d00001 diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOU.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOU.class new file mode 100644 index 0000000000000000000000000000000000000000..144e2e3473661556f48bc546bbd2fa89f2e790aa GIT binary patch literal 11854 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 literal 0 HcmV?d00001 diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class index 3de4bb98066a69d0def0fd5ac4ce4be415b0bb34..c94c638fffb0af68ae033f99a64ffe7047b5e575 100644 GIT binary patch literal 10034 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 Z5KFYp`NCYc`ofIx*gyISFE<~d{~u3wnT7xW literal 10419 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 Q@v+kOZ=52?H<+mYKd%Svr2qf` diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/PersonalTemplate.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/PersonalTemplate.class new file mode 100644 index 0000000000000000000000000000000000000000..c790d53f86edb3bedd807a4e463d6cc8a07f5297 GIT binary patch literal 10420 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 obw3_nDRDpJRTAT;#lx#%Ch0@&$Im*)#E=a(u z2@4l4B$0(EtqDfOAK*W5?^0ft*V2=ZWabbT$|aMWYQW z&ZCK^9!pTPf*>&oy8s`@o=9+N1>?jEghQExck;`UTSY5cc!PN(W@}?@Xjf4R?V0Sd zmO(R0>?4Vpw?S&@6ZNB?rF0Spoc)zo>VZPq{`C&~nw+-{@lDV>KZms?JxMaRv zHDA6trlK5Ld|viQgKkJDfur#-FAb2T+QL$8VX3yTbcHr=;mQb0;s{In0O`3PJt^Kt zi#v%^RJGptYtPF%O_-e`AdNB&I3qG%C9gO+bC&X|U^z)Tsz-hWngn-R$xh;GNN{B| ziPo?7=t4K=(oCCB=mZvx?~cya&#?J3jw{v!-9;J2TgZ#U#kL8v#*nZ3Z803x v{c;S2y5Al{k?vPwaOrVKn^Zvp@0ts{(d#^zlZ_$z8$jN&to?3bZI=1=bT1LV_u$5Z7kS$_I7QxGNs-bu>+D`zl-NsRLJ;~ zMyAchAWAN}k#^C8UYGUo!`xfQVN4;KUz{)H7iNn5UBa@9W5`mQC@mKX#Zqa=#RzyU z;e~>oiWg`}@ic}-_fo-0#ph`^JuB)n!c|EZCy;fK!z=%nIihpOyGS7E@3RsSk2q>| zN4khBRy>kIvhvePt8xbvI-#?>#S|dYG(egLNK;P3kV*n%F#)n3pt&8ao$@v|^B@k< z+W@8gL^;kUsLwFg5&1w#;V|!};4en|K^!U92>lEo6sN`XzQ9_CDFov`!cl76sukPC z;Cy#usOF)EC>|_t4NdRs$R0My7LErMDUN0MU;M3XyPlm6W%nT)5?a^ioe3p#QUTe2 zttUFSc4afqY%NcN6V0;~1OA3imN#v;2aY{%Be1JxD=(Q-B+$vEs=qQT3nzoFoMK=u zS4i#+ZEJ7Hy(~@V8iueN+7@qM3z^FrLT+eVM+jMCv;|`|_9|?a1I+oo&bYGuH_o2s d3e-ocs(ZE*mjB&pZH=*a)ymIeoWBOn{RQh0bEp6S diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/LoginLog.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/LoginLog.class new file mode 100644 index 0000000000000000000000000000000000000000..38fc931fdbdfa536be2ec6185fcd0e4e341b7428 GIT binary patch literal 3024 zcma)7U2_v<6n-|{O}5FV4S@o&Rf|?lo0KSil2VjUjfR3ysvrv6WN8+X-I8pI`~k1L z^3ogc>`gCpM#7BFIC>$@_@f-3vzw1?h%>p!dCz(GIp;ke&-><|e}DZQz#DiJ#~f}> zB8D$S+!FDnh_6K4j^R$6t0`hrL`Cpb(JT>nMQq7lEe1P|6mIIcC+mF?bsY^^9UZQY zZ5(&{^aXr(sU8kjBxm+6>lMB6Q^Sz=bH@;!6M zEYwYBt59~GEkg9VyJb6T?S_JQrD>U-wa%3L(6(pS3+K5@XxyTY`R@2X2LAvZ#%=(7ew568rrs~yfHX-L%Q#Bvh%;#>?Y*-K7 z=KVs|ZJ4%Gs5KicX36X*c)Ye{c~S%qWOFBJUGJ8a&MrP%Sb_lG+pjH2>s+Y3zDu}3 z0j-5<)LOxbYPKXbPSWfhc`!SCq977PgwCWDKC|aDI8uC)M1>EHS`XT0o!yxUA8~o} zo>lQy7H^VTu5@)U$nGaL$n|PglUYc27kV={{N27e?SI@i=>QPk3P9m;rvgxTORt#D z1<92ps+p}?zyR&a)zYO4t6WmTO-YcO*>}2%}7&1v)gr{nMeam$QgJZFBn+BD+XQ_ z?KNZ#EF!C5QLgP+j5SckS%Z(!2?KB9Edyu7d|S+S@UDUPL|noN1xE(645~fbw(C`y zq|qxgYgbndw6P=NA*q<359aIde$AQZ=lvQ;_EokgKR;-7U=Ny2TUj)44ePw+gQEi) zad77Lw&n1iEr{)s~(>`PqjpQ%3#GIF3^{0sx_} z(^6!5l>423L1b^pd3vNXr#`}Y;-?|!^hjqCWrVXjeDcglXA*3Lvo?J4(UHz1<_PEL zu=DIl=aVRQor|1Ggr!E8W*;Lmy4{BZM7P~CieS_VR&eT>IJw7|7&ngaLZ-bsIv;i1 zIKnH5a~khc3K0f%F&}N*IKoSb^TFsi(Q)GluO$v26H4Zz9AghBnb&S^=|^blUhYrC zzK1rkm-_>;OZlY^bl;>hndk2Z`9>qYMk`)am;Xj0qdvufT^P$5wSzjFyRpJf?~q7r8e~Q!A&`)w$G4P5OIh)o-krY^$Ei?IO0^ z!StOT!tfEvqAHM#+QsP7c7o_URn+`XY_jjJXSBe7bgHL=B)X|i;4apD!fL4EGPMW} z;X1A`ed*f?d`eBlRUF|@`liU=K)0kFqUCuk|Ay3!CpeH!cW_Xu>flg%CeY&@98Mnz vbVK%!26|HVGl4!O`g7Dfm>qsJ!mn((n{|X4$`iifzwim>@EL!fw{YV>;2}Fs literal 0 HcmV?d00001 diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/SystemLog$SystemLogBuilder.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/SystemLog$SystemLogBuilder.class new file mode 100644 index 0000000000000000000000000000000000000000..87c86c971dc4108bb77ad19002e707f6aaf163ce GIT binary patch literal 3469 zcmcguYje{^6uok6OSTm|7z(8iYFY}8F%jWWpe8hsls2tN3JIa zSz+@9oBM1YuvulZ#^xcLbvBRKe92~m%~x!`R_U88P0_b1eV3&o-P7oM_CIK3vTtbA z)TpJA(CD#7ZH+cHvNYP#=!r(QMjeeDja<&{s`OMPPoad>Qm9zpGPg~`Hl4Py>U);c zt|^pldcyR@n$-~sP05VDZ`sBoqWHUJyY0Hz7Pdl1L+h6uU$ljXgh{t6Jkz&a=b>Zy z3Z*;3-*mBE()8Lr%=MujyG0%*G6B&%2nbUf(xysJblE|^i2y#x~0%Wd3qfOT5wxfQ>a^xSnhWk!do*N zHX_Bk+cfQU)3bO!2qyha3&)>Yectm$r|!1z^eww3P)vQvafG*Eo4uYu#$3JWc8r$! z6a_UNd-%X-uJ^=fxgFDTj7_i8Ge#U|Mrgo>0^To&>N>cW=|gg^3^>O(d055=;ZqK8 z|FERPV~#KQu#Bk&-;zQz<$uG(@7#A~?G-wPwNXl0b^BgZ+_m`0KxbNHv|x zG_6yG&g)dA3p&m4)L?Uw%`BTsY%a68!saS{pwl%**V){lX@x5B-xKePCwOB2aYt|U z)cBkuH27oLYR&27Qy&Vfmd0%$2yR29)zVP=bI?Jxv`6R&WvV5qbzrqxV!6wxR6H;! zhN8zT9}o_8k3g7{rH@dyS{kTdE(oa|fkL$u7W}>lG>?daGA_|)3f1D5@qjFGwsA>U z8e5`?&h|%G0t2D$Z<6uJpyz$@^n$}TBC0VHS+HXQ^{(k)}GG(wF$-(#Xt`%C0BASRz#06ubDt#P9l#ETp6=$NE=ub<noQW<*6REL@_|Y)YY&4M;n}}Z>6J3fX%ETt(XUjyFqlvPyiTK?!(UoYT zTx=p14ijCayRZjdwjP^^mB&QaqE9p#n~0^$MAxH<^0A3n`%H8rny3()h?@r!eL|nY za*ej||2wyi`ByZxQF(y|@PZ~Vk{BtBG=_?yVPr6}7�bV-h2eQP`y;(QQL^o%vDM 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 literal 0 HcmV?d00001 diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/Token.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/Token.class new file mode 100644 index 0000000000000000000000000000000000000000..379db14ba60c22a71227c770472d36816cd60751 GIT binary patch literal 2491 zcma)8U31$+6g_K8vaHA?ahn!HfB>O5aZ*7E6r2xe)3lf-Zb+O!OKGdvB35f#sVx`! zBl-vU0pukQ?F^(dFvGx0nc+tpb%9KK9o!{EFrhmr(rNoiXSU&-ay3EVVbqNwARoWGI7Z5`k0xTE8)T-{5+7SP%) zr&*{7jI7?bAK6yTZtPmCUSoG&AhXeK_-@_Vc3bXF&AHTQc)snsUZW*2yIS_@){gDf z-HO+?>W_D*Y3vl8v3;jRrkya_zFV`daFSrh|ZCa6d~Ow z9XUEaNTM|7VcV`T4Lxpd?A&+C{`}M}0pa!5CQ`9*o?msE0z)#5lSjQ~2D_c55h$Y) z4~4pDH5{mV3LNUYxAd~zSdk1Fa@B5C!veF~1rk`_D6FlJA!V)UwAwXaAkjHmn>;#p zvd5$Eg-H@HHobPU>|AwgY#Jj-=XrTk1gsPFa?nRbHjHfNM|Q0(-N=Ty8=P$7O}u5| z49=Q(4X>Mc0}}%0U$5%QG=W^SvRb)L< zK_J<%Ad4n;P?iJV0exm7Aht-*%*1h0xE4I-bL4o*j{Sy}W^V1hJ*PqY*+HGw)tx;= zn3Ep-QA_G-XTe#W zeh%@BLJX4}wP4f0JCw~3fOB}4D_(z0aqKnz8L_8*#=`@RS(E|B@qXixfyON60Ar=! zcyyrg`5;zFJI^3voVDrPFNh5e`b>z3f|dyh6D;r^e}=;Fd;G*t>PJ>X=KKOa801Ge zsUKNQ>4&`@`Vk3oPBN}1x#^#vDhIhgq5cRpevtbE>e|foA+%sgAyJ&+kXL5^!caze zfzf@Kvl-EbCZl2MJ#!$9K<`gUYHB=dSHBd33fsvk31J(FoT1(-95v@2ja2d;_!@oVa zLMa9V*RevXao)xY%#F;^65oMqlvE=5K1KBJ5G}9y+;1>%K1VA3(jkUr6o(i|kA`xR oQ#u{WhTK0z`4Ff3uUGf0Fc-0lp%B#hi{J&4Pt0|Gt1Ybk3#{zr00000 literal 0 HcmV?d00001 diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/LoginRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/LoginRequest.class new file mode 100644 index 0000000000000000000000000000000000000000..9a71d19f5c4380ecf9ecfd53516f0a194bfd3dff GIT binary patch literal 3199 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 literal 0 HcmV?d00001 diff --git a/dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/OdcProperties$Oss.class b/dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/OdcProperties$Oss.class new file mode 100644 index 0000000000000000000000000000000000000000..b46391e27d0523cb049e8fd58f839e81cc10cfd5 GIT binary patch literal 3470 zcmbVOTW=dx5dPNQo9(sZy1CReZ36_zwdT?Sb(%t3(h`~*O)s?Ey0N$MHjbUHH-$bT zA%y4)JR$J|=u446Kq>)3g@+>X2l@lxXHd#_cGvdWU5S8X&6zXjo7pon-|YJLzkm1{ zzyY{PJc9EHXm~@23qo8J;!Ppm((q1_>$^f+5>QiUD?*fnC<|eUgUcFLlgQ${j*3`q z9anU$>8R>h*HII;x`qu2x>YN0)a{xpAvbr$yk-`vW^J{w>^gRBbxK0YES0QAB%4TWJau>{XOG0A9u`b*1pLMDd)Wdeoc8^GikBpv^ARn)niRhWL zYu3W%`ikY8F;}Xzy-+r< z@`8oScFnAnY_nQeHC^jH^Lk;^wX222a%st_Z&;3NTa95x5t*!7?o2D$-jUI$bTb4U z4QHGS8=6U{X*?Fn+u(kwoqDPfep27a!w(V_$_?VC-z3iH$wRv;HBNKwJb=nyYsf3sgWi_rVTg{^qm+Am1&wR3mN=E z(U_hXYL|+8V`8XPEN-Py17|SK`DkCoXQ+h2f6SfTG&eSQO$n1xQ~1ze2H8%r4H{pg zfP$Fl2DO-Ih_|vQ-paOkD?7ur2a;$W<>TBHxJq1=vD=Wo@nFN0s%OmM3F?Lqz>^r| zP7>Xr>~#JPv9G(Fdn29M&x4EO$HiM>>;05zb1t^FX9Ci5KClc02Ei zbbcDouq&cqMXoWf>e%@Ah((vX-$w-H7OfC{mGCV66w;etL=IPU$oO_c3W~Hs?(sq% zhz==lH>6-&E971;}7= zV_!m%Z;k%~?F%UJTjO`2%}V5&oTL90rm4v|iBEBa znu2+Jf|sbNsA3H-Q`7jCwQ!W0j?Zuc$EYRnInRz$OJa-fpI4}*@Du4gL(L!x^vG%Y zU&v@Uc^~~6Ugb}h?qip)CjMP*4#^=lRu0nqQ?0V9TjB|Np-&E{IOG7Wl)&B zC_^xIQyx|L>7j{}Ed9w4Iz!yZP92t~Jwgm-rz)g_o*lmlZE_1emxMi4l*K__4o-AI z69333D&7(K;W_DfrFoPts@{>>IwEU)uS`+%j!2lmOY@EfquYDhzh;nE93NwjE#qGa ze1rvRF*f7_EHc+P6RTi}n#|VD<8^8ZF0cZpsi|-=fMsf$*Q`H~d_aTDW=Rqo1W9_p z5bb?T82X?z0ZokDX$oL!2-Ze+TLZAx32x&f4gwebA(ysS^cfvlCVt`lj^i3jCBBq% zKO%eKHg@E4Ti7WY&n4IE>nWl4`8wxrXRhDZ(?TEc^^DMWQEVaK{rw1kaOZ-S#c^Y2ZP4W&J-o{f%`~y`9Yrp^i literal 0 HcmV?d00001 diff --git a/dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/OdcProperties.class b/dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/OdcProperties.class new file mode 100644 index 0000000000000000000000000000000000000000..0503c0ac18271cc07d8b047faede64932c12a464 GIT binary patch literal 3406 zcmbVOZF3V<6n-|@&2G}A4S@myRKSXTkGu#aeNm__R$E$IsDc&QZnn+RbT@1^6n+GM zz#kxA_@FaVW@N_EFF50G67jkFlBA{Mn9gMGJ@?#m&OPTjFPp#q`Smvd7x6HI6IfC4 zT?PrPq|t%9D!$J^2@m&F7#V2cVO52hp+re6mQY+1)Vf&8;%KY5pFs{Q8aBjU5zD3q zM}w=ODozhncoI^RuCr#ZOVDQ=$MPmCMy+PmBq&#Fj~!D&a=yk>(iQ8+v!=UQC>alI zXT7jyJBDN0My0TB_|}&3xKQ`)N@2caE_iO$@_gH>^-y_~wv5o$<+k+$CukvMMqZAz zZ6b_M*ch`N+n-=Cy?x6PL5 zoNM=a@$S0i2OwVV?Q2&(0#KugC?8k$VI)Q|O*3)2i~F$Cgt8WeG}61Thy?!GIm<7* zr3J$?HZ9-sh^|JnQJBT{4Tn(*(`nj?;~Z_@P!y)Hl(HVwjS5}s?w!4FJTwXwgQY*e zdfzhr(Y`wpBv%y7TUV@k*DqV_FHICqPtZQ;fECi2fNg|*(Ggz6r{Kzr+cLb1j|Y}~ z!`zrNszF_H3It88nT9hZJmq_3qgD<}n{_@zM-~=m=BDT=>6B;H>J^{GA9|7MiQZIu z;s-R}UGhCPxP-$jk!EBem-U=ka_gRHP1`}U?CAGlAub`mSa*DT(^|G`He2Yb8QSGxCHf-XR}1>szH9%i}aZnkSg)B)_}N7pa7RKG+E&_YO#+2)Oq0 zv_eUV``P{%kosRDar*_5&mogkNT!}cC8?22KS$>0z)m069AvI4R~=pG#BpTNPmUg1 z!vF?(qWc(*UMg@GFDd=MK>mqD0>V%#VCpT(N<*3X+Cy30t=ze%GV{ELa%Q)3tJ}?& zFYrH1A^@n!Jt6$;A0RAE07Adj;OQfwMC7-KNkGqD5#dTaWO=xR%X^tr|F21r#fHf< zfyohE*~?^0n*Q5MQ4kH2J%LH~NoZ0U;htsyPX_vbgd#s1_yZk3KuJCu_#GW{gZJ@TNaUiecQ!PT-qDrA` zQOm1BNQ;EjycP?|&*)IHrEWs}S3*Y{_&>oI#u-^R9$|uonBe@d@dwXD?2(Sj|Yi3 znH?=N4O({KDb%5D9K0v^T}4@3s9ekm8%T#r-f}Tju^X_it*rjXQVnE#4vLI3w3MluxpT74GkH KPjG(^>3;!Vlk6M- literal 0 HcmV?d00001 diff --git a/dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/RedisUtil.class b/dq-govern-gateway/target/classes/com/daqing/financial/gateway/util/RedisUtil.class new file mode 100644 index 0000000000000000000000000000000000000000..768d5eb344c8dc460e22f2ede0132e015746d542 GIT binary patch literal 8346 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 literal 0 HcmV?d00001 diff --git a/瀹㈡埛璧勬簮淇℃伅涓瑙堣〃.xlsx b/瀹㈡埛璧勬簮淇℃伅涓瑙堣〃.xlsx new file mode 100644 index 00000000..e69de29b diff --git a/瀹㈡埛璧勬簮淇℃伅琛ㄦā鏉.xlsx b/瀹㈡埛璧勬簮淇℃伅琛ㄦā鏉.xlsx new file mode 100644 index 00000000..e69de29b