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] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=8D=95=E6=AC=A1=E6=9F=A5?= =?UTF-8?q?=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()); //属性拷贝，将上级部门id（如果有）、部门名称设置到实体类 BeanUtils.copyProperties(deptAddRequest, deptEntity); //2、判断部门上级id是否为空，为空则此部门是一级部门，否则查询并计算部门层级，并判断部门层级是否大于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; /** * 客户基本信息表id */ + @ApiModelProperty(value = "客户基本信息表id") 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 = "客户经理人id") 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; /** * 客户基本信息表id */ + @ApiModelProperty(value = "客户基本表id") 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: