系统日志添加

master
shijie 4 years ago
parent 5e79ce0b9c
commit 25e827cefe
  1. 2
      dq-financial-api/src/main/java/com/daqing/financial/hrauth/SystemLogControllerApi.java
  2. 4
      dq-financial-crms/pom.xml
  3. 8
      dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCompanyPersonalController.java
  4. 4
      dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCustomerRelatedController.java
  5. 14
      dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java
  6. 8
      dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerWorkbenchController.java
  7. 86
      dq-financial-crms/src/main/resources/bootstrap.properties
  8. 12
      dq-financial-guarantee/pom.xml
  9. 3
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/DqFinancialGuaranteeApplication.java
  10. 36
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/config/IPageConfig.java
  11. 11
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java
  12. 9
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsInvestigationController.java
  13. 9
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java
  14. 4
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyForController.java
  15. 5
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyUserController.java
  16. 8
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java
  17. 5
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgFormDesignController.java
  18. 9
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java
  19. 8
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java
  20. 8
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanCommitteeConsiderController.java
  21. 7
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java
  22. 9
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgMessageInvestigationController.java
  23. 6
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java
  24. 7
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessManageController.java
  25. 6
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessUserController.java
  26. 7
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgStatisticsController.java
  27. 8
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgWorkConferenceConsiderController.java
  28. 7
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java
  29. 7
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java
  30. 7
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java
  31. 86
      dq-financial-guarantee/src/main/resources/bootstrap.properties
  32. 6
      dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/annotation/Log.java
  33. 20
      dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/aspect/Operation.java
  34. 14
      dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/aspect/SysLogAspect.java
  35. 48
      dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/config/CustomExpiredSessionStrategy.java
  36. 15
      dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/config/SecurityConfig.java
  37. 11
      dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/RolePermissionController.java
  38. 16
      dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/SystemLogController.java
  39. 40
      dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/controller/UserLoginController.java
  40. 4
      dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/dao/SystemLogMapper.java
  41. 20
      dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/enums/OperationUnit.java
  42. 6
      dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/feign/HrauthFeignService.java
  43. 3
      dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/feign/HrmsFeignService.java
  44. 5
      dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/SystemLogService.java
  45. 11
      dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/SystemLogServiceImpl.java
  46. 12
      dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserServiceImpl.java
  47. 88
      dq-financial-hrms-auth/src/main/resources/bootstrap.properties
  48. 12
      dq-financial-hrms-auth/src/main/resources/mapper/hrauth/SystemLogMapper.xml
  49. 4
      dq-financial-hrms/pom.xml
  50. 3
      dq-financial-hrms/src/main/java/com/daqing/financial/hrms/DqFinancialHrmsApplication.java
  51. 26
      dq-financial-hrms/src/main/java/com/daqing/financial/hrms/config/IPageConfig.java
  52. 28
      dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java
  53. 2
      dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/EmployeeDao.java
  54. 3
      dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/EmployeeService.java
  55. 8
      dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java
  56. 88
      dq-financial-hrms/src/main/resources/bootstrap.properties
  57. 10
      dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml
  58. 8
      dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java
  59. 3
      dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/SystemLog.java
  60. 70
      dq-govern-gateway/src/main/resources/bootstrap.properties

@ -18,7 +18,7 @@ import io.swagger.annotations.ApiOperation;
public interface SystemLogControllerApi { public interface SystemLogControllerApi {
@ApiOperation(value = "系统日志列表") @ApiOperation(value = "系统日志列表")
ResponseResult list(Integer page, Integer size); ResponseResult list(Integer page, Integer size, UserLoginLogRequest userLoginLogRequest);
@ApiOperation(value = "登录日志列表") @ApiOperation(value = "登录日志列表")
ResponseResult loginLogList(Integer page, Integer size, UserLoginLogRequest userLoginLogRequest); ResponseResult loginLogList(Integer page, Integer size, UserLoginLogRequest userLoginLogRequest);

@ -21,12 +21,12 @@
<dependencies> <dependencies>
<!-- <dependency> <dependency>
<groupId>com.daqing.financial</groupId> <groupId>com.daqing.financial</groupId>
<artifactId>dq-financial-hrms-auth</artifactId> <artifactId>dq-financial-hrms-auth</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency>--> </dependency>
<dependency> <dependency>
<groupId>com.daqing.financial</groupId> <groupId>com.daqing.financial</groupId>
<artifactId>dq-financial-api</artifactId> <artifactId>dq-financial-api</artifactId>

@ -4,6 +4,9 @@ package com.daqing.financial.crms.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.daqing.financial.crms.service.ICrmsCompanyPersonalService; import com.daqing.financial.crms.service.ICrmsCompanyPersonalService;
import com.daqing.financial.crms.service.ICrmsCustomerRelatedService; import com.daqing.financial.crms.service.ICrmsCustomerRelatedService;
import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.enums.OperationType;
import com.daqing.financial.hrauth.enums.OperationUnit;
import com.daqing.framework.domain.crms.CrmsCompanyPersonal; import com.daqing.framework.domain.crms.CrmsCompanyPersonal;
import com.daqing.framework.domain.crms.CrmsCustomerRelated; import com.daqing.framework.domain.crms.CrmsCustomerRelated;
import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.model.response.ResponseResult;
@ -39,6 +42,7 @@ public class CrmsCompanyPersonalController {
/** /**
* 个人/企业关联人列表 * 个人/企业关联人列表
*/ */
@Log(detail = "个人/企业关联人列表",level = 3,operationUnit = OperationUnit.COMPANY,operationType = OperationType.SELECT)
@GetMapping("/companyPersonalList") @GetMapping("/companyPersonalList")
@ApiOperation(value = "个人/企业关联人列表") @ApiOperation(value = "个人/企业关联人列表")
public ResponseResult companyPersonalList(@RequestParam("page") Integer page, @RequestParam("size") Integer size public ResponseResult companyPersonalList(@RequestParam("page") Integer page, @RequestParam("size") Integer size
@ -50,6 +54,7 @@ public class CrmsCompanyPersonalController {
/** /**
* 新增个人/企业关联人 * 新增个人/企业关联人
*/ */
@Log(detail = "新增个人/企业关联人",level = 3,operationUnit = OperationUnit.COMPANY,operationType = OperationType.INSERT)
@PostMapping("/insertCompanyPersonal") @PostMapping("/insertCompanyPersonal")
@ApiOperation(value = "新增个人/企业关联人") @ApiOperation(value = "新增个人/企业关联人")
public ResponseResult insertCompanyPersonal(@RequestBody @Valid CrmsCompanyPersonal crmsCompanyPersonal) { public ResponseResult insertCompanyPersonal(@RequestBody @Valid CrmsCompanyPersonal crmsCompanyPersonal) {
@ -74,6 +79,7 @@ public class CrmsCompanyPersonalController {
* @param crmsCompanyPersonal * @param crmsCompanyPersonal
* @return * @return
*/ */
@Log(detail = "编辑个人/企业关联人",level = 3,operationUnit = OperationUnit.COMPANY,operationType = OperationType.UPDATE)
@PostMapping("/updateCompanyPersonal") @PostMapping("/updateCompanyPersonal")
@ApiOperation(value = "编辑个人/企业关联人") @ApiOperation(value = "编辑个人/企业关联人")
public ResponseResult updateCompanyPersonal(@RequestBody CrmsCompanyPersonal crmsCompanyPersonal){ public ResponseResult updateCompanyPersonal(@RequestBody CrmsCompanyPersonal crmsCompanyPersonal){
@ -84,6 +90,7 @@ public class CrmsCompanyPersonalController {
/** /**
* 删除个人/企业关联人 * 删除个人/企业关联人
*/ */
@Log(detail = "删除个人/企业关联人",level = 3,operationUnit = OperationUnit.COMPANY,operationType = OperationType.DELETE)
@PostMapping("/deleteCompanyPersonal") @PostMapping("/deleteCompanyPersonal")
@ApiOperation(value = "删除个人/企业关联人") @ApiOperation(value = "删除个人/企业关联人")
public ResponseResult deleteCompanyPersonal(@RequestBody Long[] ids) { public ResponseResult deleteCompanyPersonal(@RequestBody Long[] ids) {
@ -108,6 +115,7 @@ public class CrmsCompanyPersonalController {
/** /**
* 查询个人/企业关联人 * 查询个人/企业关联人
*/ */
@Log(detail = "查询个人/企业关联人",level = 3,operationUnit = OperationUnit.COMPANY,operationType = OperationType.SELECT)
@GetMapping("/selectCompanyPersonal") @GetMapping("/selectCompanyPersonal")
@ApiOperation(value = "查询个人/企业关联人") @ApiOperation(value = "查询个人/企业关联人")
public ResponseResult selectCompanyPersonal(@RequestParam("id")Integer id) { public ResponseResult selectCompanyPersonal(@RequestParam("id")Integer id) {

@ -2,6 +2,9 @@ package com.daqing.financial.crms.controller;
import com.daqing.financial.crms.service.ICrmsCustomerRelatedService; import com.daqing.financial.crms.service.ICrmsCustomerRelatedService;
import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.enums.OperationType;
import com.daqing.financial.hrauth.enums.OperationUnit;
import com.daqing.framework.domain.crms.CrmsCompanyPersonal; import com.daqing.framework.domain.crms.CrmsCompanyPersonal;
import com.daqing.framework.domain.crms.CrmsCustomerRelated; import com.daqing.framework.domain.crms.CrmsCustomerRelated;
import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.model.response.ResponseResult;
@ -37,6 +40,7 @@ public class CrmsCustomerRelatedController {
/** /**
* 新增关联关系 * 新增关联关系
*/ */
@Log(detail = "新增关联关系",level = 3,operationUnit = OperationUnit.COMPANY,operationType = OperationType.INSERT)
@PostMapping("/insertCustomerRelated") @PostMapping("/insertCustomerRelated")
@ApiOperation(value = "新增关联关系") @ApiOperation(value = "新增关联关系")
public ResponseResult insertCustomerRelated(@RequestBody List<CrmsCustomerRelated> relatedList) { public ResponseResult insertCustomerRelated(@RequestBody List<CrmsCustomerRelated> relatedList) {

@ -3,6 +3,9 @@ package com.daqing.financial.crms.controller;
import com.daqing.financial.crms.CustomerControllerApi; import com.daqing.financial.crms.CustomerControllerApi;
import com.daqing.financial.crms.model.request.CompanyCustomerRequest; import com.daqing.financial.crms.model.request.CompanyCustomerRequest;
import com.daqing.financial.crms.service.CustomerService; import com.daqing.financial.crms.service.CustomerService;
import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.enums.OperationType;
import com.daqing.financial.hrauth.enums.OperationUnit;
import com.daqing.framework.domain.crms.CompanyCustomerEntity; import com.daqing.framework.domain.crms.CompanyCustomerEntity;
import com.daqing.framework.domain.crms.CustomerEntity; import com.daqing.framework.domain.crms.CustomerEntity;
import com.daqing.framework.domain.crms.ext.CustomerCompanyTOI; import com.daqing.framework.domain.crms.ext.CustomerCompanyTOI;
@ -56,6 +59,7 @@ public class CustomerController implements CustomerControllerApi {
/** /**
* 查询客户列表(所有)根据创建时间筛选根据客户类型筛选根据客户编号或者名称搜索 * 查询客户列表(所有)根据创建时间筛选根据客户类型筛选根据客户编号或者名称搜索
*/ */
@Log(detail = "查询客户列表",level = 3,operationUnit = OperationUnit.COMPANY,operationType = OperationType.SELECT)
@GetMapping("/queryList") @GetMapping("/queryList")
//@PreAuthorize("hasPermission('/crms/customer/queryList','222')") //@PreAuthorize("hasPermission('/crms/customer/queryList','222')")
public ResponseResult queryList(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, CustomerRequest customerRequest) { public ResponseResult queryList(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size, CustomerRequest customerRequest) {
@ -66,6 +70,7 @@ public class CustomerController implements CustomerControllerApi {
/** /**
* 根据客户id查询客户的详细信息 * 根据客户id查询客户的详细信息
*/ */
@Log(detail = "查询客户详细",level = 4,operationUnit = OperationUnit.COMPANY,operationType = OperationType.SELECT)
@GetMapping("/queryDetails") @GetMapping("/queryDetails")
public ResponseResult queryDetails(@RequestParam("id") Long id){ public ResponseResult queryDetails(@RequestParam("id") Long id){
@ -75,6 +80,7 @@ public class CustomerController implements CustomerControllerApi {
/** /**
* 根据客户id删除所选客户 * 根据客户id删除所选客户
*/ */
@Log(detail = "删除客户",level = 4,operationUnit = OperationUnit.COMPANY,operationType = OperationType.DELETE)
@DeleteMapping("/deleteCustomer") @DeleteMapping("/deleteCustomer")
public ResponseResult deleteCustomer(@RequestBody Long[] ids){ public ResponseResult deleteCustomer(@RequestBody Long[] ids){
List<String> list = customerService.updateCustomerById(ids); List<String> list = customerService.updateCustomerById(ids);
@ -93,6 +99,7 @@ public class CustomerController implements CustomerControllerApi {
/** /**
* 保存个人类型客户信息 * 保存个人类型客户信息
*/ */
@Log(detail = "保存个人类型客户信息",level = 4,operationUnit = OperationUnit.COMPANY,operationType = OperationType.INSERT)
@PostMapping("/savePersonal") @PostMapping("/savePersonal")
public ResponseResult savePersonal(@RequestBody @Valid CustomerPersonalTOI customerPersonalTOI) { public ResponseResult savePersonal(@RequestBody @Valid CustomerPersonalTOI customerPersonalTOI) {
boolean result = customerService.saveCustomerPersonal(customerPersonalTOI); boolean result = customerService.saveCustomerPersonal(customerPersonalTOI);
@ -102,6 +109,7 @@ public class CustomerController implements CustomerControllerApi {
/** /**
* 保存企业类型客户信息 * 保存企业类型客户信息
*/ */
@Log(detail = "保存企业类型客户信息",level = 4,operationUnit = OperationUnit.COMPANY,operationType = OperationType.INSERT)
@PostMapping("/saveCompany") @PostMapping("/saveCompany")
public ResponseResult saveCompany(@RequestBody @Valid CompanyCustomerRequest companyCustomerRequest) { public ResponseResult saveCompany(@RequestBody @Valid CompanyCustomerRequest companyCustomerRequest) {
boolean result = customerService.insertCompany(companyCustomerRequest); boolean result = customerService.insertCompany(companyCustomerRequest);
@ -111,6 +119,7 @@ public class CustomerController implements CustomerControllerApi {
/** /**
* 更新个人类型客户信息 * 更新个人类型客户信息
*/ */
@Log(detail = "更新个人类型客户信息",level = 4,operationUnit = OperationUnit.COMPANY,operationType = OperationType.UPDATE)
@PostMapping("/updatePersonal") @PostMapping("/updatePersonal")
public ResponseResult updatePersonal(@RequestBody @Valid CustomerPersonalTOU customerPersonalTOU) { public ResponseResult updatePersonal(@RequestBody @Valid CustomerPersonalTOU customerPersonalTOU) {
boolean result = customerService.updateCustomerPersonal(customerPersonalTOU); boolean result = customerService.updateCustomerPersonal(customerPersonalTOU);
@ -120,6 +129,7 @@ public class CustomerController implements CustomerControllerApi {
/** /**
* 更新企业类型客户信息 * 更新企业类型客户信息
*/ */
@Log(detail = "更新企业类型客户信息",level = 4,operationUnit = OperationUnit.COMPANY,operationType = OperationType.UPDATE)
@PostMapping("/updateCompany") @PostMapping("/updateCompany")
public ResponseResult updateCompany(@RequestBody @Valid CompanyCustomerRequest companyCustomerRequest) { public ResponseResult updateCompany(@RequestBody @Valid CompanyCustomerRequest companyCustomerRequest) {
boolean result = customerService.updateCompanyNew(companyCustomerRequest); boolean result = customerService.updateCompanyNew(companyCustomerRequest);
@ -129,6 +139,7 @@ public class CustomerController implements CustomerControllerApi {
/** /**
* 导出数据到excel * 导出数据到excel
*/ */
@Log(detail = "导出数据",level = 4,operationUnit = OperationUnit.COMPANY,operationType = OperationType.SELECT)
@GetMapping("/excelExport") @GetMapping("/excelExport")
public void excelExportCustomer(HttpServletResponse response){ public void excelExportCustomer(HttpServletResponse response){
@ -138,6 +149,7 @@ public class CustomerController implements CustomerControllerApi {
/** /**
* 导出excel模板 * 导出excel模板
*/ */
@Log(detail = "导出excel模板",level = 4,operationUnit = OperationUnit.COMPANY,operationType = OperationType.SELECT)
@GetMapping("/excelTemplate") @GetMapping("/excelTemplate")
public void excelTemplate(HttpServletResponse response){ public void excelTemplate(HttpServletResponse response){
@ -147,6 +159,7 @@ public class CustomerController implements CustomerControllerApi {
/** /**
* 导入excel数据 * 导入excel数据
*/ */
@Log(detail = "导入excel数据",level = 4,operationUnit = OperationUnit.COMPANY,operationType = OperationType.INSERT)
@PostMapping("/excelImport") @PostMapping("/excelImport")
public ResponseResult excelImportCustomer(MultipartFile file){ public ResponseResult excelImportCustomer(MultipartFile file){
@ -156,6 +169,7 @@ public class CustomerController implements CustomerControllerApi {
/** /**
* 根据客户编号/客户名称获取企业信息 * 根据客户编号/客户名称获取企业信息
*/ */
@Log(detail = "获取企业信息",level = 4,operationUnit = OperationUnit.COMPANY,operationType = OperationType.SELECT)
@ApiOperation(value = "根据客户编号/客户名称获取企业信息") @ApiOperation(value = "根据客户编号/客户名称获取企业信息")
@PostMapping("/queryCustomerInfoById") @PostMapping("/queryCustomerInfoById")
public ResponseResult queryCustomerInfoById(@RequestBody DgApplyAmountInfoRequest applyAmountInfo){ public ResponseResult queryCustomerInfoById(@RequestBody DgApplyAmountInfoRequest applyAmountInfo){

@ -3,6 +3,9 @@ package com.daqing.financial.crms.controller;
import com.daqing.financial.crms.CustomerWorkbenchControllerApi; import com.daqing.financial.crms.CustomerWorkbenchControllerApi;
import com.daqing.financial.crms.model.request.CompanyCustomerRequest; import com.daqing.financial.crms.model.request.CompanyCustomerRequest;
import com.daqing.financial.crms.service.CustomerWorkbenchService; import com.daqing.financial.crms.service.CustomerWorkbenchService;
import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.enums.OperationType;
import com.daqing.financial.hrauth.enums.OperationUnit;
import com.daqing.framework.domain.crms.ext.CustomerCompanyTOI; import com.daqing.framework.domain.crms.ext.CustomerCompanyTOI;
import com.daqing.framework.domain.crms.ext.CustomerCompanyTOU; import com.daqing.framework.domain.crms.ext.CustomerCompanyTOU;
import com.daqing.framework.domain.crms.ext.CustomerPersonalTOI; import com.daqing.framework.domain.crms.ext.CustomerPersonalTOI;
@ -38,6 +41,7 @@ public class CustomerWorkbenchController implements CustomerWorkbenchControllerA
/** /**
* 列表 * 列表
*/ */
@Log(detail = "工作台客户资源列表",level = 3,operationUnit = OperationUnit.COMPANY,operationType = OperationType.SELECT)
@Override @Override
@GetMapping("/list") @GetMapping("/list")
public ResponseResult List(@RequestParam("page") Integer page, @RequestParam("size") Integer size, CustomerWorkbenchRequest customerWorkbenchRequest) { public ResponseResult List(@RequestParam("page") Integer page, @RequestParam("size") Integer size, CustomerWorkbenchRequest customerWorkbenchRequest) {
@ -50,6 +54,7 @@ public class CustomerWorkbenchController implements CustomerWorkbenchControllerA
/** /**
* 详情 * 详情
*/ */
@Log(detail = "工作台客户资源详情",level = 4,operationUnit = OperationUnit.COMPANY,operationType = OperationType.SELECT)
@GetMapping("/info") @GetMapping("/info")
@Override @Override
public ResponseResult info(@RequestParam("id") Long id) { public ResponseResult info(@RequestParam("id") Long id) {
@ -60,6 +65,7 @@ public class CustomerWorkbenchController implements CustomerWorkbenchControllerA
/** /**
* 删除 * 删除
*/ */
@Log(detail = "删除工作台客户",level = 3,operationUnit = OperationUnit.COMPANY,operationType = OperationType.DELETE)
@Override @Override
@PostMapping("/delete") @PostMapping("/delete")
public ResponseResult delete(@RequestBody Long[] ids) { public ResponseResult delete(@RequestBody Long[] ids) {
@ -79,6 +85,7 @@ public class CustomerWorkbenchController implements CustomerWorkbenchControllerA
/** /**
* 新增个人 * 新增个人
*/ */
@Log(detail = "新增个人",level = 3,operationUnit = OperationUnit.COMPANY,operationType = OperationType.INSERT)
@PostMapping("/savePersonal") // .................................. @PostMapping("/savePersonal") // ..................................
@Override @Override
public ResponseResult savePersonal(@RequestBody CustomerPersonalTOI customerPersonalTOI) { public ResponseResult savePersonal(@RequestBody CustomerPersonalTOI customerPersonalTOI) {
@ -103,6 +110,7 @@ public class CustomerWorkbenchController implements CustomerWorkbenchControllerA
/** /**
* 修改个人 * 修改个人
*/ */
@Log(detail = "修改个人",level = 3,operationUnit = OperationUnit.COMPANY,operationType = OperationType.UPDATE)
@PostMapping("/updatePersonal") // .............................. @PostMapping("/updatePersonal") // ..............................
@Override @Override
public ResponseResult updatePersonal(@RequestBody CustomerPersonalTOU customerPersonalTOU) { public ResponseResult updatePersonal(@RequestBody CustomerPersonalTOU customerPersonalTOU) {

@ -1,26 +1,26 @@
#服务名称 #服务名称
spring.application.name=dq-financial-crms #spring.application.name=dq-financial-crms
#配置中心地址 ##配置中心地址
spring.cloud.nacos.config.server-addr=127.0.0.1:8848 #spring.cloud.nacos.config.server-addr=127.0.0.1:8848
spring.cloud.nacos.config.file-extension=yml #spring.cloud.nacos.config.file-extension=yml
#redis配置 ##redis配置
spring.redis.host=127.0.0.1 #spring.redis.host=127.0.0.1
spring.redis.port=6379 #spring.redis.port=6379
spring.redis.password= #spring.redis.password=
spring.redis.database=0 #spring.redis.database=0
spring.redis.timeout=30000 #spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8 #spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1 #spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=8 #spring.redis.jedis.pool.max-idle=8
spring.redis.jedis.pool.min-idle=0 #spring.redis.jedis.pool.min-idle=0
#本地测试环境 ##本地测试环境
#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
#线上测试环境 #线上测试环境
#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
#线上生产环境 #线上生产环境
spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406 #spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406
#请求处理的超时时间 #请求处理的超时时间
ribbon.ReadTimeout: 120000 ribbon.ReadTimeout: 120000
@ -29,30 +29,30 @@ ribbon.ConnectTimeout: 120000
# 正式环境(prod) # 正式环境(prod)
#服务名称 #服务名称
#spring.application.name=dq-financial-crms spring.application.name=dq-financial-crms
###配置中心地址 ##配置中心地址
#spring.cloud.nacos.config.server-addr=120.78.127.12:8848 spring.cloud.nacos.config.server-addr=120.78.127.12:8848
#spring.cloud.nacos.config.namespace=25ce05e2-a0eb-4842-92e4-d8b550a489dd spring.cloud.nacos.config.namespace=25ce05e2-a0eb-4842-92e4-d8b550a489dd
##spring.cloud.nacos.config.group=prod #spring.cloud.nacos.config.group=prod
#
#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
#spring.cloud.nacos.config.ext-config[0].group=prod spring.cloud.nacos.config.ext-config[0].group=prod
#spring.cloud.nacos.config.ext-config[0].refresh=true 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].data-id=mybatis.yml
#spring.cloud.nacos.config.ext-config[1].group=prod spring.cloud.nacos.config.ext-config[1].group=prod
#spring.cloud.nacos.config.ext-config[1].refresh=true 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].data-id=other.yml
#spring.cloud.nacos.config.ext-config[2].group=prod spring.cloud.nacos.config.ext-config[2].group=prod
#spring.cloud.nacos.config.ext-config[2].refresh=true spring.cloud.nacos.config.ext-config[2].refresh=true
#
#spring.redis.host=127.0.0.1 spring.redis.host=127.0.0.1
#spring.redis.port=6379 spring.redis.port=6379
#spring.redis.password=dq123456 spring.redis.password=dq123456
#spring.redis.database=0 spring.redis.database=0
#spring.redis.timeout=30000 spring.redis.timeout=30000
#spring.redis.jedis.pool.max-active=8 spring.redis.jedis.pool.max-active=8
#spring.redis.jedis.pool.max-wait=-1 spring.redis.jedis.pool.max-wait=-1
#spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.max-idle=8
#spring.redis.jedis.pool.min-idle=0 spring.redis.jedis.pool.min-idle=0

@ -20,12 +20,12 @@
</properties> </properties>
<dependencies> <dependencies>
<!-- <dependency>--> <dependency>
<!-- <groupId>com.daqing.financial</groupId>--> <groupId>com.daqing.financial</groupId>
<!-- <artifactId>dq-financial-hrms-auth</artifactId>--> <artifactId>dq-financial-hrms-auth</artifactId>
<!-- <version>0.0.1-SNAPSHOT</version>--> <version>0.0.1-SNAPSHOT</version>
<!-- <scope>compile</scope>--> <scope>compile</scope>
<!-- </dependency>--> </dependency>
<!--redis--> <!--redis-->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>

@ -1,11 +1,13 @@
package com.daqing.financial.guarantee; package com.daqing.financial.guarantee;
import com.daqing.financial.hrauth.config.SecurityConfig;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Import;
import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.EnableScheduling;
import springfox.documentation.swagger2.annotations.EnableSwagger2; import springfox.documentation.swagger2.annotations.EnableSwagger2;
@ -15,6 +17,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
@EnableScheduling @EnableScheduling
@EnableSwagger2 @EnableSwagger2
@ComponentScan(basePackages = "com.daqing") @ComponentScan(basePackages = "com.daqing")
@Import({SecurityConfig.class})
public class DqFinancialGuaranteeApplication { public class DqFinancialGuaranteeApplication {
public static void main(String[] args) { public static void main(String[] args) {

@ -1,18 +1,18 @@
package com.daqing.financial.guarantee.config; //package com.daqing.financial.guarantee.config;
//
import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; //import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
import org.springframework.context.annotation.Bean; //import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; //import org.springframework.context.annotation.Configuration;
//
/** ///**
* @auther River // * @auther River
* @date 2020/11/5 14:38 // * @date 2020/11/5 14:38
*/ // */
//
@Configuration //@Configuration
public class IPageConfig { //public class IPageConfig {
@Bean // @Bean
public PaginationInterceptor paginationInterceptor() { // public PaginationInterceptor paginationInterceptor() {
return new PaginationInterceptor(); // return new PaginationInterceptor();
} // }
} //}

@ -12,6 +12,9 @@ import com.daqing.financial.guarantee.model.response.BusinessApplicationExportRe
import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse; import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse;
import com.daqing.financial.guarantee.service.IDgApplyAmountInfoService; import com.daqing.financial.guarantee.service.IDgApplyAmountInfoService;
import com.daqing.financial.guarantee.service.IDgApplyAmountListService; import com.daqing.financial.guarantee.service.IDgApplyAmountListService;
import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.enums.OperationType;
import com.daqing.financial.hrauth.enums.OperationUnit;
import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest; import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest;
import com.daqing.framework.domain.guarantee.DgApplyField; import com.daqing.framework.domain.guarantee.DgApplyField;
import com.daqing.framework.model.response.PromptSuccess; import com.daqing.framework.model.response.PromptSuccess;
@ -94,6 +97,7 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
* @param businessApplication * @param businessApplication
* @return * @return
*/ */
@Log(detail = "业务申请",level = 3,operationUnit = OperationUnit.APPLYAMOUNTINFO,operationType = OperationType.INSERT)
@PostMapping("/businessApplication") @PostMapping("/businessApplication")
@ApiOperation(value = "业务申请") @ApiOperation(value = "业务申请")
public ResponseResult businessApplication(@RequestBody BusinessApplicationRequest businessApplication){ public ResponseResult businessApplication(@RequestBody BusinessApplicationRequest businessApplication){
@ -168,6 +172,7 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
* @param * @param
* @return * @return
*/ */
@Log(detail = "业务申请列表",level = 3,operationUnit = OperationUnit.APPLYAMOUNTINFO,operationType = OperationType.SELECT)
@GetMapping("/businessApplicationList") @GetMapping("/businessApplicationList")
@ApiOperation(value = "业务申请列表") @ApiOperation(value = "业务申请列表")
public ResponseResult businessApplicationList(@RequestParam(value="page",required=false) Integer page,@RequestParam(value="size",required=false) Integer size, public ResponseResult businessApplicationList(@RequestParam(value="page",required=false) Integer page,@RequestParam(value="size",required=false) Integer size,
@ -221,6 +226,7 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
* @param id * @param id
* @return * @return
*/ */
@Log(detail = "业务申请列表",level = 3,operationUnit = OperationUnit.APPLYAMOUNTINFO,operationType = OperationType.SELECT)
@GetMapping("/businessApplicationDetail") @GetMapping("/businessApplicationDetail")
@ApiOperation(value = "根据业务id查询业务申请详情") @ApiOperation(value = "根据业务id查询业务申请详情")
public ResponseResult businessApplicationDetail(Integer id){ public ResponseResult businessApplicationDetail(Integer id){
@ -233,6 +239,7 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
* @param businessApplication * @param businessApplication
* @return * @return
*/ */
@Log(detail = "修改业务申请",level = 4,operationUnit = OperationUnit.APPLYAMOUNTINFO,operationType = OperationType.UPDATE)
@PostMapping("/updateBusinessApplication") @PostMapping("/updateBusinessApplication")
@ApiOperation(value = "根据业务id修改业务申请内容") @ApiOperation(value = "根据业务id修改业务申请内容")
public ResponseResult updateBusinessApplication(@RequestBody BusinessApplicationRequest businessApplication){ public ResponseResult updateBusinessApplication(@RequestBody BusinessApplicationRequest businessApplication){
@ -245,6 +252,7 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
* @param id * @param id
* @return * @return
*/ */
@Log(detail = "撤销业务申请",level = 4,operationUnit = OperationUnit.APPLYAMOUNTINFO,operationType = OperationType.UPDATE)
@GetMapping("/revokeBusinessApplication") @GetMapping("/revokeBusinessApplication")
@ApiOperation(value = "根据业务id撤销业务申请内容") @ApiOperation(value = "根据业务id撤销业务申请内容")
public ResponseResult revokeBusinessApplication(@RequestParam("id") Integer id){ public ResponseResult revokeBusinessApplication(@RequestParam("id") Integer id){
@ -255,6 +263,7 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
/** /**
* 导出 * 导出
*/ */
@Log(detail = "导出业务申请列表",level = 4,operationUnit = OperationUnit.APPLYAMOUNTINFO,operationType = OperationType.SELECT)
@GetMapping("/excelExport") @GetMapping("/excelExport")
@ApiOperation(value = "导出业务申请内容") @ApiOperation(value = "导出业务申请内容")
public ResponseResult excelExport(@RequestParam("ids") List<String> ids,HttpServletResponse response) { public ResponseResult excelExport(@RequestParam("ids") List<String> ids,HttpServletResponse response) {
@ -264,6 +273,7 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
} }
@Log(detail = "导出业务申请列表",level = 4,operationUnit = OperationUnit.APPLYAMOUNTINFO,operationType = OperationType.SELECT)
@ApiOperation(value = "导出业务申请列表数据") @ApiOperation(value = "导出业务申请列表数据")
@PostMapping("/applyAmountListExport") @PostMapping("/applyAmountListExport")
public void applyAmountListExport( public void applyAmountListExport(
@ -285,6 +295,7 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
* @param approvalBusinessReq * @param approvalBusinessReq
* @return * @return
*/ */
@Log(detail = "审核业务申请",level = 4,operationUnit = OperationUnit.APPLYAMOUNTINFO,operationType = OperationType.UPDATE)
@PostMapping("/approvalBusinessApplication") @PostMapping("/approvalBusinessApplication")
@ApiOperation(value = "根据业务id审核业务申请内容") @ApiOperation(value = "根据业务id审核业务申请内容")
public ResponseResult approvalBusinessApplication(@RequestBody ApprovalBusinessRequest approvalBusinessReq){ public ResponseResult approvalBusinessApplication(@RequestBody ApprovalBusinessRequest approvalBusinessReq){

@ -4,6 +4,9 @@ package com.daqing.financial.guarantee.controller;
import com.daqing.financial.guarantee.model.request.*; import com.daqing.financial.guarantee.model.request.*;
import com.daqing.financial.guarantee.model.response.AssetsDetailResponse; import com.daqing.financial.guarantee.model.response.AssetsDetailResponse;
import com.daqing.financial.guarantee.service.IDgAssetsInvestigationService; import com.daqing.financial.guarantee.service.IDgAssetsInvestigationService;
import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.enums.OperationType;
import com.daqing.financial.hrauth.enums.OperationUnit;
import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.model.response.ResponseResult;
import com.daqing.framework.util.RedisUtil; import com.daqing.framework.util.RedisUtil;
import com.daqing.framework.utils.PageUtils; import com.daqing.framework.utils.PageUtils;
@ -42,6 +45,7 @@ public class DgAssetsInvestigationController {
* @param * @param
* @return * @return
*/ */
@Log(detail = "资产部调查列表",level = 3,operationUnit = OperationUnit.ASSETS,operationType = OperationType.SELECT)
@PostMapping("/assetsList") @PostMapping("/assetsList")
@ApiOperation(value = "资产部调查列表") @ApiOperation(value = "资产部调查列表")
public ResponseResult assetsList(@RequestBody AssetsInvestigationRequest assetsInvestigationRequest){ public ResponseResult assetsList(@RequestBody AssetsInvestigationRequest assetsInvestigationRequest){
@ -66,6 +70,7 @@ public class DgAssetsInvestigationController {
/** /**
* 导出 * 导出
*/ */
@Log(detail = "导出资产部调查列表",level = 4,operationUnit = OperationUnit.ASSETS,operationType = OperationType.SELECT)
@GetMapping("/excelExport") @GetMapping("/excelExport")
@ApiOperation(value = "导出资产部调查内容") @ApiOperation(value = "导出资产部调查内容")
public ResponseResult excelExport(@RequestParam("ids") List<String> ids, HttpServletResponse response) { public ResponseResult excelExport(@RequestParam("ids") List<String> ids, HttpServletResponse response) {
@ -80,6 +85,7 @@ public class DgAssetsInvestigationController {
* @param * @param
* @return * @return
*/ */
@Log(detail = "指派资产部调查员",level = 4,operationUnit = OperationUnit.ASSETS,operationType = OperationType.UPDATE)
@PostMapping("/assignCorners") @PostMapping("/assignCorners")
@ApiOperation(value = "指派资产部调查员") @ApiOperation(value = "指派资产部调查员")
@Transactional @Transactional
@ -94,6 +100,7 @@ public class DgAssetsInvestigationController {
* @param id * @param id
* @return * @return
*/ */
@Log(detail = "资产部调查详情",level = 4,operationUnit = OperationUnit.ASSETS,operationType = OperationType.SELECT)
@GetMapping("/assetsDetail") @GetMapping("/assetsDetail")
@ApiOperation(value = "查看详情") @ApiOperation(value = "查看详情")
public ResponseResult assetsDetail(Integer id){ public ResponseResult assetsDetail(Integer id){
@ -106,6 +113,7 @@ public class DgAssetsInvestigationController {
* @param investigateAssetsRequest * @param investigateAssetsRequest
* @return * @return
*/ */
@Log(detail = "资产部调查",level = 4,operationUnit = OperationUnit.ASSETS,operationType = OperationType.UPDATE)
@PostMapping("/investigateAssets") @PostMapping("/investigateAssets")
@ApiOperation(value = "调查") @ApiOperation(value = "调查")
public ResponseResult investigateAssets(@RequestBody InvestigateAssetsRequest investigateAssetsRequest){ public ResponseResult investigateAssets(@RequestBody InvestigateAssetsRequest investigateAssetsRequest){
@ -118,6 +126,7 @@ public class DgAssetsInvestigationController {
* @param approvalAssetsRequest * @param approvalAssetsRequest
* @return * @return
*/ */
@Log(detail = "资产部调查审核",level = 4,operationUnit = OperationUnit.ASSETS,operationType = OperationType.UPDATE)
@PostMapping("/approvalAssets") @PostMapping("/approvalAssets")
@ApiOperation(value = "审核") @ApiOperation(value = "审核")
public ResponseResult approvalAssets(@RequestBody ApprovalAssetsRequest approvalAssetsRequest){ public ResponseResult approvalAssets(@RequestBody ApprovalAssetsRequest approvalAssetsRequest){

@ -6,6 +6,9 @@ import com.daqing.financial.guarantee.model.request.DgComplianceInvestigationReq
import com.daqing.financial.guarantee.model.response.DgComplianceInvestigationInfoResponse; import com.daqing.financial.guarantee.model.response.DgComplianceInvestigationInfoResponse;
import com.daqing.financial.guarantee.model.response.DgComplianceInvestigationResponse; import com.daqing.financial.guarantee.model.response.DgComplianceInvestigationResponse;
import com.daqing.financial.guarantee.service.IDgComplianceInvestigationService; import com.daqing.financial.guarantee.service.IDgComplianceInvestigationService;
import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.enums.OperationType;
import com.daqing.financial.hrauth.enums.OperationUnit;
import com.daqing.framework.domain.guarantee.DgComplianceInvestigation; import com.daqing.framework.domain.guarantee.DgComplianceInvestigation;
import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.model.response.ResponseResult;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@ -36,6 +39,7 @@ public class DgComplianceInvestigationController {
/** /**
* 列表 * 列表
*/ */
@Log(detail = "合规调查列表",level = 3,operationUnit = OperationUnit.COMPLIANCE,operationType = OperationType.SELECT)
@GetMapping("/list") @GetMapping("/list")
@ApiOperation(value = "列表", notes = "列表", response = DgComplianceInvestigationResponse.class) @ApiOperation(value = "列表", notes = "列表", response = DgComplianceInvestigationResponse.class)
public ResponseResult list(@RequestParam("page") Integer page, public ResponseResult list(@RequestParam("page") Integer page,
@ -46,6 +50,7 @@ public class DgComplianceInvestigationController {
/** /**
* 指派 * 指派
*/ */
@Log(detail = "指派法规C角",level = 4,operationUnit = OperationUnit.COMPLIANCE,operationType = OperationType.UPDATE)
@GetMapping("/assign") @GetMapping("/assign")
@ApiOperation(value = "指派", notes = "指派") @ApiOperation(value = "指派", notes = "指派")
public ResponseResult assign(@RequestParam("iid") Integer iid, @RequestParam("userId") Integer userId) { public ResponseResult assign(@RequestParam("iid") Integer iid, @RequestParam("userId") Integer userId) {
@ -56,6 +61,7 @@ public class DgComplianceInvestigationController {
/** /**
* 调查 * 调查
*/ */
@Log(detail = "合规调查",level = 4,operationUnit = OperationUnit.COMPLIANCE,operationType = OperationType.UPDATE)
@PostMapping("/survey") @PostMapping("/survey")
@ApiOperation(value = "调查", notes = "调查") @ApiOperation(value = "调查", notes = "调查")
public ResponseResult survey(@RequestBody DgComplianceInvestigationCheckRequest dgComplianceInvestigationCheckRequest) { public ResponseResult survey(@RequestBody DgComplianceInvestigationCheckRequest dgComplianceInvestigationCheckRequest) {
@ -68,6 +74,7 @@ public class DgComplianceInvestigationController {
/** /**
* 审核 * 审核
*/ */
@Log(detail = "合规调查审核",level = 4,operationUnit = OperationUnit.COMPLIANCE,operationType = OperationType.UPDATE)
@ApiOperation(value = "审核", notes = "审核") @ApiOperation(value = "审核", notes = "审核")
@PostMapping("/check") @PostMapping("/check")
public ResponseResult check(@RequestBody DgComplianceInvestigationCheckRequest dgComplianceInvestigationCheckRequest) { public ResponseResult check(@RequestBody DgComplianceInvestigationCheckRequest dgComplianceInvestigationCheckRequest) {
@ -79,6 +86,7 @@ public class DgComplianceInvestigationController {
/** /**
* 查看 * 查看
*/ */
@Log(detail = "合规调查详情",level = 4,operationUnit = OperationUnit.COMPLIANCE,operationType = OperationType.SELECT)
@GetMapping("/query") @GetMapping("/query")
@ApiOperation(value = "查看", notes = "查看", response = DgComplianceInvestigationInfoResponse.class) @ApiOperation(value = "查看", notes = "查看", response = DgComplianceInvestigationInfoResponse.class)
public ResponseResult query(@RequestParam("iid") Integer iid) { public ResponseResult query(@RequestParam("iid") Integer iid) {
@ -89,6 +97,7 @@ public class DgComplianceInvestigationController {
/** /**
* 导出 * 导出
*/ */
@Log(detail = "导出合规调查",level = 4,operationUnit = OperationUnit.COMPLIANCE,operationType = OperationType.SELECT)
@GetMapping("/excelExport") @GetMapping("/excelExport")
@ApiOperation(value = "导出", notes = "导出") @ApiOperation(value = "导出", notes = "导出")
public ResponseResult query(HttpServletResponse response, @RequestParam("ids") List<String> ids) { public ResponseResult query(HttpServletResponse response, @RequestParam("ids") List<String> ids) {

@ -3,6 +3,9 @@ package com.daqing.financial.guarantee.controller;
import com.daqing.financial.guarantee.model.request.CopySendRequest; import com.daqing.financial.guarantee.model.request.CopySendRequest;
import com.daqing.financial.guarantee.service.IDgCopyForService; import com.daqing.financial.guarantee.service.IDgCopyForService;
import com.daqing.financial.guarantee.util.R; import com.daqing.financial.guarantee.util.R;
import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.enums.OperationType;
import com.daqing.financial.hrauth.enums.OperationUnit;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -29,6 +32,7 @@ public class DgCopyForController {
@Autowired @Autowired
private IDgCopyForService copyForService; private IDgCopyForService copyForService;
@Log(detail = "抄送",level = 4,operationUnit = OperationUnit.COPYFOR,operationType = OperationType.INSERT)
@ApiOperation("抄送任务") @ApiOperation("抄送任务")
@PostMapping("/copySend") @PostMapping("/copySend")
public R copySend(@RequestBody CopySendRequest copySendRequest){ public R copySend(@RequestBody CopySendRequest copySendRequest){

@ -6,6 +6,9 @@ import com.daqing.financial.guarantee.model.response.CopyForMeResponse;
import com.daqing.financial.guarantee.service.IDgCopyUserService; import com.daqing.financial.guarantee.service.IDgCopyUserService;
import com.daqing.financial.guarantee.util.R; import com.daqing.financial.guarantee.util.R;
import com.daqing.financial.guarantee.util.TaskNodeUtil; import com.daqing.financial.guarantee.util.TaskNodeUtil;
import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.enums.OperationType;
import com.daqing.financial.hrauth.enums.OperationUnit;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
@ -34,6 +37,7 @@ public class DgCopyUserController {
@Autowired @Autowired
private IDgCopyUserService copyUserService; private IDgCopyUserService copyUserService;
@Log(detail = "查询抄送我的",level = 4,operationUnit = OperationUnit.COPYFOR,operationType = OperationType.SELECT)
@ApiOperation("查询抄送我的") @ApiOperation("查询抄送我的")
@PostMapping("/queryCopyForMe") @PostMapping("/queryCopyForMe")
public R queryCopyForMe(@RequestBody CopyForMeRequest copyForMeRequest){ public R queryCopyForMe(@RequestBody CopyForMeRequest copyForMeRequest){
@ -49,6 +53,7 @@ public class DgCopyUserController {
return R.ok().data("copyForMeList",copyForMeList); return R.ok().data("copyForMeList",copyForMeList);
} }
@Log(detail = "导出抄送我的列表",level = 4,operationUnit = OperationUnit.COPYFOR,operationType = OperationType.SELECT)
@ApiOperation(value = "导出抄送我的列表") @ApiOperation(value = "导出抄送我的列表")
@GetMapping("/exportCopyForMe") @GetMapping("/exportCopyForMe")
public void queryCopyForMe(HttpServletResponse response){ public void queryCopyForMe(HttpServletResponse response){

@ -13,6 +13,9 @@ import com.daqing.financial.guarantee.service.IDgEfficiencyService;
import com.daqing.financial.guarantee.util.DateUtils; import com.daqing.financial.guarantee.util.DateUtils;
import com.daqing.financial.guarantee.util.R; import com.daqing.financial.guarantee.util.R;
import com.daqing.financial.guarantee.util.TaskNodeUtil; import com.daqing.financial.guarantee.util.TaskNodeUtil;
import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.enums.OperationType;
import com.daqing.financial.hrauth.enums.OperationUnit;
import com.daqing.framework.model.StatusCode; import com.daqing.framework.model.StatusCode;
import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.model.response.ResponseResult;
import com.daqing.framework.utils.excel.EasyExcelUtil; import com.daqing.framework.utils.excel.EasyExcelUtil;
@ -54,6 +57,7 @@ public class DgEfficiencyController {
/** /**
* 团队效率 * 团队效率
*/ */
@Log(detail = "团队效率",level = 3,operationUnit = OperationUnit.EFFICIENCY,operationType = OperationType.SELECT)
@PostMapping("/team") @PostMapping("/team")
@ApiOperation(value = "团队效率", notes = "团队效率") @ApiOperation(value = "团队效率", notes = "团队效率")
public ResponseResult queryList(@RequestBody DgEfficiencyTeamRequest dgEfficiencyTeamRequest) { public ResponseResult queryList(@RequestBody DgEfficiencyTeamRequest dgEfficiencyTeamRequest) {
@ -73,6 +77,7 @@ public class DgEfficiencyController {
/** /**
* 首页-近十天的审批数目 * 首页-近十天的审批数目
*/ */
@Log(detail = "首页-近十天的审批数目",level = 3,operationUnit = OperationUnit.EFFICIENCY,operationType = OperationType.SELECT)
@GetMapping("/approvalNum") @GetMapping("/approvalNum")
public ResponseResult approvalNum() { public ResponseResult approvalNum() {
//查询审批数目的值的数组 //查询审批数目的值的数组
@ -104,6 +109,7 @@ public class DgEfficiencyController {
* 首页-通知 * 首页-通知
* @Param title 标题 * @Param title 标题
*/ */
@Log(detail = "首页-通知",level = 3,operationUnit = OperationUnit.EFFICIENCY,operationType = OperationType.SELECT)
@GetMapping("/notice") @GetMapping("/notice")
public ResponseResult notice() { public ResponseResult notice() {
//查询审批数目的值的数组 //查询审批数目的值的数组
@ -111,6 +117,7 @@ public class DgEfficiencyController {
return ResponseResult.SUCCESS(result); return ResponseResult.SUCCESS(result);
} }
@Log(detail = "个人效率记录列表",level = 3,operationUnit = OperationUnit.EFFICIENCY,operationType = OperationType.SELECT)
@ApiOperation(value = "个人效率记录列表") @ApiOperation(value = "个人效率记录列表")
@PostMapping("/personalEfficiencyList") @PostMapping("/personalEfficiencyList")
public R personalEfficiencyList( public R personalEfficiencyList(
@ -245,6 +252,7 @@ public class DgEfficiencyController {
return 0L; return 0L;
} }
@Log(detail = "个人效率记录列表导出",level = 3,operationUnit = OperationUnit.EFFICIENCY,operationType = OperationType.SELECT)
@ApiOperation(value = "个人效率记录列表导出") @ApiOperation(value = "个人效率记录列表导出")
@GetMapping("/personalEfficiencyListExport") @GetMapping("/personalEfficiencyListExport")
public void personalEfficiencyListExport(HttpServletResponse httpServletResponse) { public void personalEfficiencyListExport(HttpServletResponse httpServletResponse) {

@ -3,6 +3,9 @@ package com.daqing.financial.guarantee.controller;
import com.daqing.financial.guarantee.model.request.DgFormDesignRequest; import com.daqing.financial.guarantee.model.request.DgFormDesignRequest;
import com.daqing.financial.guarantee.model.response.DgFormDesignListResponse; import com.daqing.financial.guarantee.model.response.DgFormDesignListResponse;
import com.daqing.financial.guarantee.service.IDgFormDesignService; import com.daqing.financial.guarantee.service.IDgFormDesignService;
import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.enums.OperationType;
import com.daqing.financial.hrauth.enums.OperationUnit;
import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.model.response.ResponseResult;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -27,6 +30,7 @@ public class DgFormDesignController {
/** /**
* 列表 * 列表
*/ */
@Log(detail = "表单设计列表",level = 3,operationUnit = OperationUnit.FORMDESIGN,operationType = OperationType.SELECT)
@GetMapping("/list") @GetMapping("/list")
@ApiOperation(value = "根据节点id返回当前节点的表单字段", response = DgFormDesignListResponse.class) @ApiOperation(value = "根据节点id返回当前节点的表单字段", response = DgFormDesignListResponse.class)
public ResponseResult list(@RequestParam("processId") Integer processId) { public ResponseResult list(@RequestParam("processId") Integer processId) {
@ -37,6 +41,7 @@ public class DgFormDesignController {
/** /**
* 修改 * 修改
*/ */
@Log(detail = "修改表单设计",level = 4,operationUnit = OperationUnit.FORMDESIGN,operationType = OperationType.UPDATE)
@PostMapping("/update") @PostMapping("/update")
@ApiOperation(value = "修改操作") @ApiOperation(value = "修改操作")
public ResponseResult update(@RequestBody DgFormDesignRequest dgFormDesignRequest) { public ResponseResult update(@RequestBody DgFormDesignRequest dgFormDesignRequest) {

@ -8,6 +8,9 @@ import com.daqing.financial.guarantee.model.request.GuaranteeRequest;
import com.daqing.financial.guarantee.model.request.InvestigateGuaranteeRequest; import com.daqing.financial.guarantee.model.request.InvestigateGuaranteeRequest;
import com.daqing.financial.guarantee.model.response.GuaranteeDetailResponse; import com.daqing.financial.guarantee.model.response.GuaranteeDetailResponse;
import com.daqing.financial.guarantee.service.IDgGuaranteeAssignUserService; import com.daqing.financial.guarantee.service.IDgGuaranteeAssignUserService;
import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.enums.OperationType;
import com.daqing.financial.hrauth.enums.OperationUnit;
import com.daqing.framework.domain.guarantee.DgGuaranteeAssignUser; import com.daqing.framework.domain.guarantee.DgGuaranteeAssignUser;
import com.daqing.framework.domain.guarantee.po.DgGuaranteePO; import com.daqing.framework.domain.guarantee.po.DgGuaranteePO;
import com.daqing.framework.domain.hrms.response.HrmsCode; import com.daqing.framework.domain.hrms.response.HrmsCode;
@ -53,6 +56,7 @@ public class DgGuaranteeAssignUserController {
* @param * @param
* @return * @return
*/ */
@Log(detail = "担保部调查列表",level = 3,operationUnit = OperationUnit.GUARANTEE,operationType = OperationType.SELECT)
@GetMapping("/guaranteeList") @GetMapping("/guaranteeList")
@ApiOperation(value = "担保部调查列表") @ApiOperation(value = "担保部调查列表")
public ResponseResult businessApplicationList(@RequestParam(value="page",required=false) Integer page, @RequestParam(value="size",required=false) Integer size, public ResponseResult businessApplicationList(@RequestParam(value="page",required=false) Integer page, @RequestParam(value="size",required=false) Integer size,
@ -76,6 +80,7 @@ public class DgGuaranteeAssignUserController {
/** /**
* 导出 * 导出
*/ */
@Log(detail = "导出担保部调查列表",level = 4,operationUnit = OperationUnit.GUARANTEE,operationType = OperationType.SELECT)
@GetMapping("/excelExport") @GetMapping("/excelExport")
@ApiOperation(value = "导出担保部调查内容") @ApiOperation(value = "导出担保部调查内容")
public ResponseResult excelExport(@RequestParam("ids") List<String> ids, HttpServletResponse response) { public ResponseResult excelExport(@RequestParam("ids") List<String> ids, HttpServletResponse response) {
@ -90,6 +95,7 @@ public class DgGuaranteeAssignUserController {
* @param * @param
* @return * @return
*/ */
@Log(detail = "指派担保部调查员",level = 4,operationUnit = OperationUnit.GUARANTEE,operationType = OperationType.UPDATE)
@PostMapping("/assignCorners") @PostMapping("/assignCorners")
@ApiOperation(value = "指派A,B角") @ApiOperation(value = "指派A,B角")
@Transactional @Transactional
@ -104,6 +110,7 @@ public class DgGuaranteeAssignUserController {
* @param id * @param id
* @return * @return
*/ */
@Log(detail = "担保部调查详情",level = 4,operationUnit = OperationUnit.GUARANTEE,operationType = OperationType.SELECT)
@GetMapping("/guaranteeDetail") @GetMapping("/guaranteeDetail")
@ApiOperation(value = "根据担保id查询担保部记录详情") @ApiOperation(value = "根据担保id查询担保部记录详情")
public ResponseResult guaranteeDetail(Integer id){ public ResponseResult guaranteeDetail(Integer id){
@ -116,6 +123,7 @@ public class DgGuaranteeAssignUserController {
* @param investigateGuaranteeRequest * @param investigateGuaranteeRequest
* @return * @return
*/ */
@Log(detail = "担保部调查",level = 4,operationUnit = OperationUnit.GUARANTEE,operationType = OperationType.UPDATE)
@PostMapping("/investigateGuarantee") @PostMapping("/investigateGuarantee")
@ApiOperation(value = "根据担保id调查担保记录") @ApiOperation(value = "根据担保id调查担保记录")
public ResponseResult investigateGuarantee(@RequestBody InvestigateGuaranteeRequest investigateGuaranteeRequest){ public ResponseResult investigateGuarantee(@RequestBody InvestigateGuaranteeRequest investigateGuaranteeRequest){
@ -128,6 +136,7 @@ public class DgGuaranteeAssignUserController {
* @param approvalGuaranteeRequest * @param approvalGuaranteeRequest
* @return * @return
*/ */
@Log(detail = "担保部调查审核",level = 4,operationUnit = OperationUnit.GUARANTEE,operationType = OperationType.UPDATE)
@PostMapping("/approvalGuarantee") @PostMapping("/approvalGuarantee")
@ApiOperation(value = "根据担保id审核担保记录,包括担保部经理审核以及担保部分管领导审核") @ApiOperation(value = "根据担保id审核担保记录,包括担保部经理审核以及担保部分管领导审核")
public ResponseResult approvalGuarantee(@RequestBody ApprovalGuaranteeRequest approvalGuaranteeRequest){ public ResponseResult approvalGuarantee(@RequestBody ApprovalGuaranteeRequest approvalGuaranteeRequest){

@ -5,6 +5,9 @@ import com.daqing.financial.guarantee.model.request.GuaranteeLetterQueryRequest;
import com.daqing.financial.guarantee.model.request.GuaranteeLetterUpdateStatusRequest; import com.daqing.financial.guarantee.model.request.GuaranteeLetterUpdateStatusRequest;
import com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse; import com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse;
import com.daqing.financial.guarantee.service.IDgGuaranteeLetterAssignUserService; import com.daqing.financial.guarantee.service.IDgGuaranteeLetterAssignUserService;
import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.enums.OperationType;
import com.daqing.financial.hrauth.enums.OperationUnit;
import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser; import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser;
import com.daqing.framework.domain.hrms.response.HrmsCode; import com.daqing.framework.domain.hrms.response.HrmsCode;
import com.daqing.framework.exception.ExceptionCast; import com.daqing.framework.exception.ExceptionCast;
@ -40,6 +43,7 @@ public class DgGuaranteeLetterAssignUserController {
@Autowired @Autowired
private IDgGuaranteeLetterAssignUserService guaranteeLetterAssignUserService; private IDgGuaranteeLetterAssignUserService guaranteeLetterAssignUserService;
@Log(detail = "担保函记录列表",level = 3,operationUnit = OperationUnit.GUARANTEELETTER,operationType = OperationType.SELECT)
@ApiOperation(value = "担保函记录列表",response = GuaranteeLetterListResponse.class) @ApiOperation(value = "担保函记录列表",response = GuaranteeLetterListResponse.class)
@PostMapping("/guaranteeLetterList") @PostMapping("/guaranteeLetterList")
public ResponseResult guaranteeLetterList( public ResponseResult guaranteeLetterList(
@ -50,6 +54,7 @@ public class DgGuaranteeLetterAssignUserController {
return ResponseResult.SUCCESS(data); return ResponseResult.SUCCESS(data);
} }
@Log(detail = "导出担保函列表数据",level = 4,operationUnit = OperationUnit.GUARANTEELETTER,operationType = OperationType.SELECT)
@ApiOperation(value = "导出担保函列表数据") @ApiOperation(value = "导出担保函列表数据")
@GetMapping("/guaranteeLetterListExport") @GetMapping("/guaranteeLetterListExport")
public void guaranteeLetterListExport( public void guaranteeLetterListExport(
@ -62,6 +67,7 @@ public class DgGuaranteeLetterAssignUserController {
} }
} }
@Log(detail = "添加担保函记录",level = 4,operationUnit = OperationUnit.GUARANTEELETTER,operationType = OperationType.INSERT)
@ApiOperation(value = "贷审会通过后添加担保函记录") @ApiOperation(value = "贷审会通过后添加担保函记录")
@PostMapping("/addGuaranteeLetter") @PostMapping("/addGuaranteeLetter")
public ResponseResult addGuaranteeLetter( public ResponseResult addGuaranteeLetter(
@ -71,6 +77,7 @@ public class DgGuaranteeLetterAssignUserController {
return result ? ResponseResult.SUCCESS("添加成功!"):ResponseResult.FAIL(40005,"添加失败!"); return result ? ResponseResult.SUCCESS("添加成功!"):ResponseResult.FAIL(40005,"添加失败!");
} }
@Log(detail = "修改担保函记录",level = 4,operationUnit = OperationUnit.GUARANTEELETTER,operationType = OperationType.UPDATE)
@ApiOperation(value = "更新角色或用户确认状态及审核意见") @ApiOperation(value = "更新角色或用户确认状态及审核意见")
@PostMapping("/updateStatus") @PostMapping("/updateStatus")
public ResponseResult updateStatus( public ResponseResult updateStatus(
@ -84,6 +91,7 @@ public class DgGuaranteeLetterAssignUserController {
return result ? ResponseResult.SUCCESS("确认成功!"):ResponseResult.FAIL(40005,"确认失败!"); return result ? ResponseResult.SUCCESS("确认成功!"):ResponseResult.FAIL(40005,"确认失败!");
} }
@Log(detail = "导出担保函",level = 4,operationUnit = OperationUnit.GUARANTEELETTER,operationType = OperationType.SELECT)
@ApiOperation(value = "导出担保函") @ApiOperation(value = "导出担保函")
@GetMapping("/exportGuaranteeLetter") @GetMapping("/exportGuaranteeLetter")
public void guaranteeLetterList( public void guaranteeLetterList(

@ -5,6 +5,9 @@ import com.daqing.financial.guarantee.model.request.DgLoanCommitteeConsiderReque
import com.daqing.financial.guarantee.model.response.DgLoanCommitteeConsiderResponse; import com.daqing.financial.guarantee.model.response.DgLoanCommitteeConsiderResponse;
import com.daqing.financial.guarantee.service.IDgLoanCommitteeConsiderService; import com.daqing.financial.guarantee.service.IDgLoanCommitteeConsiderService;
import com.daqing.financial.guarantee.service.IDgLoanNoticeService; import com.daqing.financial.guarantee.service.IDgLoanNoticeService;
import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.enums.OperationType;
import com.daqing.financial.hrauth.enums.OperationUnit;
import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.model.response.ResponseResult;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -35,6 +38,7 @@ public class DgLoanCommitteeConsiderController {
/** /**
* 列表 * 列表
*/ */
@Log(detail = "贷审会列表",level = 3,operationUnit = OperationUnit.LOANCOMMITTEE,operationType = OperationType.SELECT)
@GetMapping("/list") @GetMapping("/list")
@ApiOperation(value = "列表", notes = "列表", response = DgLoanCommitteeConsiderResponse.class) @ApiOperation(value = "列表", notes = "列表", response = DgLoanCommitteeConsiderResponse.class)
public ResponseResult list(@RequestParam("page") Integer page, public ResponseResult list(@RequestParam("page") Integer page,
@ -45,6 +49,7 @@ public class DgLoanCommitteeConsiderController {
/** /**
* 审议 * 审议
*/ */
@Log(detail = "贷审会审议",level = 4,operationUnit = OperationUnit.LOANCOMMITTEE,operationType = OperationType.UPDATE)
@PostMapping("/check") @PostMapping("/check")
@ApiOperation(value = "审议", notes = "审议") @ApiOperation(value = "审议", notes = "审议")
public ResponseResult check(@RequestBody @Valid DgLoanCommitteeConsiderRequest dgLoanCommitteeConsiderRequest) { public ResponseResult check(@RequestBody @Valid DgLoanCommitteeConsiderRequest dgLoanCommitteeConsiderRequest) {
@ -55,6 +60,7 @@ public class DgLoanCommitteeConsiderController {
/** /**
* 获取抽取的评委 * 获取抽取的评委
*/ */
@Log(detail = "获取抽取的评委",level = 4,operationUnit = OperationUnit.LOANCOMMITTEE,operationType = OperationType.SELECT)
@GetMapping("/theJudgesDrawn") @GetMapping("/theJudgesDrawn")
@ApiOperation(value = "获取抽取的评委", notes = "获取抽取的评委") @ApiOperation(value = "获取抽取的评委", notes = "获取抽取的评委")
public ResponseResult theJudgesDrawn(@RequestParam("id") Integer id) { public ResponseResult theJudgesDrawn(@RequestParam("id") Integer id) {
@ -64,6 +70,7 @@ public class DgLoanCommitteeConsiderController {
/** /**
* 查看 * 查看
*/ */
@Log(detail = "贷审会详情",level = 4,operationUnit = OperationUnit.LOANCOMMITTEE,operationType = OperationType.SELECT)
@GetMapping("/query") @GetMapping("/query")
@ApiOperation(value = "查看", notes = "查看") @ApiOperation(value = "查看", notes = "查看")
public ResponseResult query(@RequestParam("id") Integer id) { public ResponseResult query(@RequestParam("id") Integer id) {
@ -73,6 +80,7 @@ public class DgLoanCommitteeConsiderController {
/** /**
* 导出 * 导出
*/ */
@Log(detail = "导出贷审会列表",level = 4,operationUnit = OperationUnit.LOANCOMMITTEE,operationType = OperationType.SELECT)
@GetMapping("excelExport") @GetMapping("excelExport")
@ApiOperation(value = "导出", notes = "导出") @ApiOperation(value = "导出", notes = "导出")
public ResponseResult excelExport(HttpServletResponse response, @RequestParam("ids") List<String> ids) { public ResponseResult excelExport(HttpServletResponse response, @RequestParam("ids") List<String> ids) {

@ -7,6 +7,9 @@ import com.daqing.financial.guarantee.model.response.LoanNoticeListResponse;
import com.daqing.financial.guarantee.service.IDgGuaranteeLetterAssignUserService; import com.daqing.financial.guarantee.service.IDgGuaranteeLetterAssignUserService;
import com.daqing.financial.guarantee.service.IDgLoanNoticeService; import com.daqing.financial.guarantee.service.IDgLoanNoticeService;
import com.daqing.financial.guarantee.service.impl.DgGuaranteeLetterAssignUserServiceImpl; import com.daqing.financial.guarantee.service.impl.DgGuaranteeLetterAssignUserServiceImpl;
import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.enums.OperationType;
import com.daqing.financial.hrauth.enums.OperationUnit;
import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser; import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser;
import com.daqing.framework.domain.hrms.response.HrmsCode; import com.daqing.framework.domain.hrms.response.HrmsCode;
import com.daqing.framework.exception.ExceptionCast; import com.daqing.framework.exception.ExceptionCast;
@ -44,6 +47,7 @@ public class DgLoanNoticeController {
@Autowired @Autowired
private IDgLoanNoticeService loanNoticeService; private IDgLoanNoticeService loanNoticeService;
@Log(detail = "放款通知记录列表",level = 3,operationUnit = OperationUnit.LOANNOTICE,operationType = OperationType.SELECT)
@ApiOperation(value = "放款通知记录列表",response = LoanNoticeListResponse.class) @ApiOperation(value = "放款通知记录列表",response = LoanNoticeListResponse.class)
@PostMapping("/loanNoticeList") @PostMapping("/loanNoticeList")
public ResponseResult loanNoticeList( public ResponseResult loanNoticeList(
@ -53,6 +57,7 @@ public class DgLoanNoticeController {
return new ResponseResult<PageUtils>().SUCCESS(data); return new ResponseResult<PageUtils>().SUCCESS(data);
} }
@Log(detail = "导出放款通知列表数据",level = 4,operationUnit = OperationUnit.LOANNOTICE,operationType = OperationType.SELECT)
@ApiOperation(value = "导出放款通知列表数据") @ApiOperation(value = "导出放款通知列表数据")
@GetMapping("/loanNoticeListExport") @GetMapping("/loanNoticeListExport")
public void loanNoticeListExport( public void loanNoticeListExport(
@ -65,6 +70,7 @@ public class DgLoanNoticeController {
} }
} }
@Log(detail = "更新放款通知状态",level = 4,operationUnit = OperationUnit.LOANNOTICE,operationType = OperationType.UPDATE)
@ApiOperation(value = "更新放款通知状态") @ApiOperation(value = "更新放款通知状态")
@PostMapping("/updateLoanNotice") @PostMapping("/updateLoanNotice")
public ResponseResult updateLoanNotice( public ResponseResult updateLoanNotice(
@ -78,6 +84,7 @@ public class DgLoanNoticeController {
return result ? ResponseResult.SUCCESS("更新成功!"):ResponseResult.FAIL(40005,"更新失败!"); return result ? ResponseResult.SUCCESS("更新成功!"):ResponseResult.FAIL(40005,"更新失败!");
} }
@Log(detail = "导出放款通知",level = 4,operationUnit = OperationUnit.LOANNOTICE,operationType = OperationType.SELECT)
@ApiOperation(value = "导出放款通知") @ApiOperation(value = "导出放款通知")
@GetMapping("/exportLoanNotice") @GetMapping("/exportLoanNotice")
public void exportLoanNotice( public void exportLoanNotice(

@ -5,6 +5,9 @@ import com.daqing.financial.guarantee.model.request.*;
import com.daqing.financial.guarantee.model.response.AssetsDetailResponse; import com.daqing.financial.guarantee.model.response.AssetsDetailResponse;
import com.daqing.financial.guarantee.model.response.MessageDetailResponse; import com.daqing.financial.guarantee.model.response.MessageDetailResponse;
import com.daqing.financial.guarantee.service.IDgMessageInvestigationService; import com.daqing.financial.guarantee.service.IDgMessageInvestigationService;
import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.enums.OperationType;
import com.daqing.financial.hrauth.enums.OperationUnit;
import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.model.response.ResponseResult;
import com.daqing.framework.util.RedisUtil; import com.daqing.framework.util.RedisUtil;
import com.daqing.framework.utils.PageUtils; import com.daqing.framework.utils.PageUtils;
@ -42,6 +45,7 @@ public class DgMessageInvestigationController {
* @param * @param
* @return * @return
*/ */
@Log(detail = "信息部调查列表",level = 3,operationUnit = OperationUnit.MESSAGE,operationType = OperationType.SELECT)
@GetMapping("/messageList") @GetMapping("/messageList")
@ApiOperation(value = "信息部调查列表") @ApiOperation(value = "信息部调查列表")
public ResponseResult messageList(MessageInvestigationRequest messageInvestigationRequest){ public ResponseResult messageList(MessageInvestigationRequest messageInvestigationRequest){
@ -67,6 +71,7 @@ public class DgMessageInvestigationController {
/** /**
* 导出 * 导出
*/ */
@Log(detail = "导出信息部调查列表",level = 4,operationUnit = OperationUnit.MESSAGE,operationType = OperationType.SELECT)
@GetMapping("/excelExport") @GetMapping("/excelExport")
@ApiOperation(value = "导出信息部调查内容") @ApiOperation(value = "导出信息部调查内容")
public ResponseResult excelExport(@RequestParam("ids") List<String> ids, HttpServletResponse response) { public ResponseResult excelExport(@RequestParam("ids") List<String> ids, HttpServletResponse response) {
@ -81,6 +86,7 @@ public class DgMessageInvestigationController {
* @param * @param
* @return * @return
*/ */
@Log(detail = "指派信息部调查员",level = 4,operationUnit = OperationUnit.MESSAGE,operationType = OperationType.INSERT)
@PostMapping("/assignCorners") @PostMapping("/assignCorners")
@ApiOperation(value = "指派信息部调查员") @ApiOperation(value = "指派信息部调查员")
@Transactional @Transactional
@ -95,6 +101,7 @@ public class DgMessageInvestigationController {
* @param id * @param id
* @return * @return
*/ */
@Log(detail = "信息部调查详情",level = 4,operationUnit = OperationUnit.MESSAGE,operationType = OperationType.SELECT)
@GetMapping("/messageDetail") @GetMapping("/messageDetail")
@ApiOperation(value = "查看详情") @ApiOperation(value = "查看详情")
public ResponseResult messageDetail(Integer id){ public ResponseResult messageDetail(Integer id){
@ -107,6 +114,7 @@ public class DgMessageInvestigationController {
* @param investigateMessageRequest * @param investigateMessageRequest
* @return * @return
*/ */
@Log(detail = "信息部调查",level = 4,operationUnit = OperationUnit.MESSAGE,operationType = OperationType.UPDATE)
@PostMapping("/investigateMessage") @PostMapping("/investigateMessage")
@ApiOperation(value = "调查") @ApiOperation(value = "调查")
public ResponseResult investigateMessage(@RequestBody InvestigateMessageRequest investigateMessageRequest){ public ResponseResult investigateMessage(@RequestBody InvestigateMessageRequest investigateMessageRequest){
@ -120,6 +128,7 @@ public class DgMessageInvestigationController {
* @param approvalMessageRequest * @param approvalMessageRequest
* @return * @return
*/ */
@Log(detail = "信息部调查审核",level = 4,operationUnit = OperationUnit.MESSAGE,operationType = OperationType.UPDATE)
@PostMapping("/approvalMessage") @PostMapping("/approvalMessage")
@ApiOperation(value = "审核") @ApiOperation(value = "审核")
public ResponseResult approvalMessage(@RequestBody ApprovalMessageRequest approvalMessageRequest){ public ResponseResult approvalMessage(@RequestBody ApprovalMessageRequest approvalMessageRequest){

@ -5,6 +5,9 @@ import com.daqing.financial.guarantee.model.request.PaymentConfirmationQueryRequ
import com.daqing.financial.guarantee.model.request.PaymentConfirmationUpdateRequest; import com.daqing.financial.guarantee.model.request.PaymentConfirmationUpdateRequest;
import com.daqing.financial.guarantee.model.response.PaymentConfirmationListResponse; import com.daqing.financial.guarantee.model.response.PaymentConfirmationListResponse;
import com.daqing.financial.guarantee.service.IDgPaymentConfirmationConsiderService; import com.daqing.financial.guarantee.service.IDgPaymentConfirmationConsiderService;
import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.enums.OperationType;
import com.daqing.financial.hrauth.enums.OperationUnit;
import com.daqing.framework.domain.hrms.response.HrmsCode; import com.daqing.framework.domain.hrms.response.HrmsCode;
import com.daqing.framework.exception.ExceptionCast; import com.daqing.framework.exception.ExceptionCast;
import com.daqing.framework.model.StatusCode; import com.daqing.framework.model.StatusCode;
@ -35,6 +38,7 @@ public class DgPaymentConfirmationConsiderController {
@Autowired @Autowired
private IDgPaymentConfirmationConsiderService paymentConfirmationConsiderService; private IDgPaymentConfirmationConsiderService paymentConfirmationConsiderService;
@Log(detail = "财务确认记录列表",level = 3,operationUnit = OperationUnit.PAYMENTCONFIRMATION,operationType = OperationType.SELECT)
@ApiOperation(value = "回款确认记录列表",response = PaymentConfirmationListResponse.class) @ApiOperation(value = "回款确认记录列表",response = PaymentConfirmationListResponse.class)
@PostMapping("/paymentConfirmationList") @PostMapping("/paymentConfirmationList")
public ResponseResult paymentConfirmationList( public ResponseResult paymentConfirmationList(
@ -44,6 +48,7 @@ public class DgPaymentConfirmationConsiderController {
return new ResponseResult<PageUtils>().SUCCESS(data); return new ResponseResult<PageUtils>().SUCCESS(data);
} }
@Log(detail = "导出财务确认记录列表",level = 4,operationUnit = OperationUnit.PAYMENTCONFIRMATION,operationType = OperationType.SELECT)
@ApiOperation(value = "导出回款确认列表数据") @ApiOperation(value = "导出回款确认列表数据")
@GetMapping("/paymentConfirmationListExport") @GetMapping("/paymentConfirmationListExport")
public void paymentConfirmationListExport( public void paymentConfirmationListExport(
@ -56,6 +61,7 @@ public class DgPaymentConfirmationConsiderController {
} }
} }
@Log(detail = "更新财务确认",level = 4,operationUnit = OperationUnit.PAYMENTCONFIRMATION,operationType = OperationType.UPDATE)
@ApiOperation(value = "更新回款确认") @ApiOperation(value = "更新回款确认")
@PostMapping("/updatePaymentConfirmation") @PostMapping("/updatePaymentConfirmation")
public ResponseResult updatePaymentConfirmation( public ResponseResult updatePaymentConfirmation(

@ -7,6 +7,9 @@ import com.daqing.financial.guarantee.model.request.UpdateUserVisualReq;
import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse; import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse;
import com.daqing.financial.guarantee.model.response.DgProessManageRes; import com.daqing.financial.guarantee.model.response.DgProessManageRes;
import com.daqing.financial.guarantee.service.IDgProcessManageService; import com.daqing.financial.guarantee.service.IDgProcessManageService;
import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.enums.OperationType;
import com.daqing.financial.hrauth.enums.OperationUnit;
import com.daqing.framework.domain.guarantee.DgProcessManage; import com.daqing.framework.domain.guarantee.DgProcessManage;
import com.daqing.framework.domain.hrms.ext.EmployeeVO; import com.daqing.framework.domain.hrms.ext.EmployeeVO;
import com.daqing.framework.domain.hrms.ext.UserDeptVO; import com.daqing.framework.domain.hrms.ext.UserDeptVO;
@ -47,6 +50,7 @@ public class DgProcessManageController {
* @param * @param
* @return * @return
*/ */
@Log(detail = "流程管理列表",level = 3,operationUnit = OperationUnit.PROCESSMANAGE,operationType = OperationType.SELECT)
@GetMapping("/processManageList") @GetMapping("/processManageList")
@ApiOperation(value = "流程管理列表") @ApiOperation(value = "流程管理列表")
public ResponseResult processManageList(){ public ResponseResult processManageList(){
@ -62,6 +66,7 @@ public class DgProcessManageController {
* @param * @param
* @return * @return
*/ */
@Log(detail = "查询审批模板对应的可见人员",level = 3,operationUnit = OperationUnit.PROCESSMANAGE,operationType = OperationType.SELECT)
@GetMapping("/processVisualList") @GetMapping("/processVisualList")
@ApiOperation(value = "查询审批模板对应的可见人员") @ApiOperation(value = "查询审批模板对应的可见人员")
public ResponseResult processVisualList(@RequestParam(value = "id") Integer id){ public ResponseResult processVisualList(@RequestParam(value = "id") Integer id){
@ -75,6 +80,7 @@ public class DgProcessManageController {
* @param updateUserVisualReq * @param updateUserVisualReq
* @return * @return
*/ */
@Log(detail = "修改人员可以看到审批模板",level = 3,operationUnit = OperationUnit.PROCESSMANAGE,operationType = OperationType.UPDATE)
@PostMapping("/updateUserVisual") @PostMapping("/updateUserVisual")
@ApiOperation(value = "修改人员可以看到审批模板") @ApiOperation(value = "修改人员可以看到审批模板")
@Transactional @Transactional
@ -91,6 +97,7 @@ public class DgProcessManageController {
* @param processManageReq * @param processManageReq
* @return * @return
*/ */
@Log(detail = "修改基础设置",level = 3,operationUnit = OperationUnit.PROCESSMANAGE,operationType = OperationType.UPDATE)
@PostMapping("/updateProcessManage") @PostMapping("/updateProcessManage")
@ApiOperation(value = "修改基础设置") @ApiOperation(value = "修改基础设置")
@Transactional @Transactional

@ -8,6 +8,9 @@ import com.daqing.financial.guarantee.model.request.CopySendUserRequest;
import com.daqing.financial.guarantee.service.IDgProcessManageService; import com.daqing.financial.guarantee.service.IDgProcessManageService;
import com.daqing.financial.guarantee.service.IDgProcessUserService; import com.daqing.financial.guarantee.service.IDgProcessUserService;
import com.daqing.financial.guarantee.util.R; import com.daqing.financial.guarantee.util.R;
import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.enums.OperationType;
import com.daqing.financial.hrauth.enums.OperationUnit;
import com.daqing.framework.domain.guarantee.DgProcessManage; import com.daqing.framework.domain.guarantee.DgProcessManage;
import com.daqing.framework.domain.guarantee.DgProcessUser; import com.daqing.framework.domain.guarantee.DgProcessUser;
import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.model.response.ResponseResult;
@ -41,7 +44,7 @@ public class DgProcessUserController {
@Autowired @Autowired
private HrmsFeignService hrmsFeignService; private HrmsFeignService hrmsFeignService;
@Log(detail = "根据进程id查询抄送用户",level = 4,operationUnit = OperationUnit.COPYFOR,operationType = OperationType.SELECT)
@ApiOperation("根据进程id查询抄送用户") @ApiOperation("根据进程id查询抄送用户")
@GetMapping("/queryCopySendUser") @GetMapping("/queryCopySendUser")
public R queryCopySendUser( public R queryCopySendUser(
@ -70,6 +73,7 @@ public class DgProcessUserController {
return R.ok().data("userList",list); return R.ok().data("userList",list);
} }
@Log(detail = "更新流程的抄送用户",level = 4,operationUnit = OperationUnit.COPYFOR,operationType = OperationType.UPDATE)
@ApiOperation("更新流程的抄送用户") @ApiOperation("更新流程的抄送用户")
@PostMapping("/updateCopySendUser") @PostMapping("/updateCopySendUser")
public R updateCopySendUser(@RequestBody CopySendUserRequest copySendUserRequest){ public R updateCopySendUser(@RequestBody CopySendUserRequest copySendUserRequest){

@ -4,6 +4,9 @@ import com.daqing.financial.guarantee.model.request.DgStatisticsRequest;
import com.daqing.financial.guarantee.model.response.DgStatisticsListRefuseResponse; import com.daqing.financial.guarantee.model.response.DgStatisticsListRefuseResponse;
import com.daqing.financial.guarantee.model.response.DgStatisticsListResponse; import com.daqing.financial.guarantee.model.response.DgStatisticsListResponse;
import com.daqing.financial.guarantee.service.IDgStatisticsService; import com.daqing.financial.guarantee.service.IDgStatisticsService;
import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.enums.OperationType;
import com.daqing.financial.hrauth.enums.OperationUnit;
import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.model.response.ResponseResult;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -32,6 +35,7 @@ public class DgStatisticsController {
/** /**
* 列表 * 列表
*/ */
@Log(detail = "业务统计列表",level = 3,operationUnit = OperationUnit.STATISTICS,operationType = OperationType.SELECT)
@GetMapping("/list") @GetMapping("/list")
@ApiOperation(value = "业务统计列表", notes = "业务统计列表", response = DgStatisticsListResponse.class) @ApiOperation(value = "业务统计列表", notes = "业务统计列表", response = DgStatisticsListResponse.class)
public ResponseResult list(@RequestParam("page") Integer page, public ResponseResult list(@RequestParam("page") Integer page,
@ -42,6 +46,7 @@ public class DgStatisticsController {
/** /**
* 列表导出 * 列表导出
*/ */
@Log(detail = "导出业务统计列表",level = 4,operationUnit = OperationUnit.STATISTICS,operationType = OperationType.SELECT)
@ApiOperation(value = "统计列表导出", notes = "统计列表导出") @ApiOperation(value = "统计列表导出", notes = "统计列表导出")
@GetMapping("/excelExport") @GetMapping("/excelExport")
public ResponseResult excelExport(HttpServletResponse response) { public ResponseResult excelExport(HttpServletResponse response) {
@ -54,6 +59,7 @@ public class DgStatisticsController {
/** /**
* 拒绝列表 * 拒绝列表
*/ */
@Log(detail = "拒绝列表",level = 3,operationUnit = OperationUnit.STATISTICS,operationType = OperationType.SELECT)
@GetMapping("/listRefuse") @GetMapping("/listRefuse")
@ApiOperation(value = "业务统计拒绝列表", notes = "业务统计拒绝列表", response = DgStatisticsListRefuseResponse.class) @ApiOperation(value = "业务统计拒绝列表", notes = "业务统计拒绝列表", response = DgStatisticsListRefuseResponse.class)
public ResponseResult listRefuse(@RequestParam("page") Integer page, public ResponseResult listRefuse(@RequestParam("page") Integer page,
@ -64,6 +70,7 @@ public class DgStatisticsController {
/** /**
* 拒绝列表导出 * 拒绝列表导出
*/ */
@Log(detail = "导出拒绝列表",level = 4,operationUnit = OperationUnit.STATISTICS,operationType = OperationType.SELECT)
@ApiOperation(value = "统计拒绝列表导出", notes = "统计拒绝列表导出") @ApiOperation(value = "统计拒绝列表导出", notes = "统计拒绝列表导出")
@GetMapping("/excelExportRefuse") @GetMapping("/excelExportRefuse")
public ResponseResult excelExportRefuse(HttpServletResponse response) { public ResponseResult excelExportRefuse(HttpServletResponse response) {

@ -3,6 +3,9 @@ package com.daqing.financial.guarantee.controller;
import com.daqing.financial.guarantee.model.request.DgWorkConferenceConsiderRequest; import com.daqing.financial.guarantee.model.request.DgWorkConferenceConsiderRequest;
import com.daqing.financial.guarantee.service.IDgWorkConferenceConsiderService; import com.daqing.financial.guarantee.service.IDgWorkConferenceConsiderService;
import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.enums.OperationType;
import com.daqing.financial.hrauth.enums.OperationUnit;
import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.model.response.ResponseResult;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -32,6 +35,7 @@ public class DgWorkConferenceConsiderController {
/** /**
* 列表 * 列表
*/ */
@Log(detail = "工作会审议列表",level = 3,operationUnit = OperationUnit.WORKCONFERENCE,operationType = OperationType.SELECT)
@GetMapping("/list") @GetMapping("/list")
@ApiOperation(value = "列表", notes = "列表") @ApiOperation(value = "列表", notes = "列表")
public ResponseResult list(@RequestParam("page") Integer page, public ResponseResult list(@RequestParam("page") Integer page,
@ -42,6 +46,7 @@ public class DgWorkConferenceConsiderController {
/** /**
* 审议 * 审议
*/ */
@Log(detail = "工作会审议",level = 4,operationUnit = OperationUnit.WORKCONFERENCE,operationType = OperationType.UPDATE)
@PostMapping("/check") @PostMapping("/check")
@ApiOperation(value = "审议", notes = "审议") @ApiOperation(value = "审议", notes = "审议")
public ResponseResult check(@RequestBody DgWorkConferenceConsiderRequest dgWorkConferenceConsiderRequest) { public ResponseResult check(@RequestBody DgWorkConferenceConsiderRequest dgWorkConferenceConsiderRequest) {
@ -54,6 +59,7 @@ public class DgWorkConferenceConsiderController {
/** /**
* 评委抽取 * 评委抽取
*/ */
@Log(detail = "评委抽取",level = 4,operationUnit = OperationUnit.WORKCONFERENCE,operationType = OperationType.INSERT)
@PostMapping("/theJudgesDrawn") @PostMapping("/theJudgesDrawn")
@ApiOperation(value = "评委抽取", notes = "评委抽取") @ApiOperation(value = "评委抽取", notes = "评委抽取")
public ResponseResult theJudgesDrawn(@RequestBody DgWorkConferenceConsiderRequest dgWorkConferenceConsiderRequest) { public ResponseResult theJudgesDrawn(@RequestBody DgWorkConferenceConsiderRequest dgWorkConferenceConsiderRequest) {
@ -74,6 +80,7 @@ public class DgWorkConferenceConsiderController {
/** /**
* 查看 * 查看
*/ */
@Log(detail = "工作会详情",level = 4,operationUnit = OperationUnit.WORKCONFERENCE,operationType = OperationType.SELECT)
@GetMapping("/query") @GetMapping("/query")
@ApiOperation(value = "查看", notes = "查看") @ApiOperation(value = "查看", notes = "查看")
public ResponseResult query(@RequestParam("id") Integer id) { public ResponseResult query(@RequestParam("id") Integer id) {
@ -83,6 +90,7 @@ public class DgWorkConferenceConsiderController {
/** /**
* 导出 * 导出
*/ */
@Log(detail = "导出工作会列表",level = 4,operationUnit = OperationUnit.WORKCONFERENCE,operationType = OperationType.SELECT)
@GetMapping("/excelExport") @GetMapping("/excelExport")
@ApiOperation(value = "导出", notes = "导出") @ApiOperation(value = "导出", notes = "导出")
public ResponseResult excelExport(HttpServletResponse response, @RequestParam("ids") List<String> ids){ public ResponseResult excelExport(HttpServletResponse response, @RequestParam("ids") List<String> ids){

@ -354,7 +354,12 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
dgAssetsInvestigation.setEmpId(Integer.parseInt(dgApplyAmountInfoController.getUserId())); dgAssetsInvestigation.setEmpId(Integer.parseInt(dgApplyAmountInfoController.getUserId()));
dgAssetsInvestigation.setRemark(ArraysUtil.toString(approvalAssetsRequest.getRemark()));//补充原因 dgAssetsInvestigation.setRemark(ArraysUtil.toString(approvalAssetsRequest.getRemark()));//补充原因
dgAssetsInvestigation.setOtherRemark(approvalAssetsRequest.getOtherRemark());//其他原因 dgAssetsInvestigation.setOtherRemark(approvalAssetsRequest.getOtherRemark());//其他原因
if(assetsInvestigation.getType()==2 && approvalAssetsRequest.getStatus()==2){
//区分经理,领导审核,此处为经理审核
dgAssetsInvestigation.setStatus(StatusCode.SP_IN_REVIEW);//审核中
}else{
dgAssetsInvestigation.setStatus(approvalAssetsRequest.getStatus()); dgAssetsInvestigation.setStatus(approvalAssetsRequest.getStatus());
}
dgAssetsInvestigation.setOperatingStatus(StatusCode.CZ_PROCESSED);//状态设置为已处理 dgAssetsInvestigation.setOperatingStatus(StatusCode.CZ_PROCESSED);//状态设置为已处理
dgAssetsInvestigation.setAmount(approvalAssetsRequest.getAmount());//金额 dgAssetsInvestigation.setAmount(approvalAssetsRequest.getAmount());//金额
dgAssetsInvestigation.setTerm(approvalAssetsRequest.getTerm());//期限 dgAssetsInvestigation.setTerm(approvalAssetsRequest.getTerm());//期限
@ -423,7 +428,7 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
//资产部经理审批状态设置为驳回,操作状态设置为待处理 //资产部经理审批状态设置为驳回,操作状态设置为待处理
this.baseMapper.update(dgAssets,new QueryWrapper<DgAssetsInvestigation>() this.baseMapper.update(dgAssets,new QueryWrapper<DgAssetsInvestigation>()
.eq("business_id",assetsInvestigation.getBusinessId()).eq("type",2)); .eq("business_id",assetsInvestigation.getBusinessId()).eq("type",2));
}else if(approvalAssetsRequest.getStatus()==StatusCode.SP_IN_REVIEW && dgAssetsInvestigation.getOperatingStatus()==StatusCode.CZ_PROCESSED && assetsInvestigation.getType()==2){//资产部经理审核通过 }else if((approvalAssetsRequest.getStatus()==StatusCode.SP_IN_REVIEW||approvalAssetsRequest.getStatus()==StatusCode.SP_REVIEWED) && dgAssetsInvestigation.getOperatingStatus()==StatusCode.CZ_PROCESSED && assetsInvestigation.getType()==2){//资产部经理审核通过
//根据主键id查询业务id //根据主键id查询业务id
DgAssetsInvestigation assetsInvestigation2 = this.getBaseMapper().selectById(approvalAssetsRequest.getId()); DgAssetsInvestigation assetsInvestigation2 = this.getBaseMapper().selectById(approvalAssetsRequest.getId());

@ -567,7 +567,12 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
dgGuaranteeAssignUser.setEmpId(Integer.parseInt(dgApplyAmountInfoController.getUserId())); dgGuaranteeAssignUser.setEmpId(Integer.parseInt(dgApplyAmountInfoController.getUserId()));
dgGuaranteeAssignUser.setRemark(ArraysUtil.toString(approvalGuaranteeRequest.getRemark()));//补充调查原因 dgGuaranteeAssignUser.setRemark(ArraysUtil.toString(approvalGuaranteeRequest.getRemark()));//补充调查原因
dgGuaranteeAssignUser.setOtherRemark(approvalGuaranteeRequest.getOtherRemark());//其他原因 dgGuaranteeAssignUser.setOtherRemark(approvalGuaranteeRequest.getOtherRemark());//其他原因
if(guaranteeUser.getType()==3 && approvalGuaranteeRequest.getStatus()==2){
//区分经理,领导审核,此处为经理审核
dgGuaranteeAssignUser.setStatus(StatusCode.SP_IN_REVIEW);//审核中
}else{
dgGuaranteeAssignUser.setStatus(approvalGuaranteeRequest.getStatus()); dgGuaranteeAssignUser.setStatus(approvalGuaranteeRequest.getStatus());
}
dgGuaranteeAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED);//状态设置为已处理 dgGuaranteeAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED);//状态设置为已处理
dgGuaranteeAssignUser.setAmount(approvalGuaranteeRequest.getAmount());//金额 dgGuaranteeAssignUser.setAmount(approvalGuaranteeRequest.getAmount());//金额
dgGuaranteeAssignUser.setTerm(approvalGuaranteeRequest.getTerm());//期限 dgGuaranteeAssignUser.setTerm(approvalGuaranteeRequest.getTerm());//期限
@ -620,7 +625,7 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
//担保部经理审批状态设置为驳回,操作状态设置为待处理 //担保部经理审批状态设置为驳回,操作状态设置为待处理
this.baseMapper.update(dgAssignUser, new QueryWrapper<DgGuaranteeAssignUser>() this.baseMapper.update(dgAssignUser, new QueryWrapper<DgGuaranteeAssignUser>()
.eq("business_id", guaranteeUser.getBusinessId()).eq("type", 3)); .eq("business_id", guaranteeUser.getBusinessId()).eq("type", 3));
} else if (approvalGuaranteeRequest.getStatus() == StatusCode.SP_IN_REVIEW && dgGuaranteeAssignUser.getOperatingStatus() == StatusCode.CZ_PROCESSED && guaranteeUser.getType() == 3) {//担保部经理审核通过 } else if ((approvalGuaranteeRequest.getStatus().equals(StatusCode.SP_IN_REVIEW ) || approvalGuaranteeRequest.getStatus().equals(StatusCode.SP_REVIEWED) )&& dgGuaranteeAssignUser.getOperatingStatus() == StatusCode.CZ_PROCESSED && guaranteeUser.getType() == 3) {//担保部经理审核通过
//根据主键id查询业务id //根据主键id查询业务id
DgGuaranteeAssignUser guaranteeAssignUser = this.getBaseMapper().selectById(approvalGuaranteeRequest.getId()); DgGuaranteeAssignUser guaranteeAssignUser = this.getBaseMapper().selectById(approvalGuaranteeRequest.getId());

@ -334,7 +334,12 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
DgMessageInvestigation dgMessageInvestigation = new DgMessageInvestigation(); DgMessageInvestigation dgMessageInvestigation = new DgMessageInvestigation();
dgMessageInvestigation.setId(approvalMessageRequest.getId()); dgMessageInvestigation.setId(approvalMessageRequest.getId());
dgMessageInvestigation.setEmpId(Integer.parseInt(dgApplyAmountInfoController.getUserId())); dgMessageInvestigation.setEmpId(Integer.parseInt(dgApplyAmountInfoController.getUserId()));
if(messageInvestigation.getType()==2 && approvalMessageRequest.getStatus()==2){
//区分经理,领导审核,此处为经理审核
dgMessageInvestigation.setStatus(StatusCode.SP_IN_REVIEW);//审核中
}else{
dgMessageInvestigation.setStatus(approvalMessageRequest.getStatus());//状态 dgMessageInvestigation.setStatus(approvalMessageRequest.getStatus());//状态
}
dgMessageInvestigation.setOperatingStatus(StatusCode.CZ_PROCESSED);//操作状态设置为已处理 dgMessageInvestigation.setOperatingStatus(StatusCode.CZ_PROCESSED);//操作状态设置为已处理
dgMessageInvestigation.setRemark(approvalMessageRequest.getRemark());//审核意见 dgMessageInvestigation.setRemark(approvalMessageRequest.getRemark());//审核意见
//根据主键id修改信息部记录 //根据主键id修改信息部记录
@ -395,7 +400,7 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
//信息部经理审批状态设置为驳回,操作状态为待处理 //信息部经理审批状态设置为驳回,操作状态为待处理
this.baseMapper.update(dgMessage,new QueryWrapper<DgMessageInvestigation>() this.baseMapper.update(dgMessage,new QueryWrapper<DgMessageInvestigation>()
.eq("business_id",messageInvestigation.getBusinessId()).eq("type",2)); .eq("business_id",messageInvestigation.getBusinessId()).eq("type",2));
}else if(approvalMessageRequest.getStatus().equals(StatusCode.SP_IN_REVIEW) && dgMessageInvestigation.getOperatingStatus()==StatusCode.CZ_PROCESSED && messageInvestigation.getType()==2){//信息部经理审核通过 }else if((approvalMessageRequest.getStatus().equals(StatusCode.SP_IN_REVIEW)||approvalMessageRequest.getStatus().equals(StatusCode.SP_REVIEWED)) && dgMessageInvestigation.getOperatingStatus()==StatusCode.CZ_PROCESSED && messageInvestigation.getType()==2){//信息部经理审核通过
//根据主键id查询业务id //根据主键id查询业务id
DgMessageInvestigation messageInvestigation2 = this.getBaseMapper().selectById(approvalMessageRequest.getId()); DgMessageInvestigation messageInvestigation2 = this.getBaseMapper().selectById(approvalMessageRequest.getId());

@ -1,27 +1,27 @@
#服务名称 #服务名称
spring.application.name=dq-financial-guarantee #spring.application.name=dq-financial-guarantee
#配置中心地址 ##配置中心地址
spring.cloud.nacos.config.server-addr=127.0.0.1:8848 #spring.cloud.nacos.config.server-addr=127.0.0.1:8848
spring.cloud.nacos.config.file-extension=yml #spring.cloud.nacos.config.file-extension=yml
#redis配置 ##redis配置
spring.redis.host=127.0.0.1 #spring.redis.host=127.0.0.1
spring.redis.port=6379 #spring.redis.port=6379
spring.redis.password= #spring.redis.password=
spring.redis.database=0 #spring.redis.database=0
spring.redis.timeout=30000 #spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8 #spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1 #spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=8 #spring.redis.jedis.pool.max-idle=8
spring.redis.jedis.pool.min-idle=0 #spring.redis.jedis.pool.min-idle=0
#
#本地测试环境 ##本地测试环境
#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
#线上测试环境 #线上测试环境
#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
#线上生产环境 #线上生产环境
spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406 #spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406
#请求处理的超时时间 #请求处理的超时时间
ribbon.ReadTimeout: 120000 ribbon.ReadTimeout: 120000
@ -36,29 +36,29 @@ spring.servlet.multipart.max-file-size=10MB
# #
##正式环境(prod) ##正式环境(prod)
##服务名称 ##服务名称
#spring.application.name=dq-financial-guarantee spring.application.name=dq-financial-guarantee
##配置中心地址 #配置中心地址
#spring.cloud.nacos.config.server-addr=120.78.127.12:8848 spring.cloud.nacos.config.server-addr=120.78.127.12:8848
#spring.cloud.nacos.config.namespace=502bfc93-6e2f-44aa-93ad-f074664c6826 spring.cloud.nacos.config.namespace=502bfc93-6e2f-44aa-93ad-f074664c6826
#
#spring.cloud.nacos.config.ext-config[0].data-id=dq-financial-guarantee.yml spring.cloud.nacos.config.ext-config[0].data-id=dq-financial-guarantee.yml
#spring.cloud.nacos.config.ext-config[0].group=prod spring.cloud.nacos.config.ext-config[0].group=prod
#spring.cloud.nacos.config.ext-config[0].refresh=true spring.cloud.nacos.config.ext-config[0].refresh=true
#
#spring.cloud.nacos.config.ext-config[1].data-id=datasource.yml spring.cloud.nacos.config.ext-config[1].data-id=datasource.yml
#spring.cloud.nacos.config.ext-config[1].group=prod spring.cloud.nacos.config.ext-config[1].group=prod
#spring.cloud.nacos.config.ext-config[1].refresh=true spring.cloud.nacos.config.ext-config[1].refresh=true
#
#spring.cloud.nacos.config.ext-config[2].data-id=mybatis.yml spring.cloud.nacos.config.ext-config[2].data-id=mybatis.yml
#spring.cloud.nacos.config.ext-config[2].group=prod spring.cloud.nacos.config.ext-config[2].group=prod
#spring.cloud.nacos.config.ext-config[2].refresh=true spring.cloud.nacos.config.ext-config[2].refresh=true
#
#spring.redis.host=127.0.0.1 spring.redis.host=127.0.0.1
#spring.redis.port=6379 spring.redis.port=6379
#spring.redis.password=dq123456 spring.redis.password=dq123456
#spring.redis.database=0 spring.redis.database=0
#spring.redis.timeout=30000 spring.redis.timeout=30000
#spring.redis.jedis.pool.max-active=8 spring.redis.jedis.pool.max-active=8
#spring.redis.jedis.pool.max-wait=-1 spring.redis.jedis.pool.max-wait=-1
#spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.max-idle=8
#spring.redis.jedis.pool.min-idle=0 spring.redis.jedis.pool.min-idle=0

@ -36,6 +36,12 @@ public @interface Log {
*/ */
OperationUnit operationUnit() default OperationUnit.UNKNOWN; OperationUnit operationUnit() default OperationUnit.UNKNOWN;
/** 该属性需要访问的微服务名称 */
// String serverId();
//
// /** 表名 */
// String tableName();
} }

@ -5,18 +5,23 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.daqing.financial.hrauth.annotation.Log; import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.dao.SystemLogMapper; import com.daqing.financial.hrauth.dao.SystemLogMapper;
import com.daqing.financial.hrauth.feign.HrauthFeignService;
import com.daqing.financial.hrauth.service.TokenService; import com.daqing.financial.hrauth.service.TokenService;
import com.daqing.financial.hrauth.service.UserLoginService; import com.daqing.financial.hrauth.service.UserLoginService;
import com.daqing.financial.hrauth.util.IpUtils; import com.daqing.financial.hrauth.util.IpUtils;
import com.daqing.framework.domain.hrms.EmployeeEntity;
import com.daqing.framework.domain.hrms.SystemLog; import com.daqing.framework.domain.hrms.SystemLog;
import com.daqing.framework.domain.hrms.Token; import com.daqing.framework.domain.hrms.Token;
import com.daqing.framework.domain.hrms.UserEntity; import com.daqing.framework.domain.hrms.UserEntity;
import com.daqing.framework.model.response.ResponseResult;
import com.daqing.framework.util.RedisUtil; import com.daqing.framework.util.RedisUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.aspectj.lang.JoinPoint; import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.reflect.MethodSignature; import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
@ -37,6 +42,8 @@ import java.util.UUID;
*/ */
@Slf4j @Slf4j
@Component @Component
@EnableDiscoveryClient
@EnableAspectJAutoProxy(proxyTargetClass = true)
public class Operation { public class Operation {
@Resource @Resource
@ -45,12 +52,16 @@ public class Operation {
private TokenService tokenService; private TokenService tokenService;
@Autowired @Autowired
private UserLoginService userLoginService; private UserLoginService userLoginService;
@Autowired
private HrauthFeignService hrauthFeignService;
@Async @Async
public void addOperationLog(JoinPoint joinPoint, Object res, long time, UserEntity systemUser) { public void addOperationLog(JoinPoint joinPoint, Object res, long time, UserEntity systemUser, EmployeeEntity employeeEntity) {
// synchronized (SysLogAspect.class) {//获得登录用户信息 // synchronized (SysLogAspect.class) {//获得登录用户信息
// User systemUser = (User) SecurityUtils.getSubject().getPrincipal(); // User systemUser = (User) SecurityUtils.getSubject().getPrincipal();
MethodSignature signature = (MethodSignature) joinPoint.getSignature(); MethodSignature signature = (MethodSignature) joinPoint.getSignature();
SystemLog operationLog = new SystemLog(); SystemLog operationLog = new SystemLog();
operationLog.setJobNumber(employeeEntity.getJobNumber());
//获取内网地址IpUtils.intranetIp() //获取内网地址IpUtils.intranetIp()
//获取外网地址IpUtils.internetIp() //获取外网地址IpUtils.internetIp()
// operationLog.setIpAddressLan(""); // operationLog.setIpAddressLan("");
@ -70,7 +81,7 @@ public class Operation {
operationLog.setCreateTime(new Date()); operationLog.setCreateTime(new Date());
operationLog.setMethod(signature.getDeclaringTypeName() + "." + signature.getName()); operationLog.setMethod(signature.getDeclaringTypeName() + "." + signature.getName());
operationLog.setUserId(systemUser.getId() + ""); operationLog.setUserId(systemUser.getId() + "");
operationLog.setUserName(systemUser.getAccount()); operationLog.setUserName(employeeEntity.getName());
Log annotation = signature.getMethod().getAnnotation(Log.class); Log annotation = signature.getMethod().getAnnotation(Log.class);
if (annotation != null) { if (annotation != null) {
operationLog.setLogLevel(annotation.level()); operationLog.setLogLevel(annotation.level());
@ -81,9 +92,10 @@ public class Operation {
//这里保存日志 //这里保存日志
// log.info("######记录日志:{}######", operationLog.toString()); // log.info("######记录日志:{}######", operationLog.toString());
int b = systemLogMapper.insert(operationLog); //int b = systemLogMapper.insert(operationLog);
ResponseResult insert = hrauthFeignService.insert(operationLog);
log.info("######记录日志:{}######", operationLog.toString()); log.info("######记录日志:{}######", operationLog.toString());
if (b<= 0) { if (insert.getCode()== 40007) {
log.error("#####新增###记录日志失败:{}####", operationLog); log.error("#####新增###记录日志失败:{}####", operationLog);
} }
// } // }

@ -4,16 +4,21 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.daqing.financial.hrauth.annotation.Log; import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.feign.HrmsFeignService;
import com.daqing.financial.hrauth.service.TokenService; import com.daqing.financial.hrauth.service.TokenService;
import com.daqing.financial.hrauth.service.UserLoginService; import com.daqing.financial.hrauth.service.UserLoginService;
import com.daqing.framework.domain.hrms.EmployeeEntity;
import com.daqing.framework.domain.hrms.Token; import com.daqing.framework.domain.hrms.Token;
import com.daqing.framework.domain.hrms.UserEntity; import com.daqing.framework.domain.hrms.UserEntity;
import com.daqing.framework.model.response.ResponseResult;
import com.daqing.framework.util.RedisUtil; import com.daqing.framework.util.RedisUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.JoinPoint; import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.*; import org.aspectj.lang.annotation.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletRequestAttributes;
@ -32,6 +37,8 @@ import java.util.Map;
@Slf4j @Slf4j
@Aspect @Aspect
@Component @Component
@EnableDiscoveryClient
@EnableAspectJAutoProxy(proxyTargetClass = true)
public class SysLogAspect { public class SysLogAspect {
@Resource @Resource
@ -40,6 +47,8 @@ public class SysLogAspect {
private TokenService tokenService; private TokenService tokenService;
@Autowired @Autowired
private UserLoginService userLoginService; private UserLoginService userLoginService;
@Autowired
private HrmsFeignService hrmsFeignService;
/** /**
* 此处的切点是注解的方式也可以用包名的方式达到相同的效果 * 此处的切点是注解的方式也可以用包名的方式达到相同的效果
* '@Pointcut("execution(* com.wwj.springboot.service.impl.*.*(..))")' * '@Pointcut("execution(* com.wwj.springboot.service.impl.*.*(..))")'
@ -69,9 +78,12 @@ public class SysLogAspect {
String userEntityStr = RedisUtil.get("dq:userId:"+userId); String userEntityStr = RedisUtil.get("dq:userId:"+userId);
UserEntity systemUser = JSON.parseObject(userEntityStr,UserEntity.class); UserEntity systemUser = JSON.parseObject(userEntityStr,UserEntity.class);
//根据userId查询工号以及员工姓名
EmployeeEntity employeeEntity = hrmsFeignService.getEmpmsgById(Long.valueOf(userId));
//Token userToken = tokenService.getOne(new QueryWrapper<Token>().eq("token", token)); //Token userToken = tokenService.getOne(new QueryWrapper<Token>().eq("token", token));
//UserEntity systemUser = userLoginService.getOne(new QueryWrapper<UserEntity>().eq("id",userId)); //UserEntity systemUser = userLoginService.getOne(new QueryWrapper<UserEntity>().eq("id",userId));
operation.addOperationLog(joinPoint,res,time,systemUser); operation.addOperationLog(joinPoint,res,time,systemUser,employeeEntity);
//方法执行完成后增加日志 //方法执行完成后增加日志
// addOperationLog(joinPoint, res, time); // addOperationLog(joinPoint, res, time);
} catch (Exception e) { } catch (Exception e) {

@ -0,0 +1,48 @@
package com.daqing.financial.hrauth.config;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.security.web.DefaultRedirectStrategy;
import org.springframework.security.web.RedirectStrategy;
import org.springframework.security.web.session.SessionInformationExpiredEvent;
import org.springframework.security.web.session.SessionInformationExpiredStrategy;
import org.springframework.stereotype.Component;
import javax.servlet.ServletException;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@Component
public class CustomExpiredSessionStrategy implements SessionInformationExpiredStrategy {
//前后端分离返回JSON的方式
//jackson的JSON处理对象
private ObjectMapper objectMapper = new ObjectMapper();
@Override
public void onExpiredSessionDetected(SessionInformationExpiredEvent event)
throws IOException, ServletException {
Map<String, Object> map = new HashMap<>();
map.put("code", 403);
map.put("msg", "您的登陆已经超时或者已经在另一台机器登陆,您被迫下线!"
+ event.getSessionInformation().getLastRequest());
String json = objectMapper.writeValueAsString(map);
event.getResponse().setContentType("application/json;charset=utf-8");
event.getResponse().getWriter().write(json);
}
//页面跳转的方式
//页面跳转的处理逻辑
// private RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
//
//
// @Override
// public void onExpiredSessionDetected(SessionInformationExpiredEvent event)
// throws IOException, ServletException {
// redirectStrategy.sendRedirect(event.getRequest(), event.getResponse(), "踢下线后跳转的路径");
// }
}

@ -72,6 +72,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
} }
/** /**
* 权限配置 * 权限配置
* @param http * @param http
@ -105,6 +107,14 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
// 不创建会话 - 即通过前端传token到后台过滤器中验证是否存在访问权限 // 不创建会话 - 即通过前端传token到后台过滤器中验证是否存在访问权限
http.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS); http.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS);
// http.sessionManagement()
// .sessionCreationPolicy(SessionCreationPolicy.ALWAYS)
// .sessionFixation().migrateSession()
// .invalidSessionUrl("http://192.168.31.254:8080")//对会话超时之后的处理
// .maximumSessions(1)//最多允许一个用户登录
// .maxSessionsPreventsLogin(true)//是否踢下线 true表示已经登陆就不允许再次登陆 false表示允许再次登陆但是之前的登陆账号会被踢下线
// .expiredSessionStrategy(new CustomExpiredSessionStrategy());//自定义处理策略
// 登录处理 - 前后端一体的情况下 // 登录处理 - 前后端一体的情况下
// registry.and().formLogin().loginPage("/login").defaultSuccessUrl("/").permitAll() // registry.and().formLogin().loginPage("/login").defaultSuccessUrl("/").permitAll()
// // 自定义登陆用户名和密码属性名,默认为 username和password // // 自定义登陆用户名和密码属性名,默认为 username和password
@ -137,6 +147,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
.addFilterBefore(myAuthenticationFilter, BasicAuthenticationFilter.class); .addFilterBefore(myAuthenticationFilter, BasicAuthenticationFilter.class);
} }
/** /**
* 忽略拦截url或静态资源文件夹 - web.ignoring(): 会直接过滤该url - 将不会经过Spring Security过滤器链 * 忽略拦截url或静态资源文件夹 - web.ignoring(): 会直接过滤该url - 将不会经过Spring Security过滤器链
* http.permitAll(): 不会绕开springsecurity验证相当于是允许该路径通过 * http.permitAll(): 不会绕开springsecurity验证相当于是允许该路径通过
@ -149,5 +160,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
// web.ignoring().antMatchers("/dg-apply-amount-info/getRoles","/api-guarantee/dg-apply-amount-info/getRoles"); // web.ignoring().antMatchers("/dg-apply-amount-info/getRoles","/api-guarantee/dg-apply-amount-info/getRoles");
} }
} }

@ -1,5 +1,8 @@
package com.daqing.financial.hrauth.controller; package com.daqing.financial.hrauth.controller;
import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.enums.OperationType;
import com.daqing.financial.hrauth.enums.OperationUnit;
import com.daqing.financial.hrauth.service.RolePermissionService; import com.daqing.financial.hrauth.service.RolePermissionService;
import com.daqing.framework.domain.hrms.PermissionEntity; import com.daqing.framework.domain.hrms.PermissionEntity;
import com.daqing.framework.domain.hrms.RoleEntity; import com.daqing.framework.domain.hrms.RoleEntity;
@ -40,6 +43,7 @@ public class RolePermissionController {
* 权限菜单树形列表展示 * 权限菜单树形列表展示
* @return * @return
*/ */
@Log(detail = "权限菜单树形列表展示",level = 3,operationUnit = OperationUnit.ROLEPERMISSION,operationType = OperationType.SELECT)
@GetMapping("/tree") @GetMapping("/tree")
public ResponseResult tree() { public ResponseResult tree() {
List<PermissionEntity> list = permissionService.listWithTree(); List<PermissionEntity> list = permissionService.listWithTree();
@ -52,6 +56,7 @@ public class RolePermissionController {
* @param size * @param size
* @return * @return
*/ */
@Log(detail = "角色权限列表展示",level = 3,operationUnit = OperationUnit.ROLEPERMISSION,operationType = OperationType.SELECT)
@GetMapping("/rolePermissionList") @GetMapping("/rolePermissionList")
public ResponseResult rolePermissionList(@RequestParam("page") Integer page, public ResponseResult rolePermissionList(@RequestParam("page") Integer page,
@RequestParam("size") Integer size) { @RequestParam("size") Integer size) {
@ -64,6 +69,7 @@ public class RolePermissionController {
* @param roleId * @param roleId
* @return * @return
*/ */
@Log(detail = "查看角色权限",level = 4,operationUnit = OperationUnit.ROLEPERMISSION,operationType = OperationType.SELECT)
@GetMapping("/queryPermissionByRoleId") @GetMapping("/queryPermissionByRoleId")
public ResponseResult queryPermissionByRoleId(@RequestParam("roleId") Long roleId) { public ResponseResult queryPermissionByRoleId(@RequestParam("roleId") Long roleId) {
List<RolePermissionResponse> list = permissionService.listWithPermissionTree(roleId); List<RolePermissionResponse> list = permissionService.listWithPermissionTree(roleId);
@ -75,6 +81,7 @@ public class RolePermissionController {
* @param roleId * @param roleId
* @return * @return
*/ */
@Log(detail = "查看权限数组",level = 4,operationUnit = OperationUnit.ROLEPERMISSION,operationType = OperationType.SELECT)
@GetMapping("/queryPermissionArrById") @GetMapping("/queryPermissionArrById")
public ResponseResult queryPermissionArrById(@RequestParam("roleId") Long roleId) { public ResponseResult queryPermissionArrById(@RequestParam("roleId") Long roleId) {
List<RolePermissionEntity> list = permissionService.queryPermissionArrById(roleId); List<RolePermissionEntity> list = permissionService.queryPermissionArrById(roleId);
@ -89,6 +96,7 @@ public class RolePermissionController {
/** /**
* 新增角色权限 * 新增角色权限
*/ */
@Log(detail = "新增角色权限",level = 4,operationUnit = OperationUnit.ROLEPERMISSION,operationType = OperationType.INSERT)
@Transactional @Transactional
@PostMapping("/saveRolePermission") @PostMapping("/saveRolePermission")
public ResponseResult saveRolePermission(@Valid @RequestBody RolePermissionRequest rolePermission) { public ResponseResult saveRolePermission(@Valid @RequestBody RolePermissionRequest rolePermission) {
@ -122,6 +130,7 @@ public class RolePermissionController {
/** /**
* 修改角色权限 * 修改角色权限
*/ */
@Log(detail = "修改角色权限",level = 4,operationUnit = OperationUnit.ROLEPERMISSION,operationType = OperationType.UPDATE)
@Transactional @Transactional
@PostMapping("/updateRolePermission") @PostMapping("/updateRolePermission")
public ResponseResult updateRolePermission(@Valid @RequestBody RolePermissionRequest rolePermission) { public ResponseResult updateRolePermission(@Valid @RequestBody RolePermissionRequest rolePermission) {
@ -143,6 +152,7 @@ public class RolePermissionController {
/** /**
* 删除用户角色权限 * 删除用户角色权限
*/ */
@Log(detail = "删除用户角色权限",level = 4,operationUnit = OperationUnit.ROLEPERMISSION,operationType = OperationType.DELETE)
@Transactional @Transactional
@PostMapping("/delRolePermission") @PostMapping("/delRolePermission")
public ResponseResult delRolePermission(@RequestBody RolePermissionRequest rolePermission) { public ResponseResult delRolePermission(@RequestBody RolePermissionRequest rolePermission) {
@ -176,6 +186,7 @@ public class RolePermissionController {
* @param userId * @param userId
* @return * @return
*/ */
@Log(detail = "查询用户角色信息",level = 4,operationUnit = OperationUnit.ROLEPERMISSION,operationType = OperationType.SELECT)
@Transactional @Transactional
@GetMapping("/getUserRoles") @GetMapping("/getUserRoles")
public ResponseResult getUserRoles(@RequestParam("userId")Integer userId) { public ResponseResult getUserRoles(@RequestParam("userId")Integer userId) {

@ -6,6 +6,7 @@ import com.daqing.financial.hrauth.enums.OperationType;
import com.daqing.financial.hrauth.enums.OperationUnit; import com.daqing.financial.hrauth.enums.OperationUnit;
import com.daqing.financial.hrauth.service.LoginLogService; import com.daqing.financial.hrauth.service.LoginLogService;
import com.daqing.financial.hrauth.service.SystemLogService; import com.daqing.financial.hrauth.service.SystemLogService;
import com.daqing.framework.domain.hrms.SystemLog;
import com.daqing.framework.domain.hrms.request.UserLoginLogRequest; import com.daqing.framework.domain.hrms.request.UserLoginLogRequest;
import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.model.response.ResponseResult;
import com.daqing.framework.utils.PageUtils; import com.daqing.framework.utils.PageUtils;
@ -30,19 +31,26 @@ public class SystemLogController implements SystemLogControllerApi {
private LoginLogService loginLogService; private LoginLogService loginLogService;
@GetMapping("/list") @GetMapping("/list")
//@Log(detail = "系统日志列表",level = 3,operationUnit = OperationUnit.ROLE,operationType = OperationType.SELECT) @Log(detail = "系统日志列表",level = 3,operationUnit = OperationUnit.SYSLOG,operationType = OperationType.SELECT)
public ResponseResult list(@RequestParam("page") Integer page, public ResponseResult list(@RequestParam("page") Integer page,
@RequestParam("size") Integer size) { @RequestParam("size") Integer size,UserLoginLogRequest userLoginLogRequest) {
PageUtils data = systemLogService.queryPage(page, size); PageUtils data = systemLogService.queryPage(page, size,userLoginLogRequest);
return new ResponseResult<PageUtils>().SUCCESS(data); return new ResponseResult<PageUtils>().SUCCESS(data);
} }
@GetMapping("/loginLogList") @GetMapping("/loginLogList")
//@Log(detail = "登录日志列表",level = 3,operationUnit = OperationUnit.ROLE,operationType = OperationType.SELECT) @Log(detail = "登录日志列表",level = 3,operationUnit = OperationUnit.SYSLOG,operationType = OperationType.SELECT)
public ResponseResult loginLogList(@RequestParam("page") Integer page, public ResponseResult loginLogList(@RequestParam("page") Integer page,
@RequestParam("size") Integer size, UserLoginLogRequest userLoginLogRequest) { @RequestParam("size") Integer size, UserLoginLogRequest userLoginLogRequest) {
PageUtils data = loginLogService.queryPage(page, size,userLoginLogRequest); PageUtils data = loginLogService.queryPage(page, size,userLoginLogRequest);
return new ResponseResult<PageUtils>().SUCCESS(data); return new ResponseResult<PageUtils>().SUCCESS(data);
} }
@PostMapping("/insert")
public ResponseResult insert(@RequestBody SystemLog operationLog) {
int result = systemLogService.insertLog(operationLog);
return result>0 ? ResponseResult.SUCCESS("新增日志成功"):ResponseResult.FAIL(40007,"新增日志失败");
}
} }

@ -3,7 +3,10 @@ package com.daqing.financial.hrauth.controller;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.daqing.financial.hrauth.UserLoginControllerApi; import com.daqing.financial.hrauth.UserLoginControllerApi;
import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.config.WeChatConfig; import com.daqing.financial.hrauth.config.WeChatConfig;
import com.daqing.financial.hrauth.enums.OperationType;
import com.daqing.financial.hrauth.enums.OperationUnit;
import com.daqing.financial.hrauth.feign.HrmsFeignService; import com.daqing.financial.hrauth.feign.HrmsFeignService;
import com.daqing.financial.hrauth.model.XccLoginReq; import com.daqing.financial.hrauth.model.XccLoginReq;
import com.daqing.financial.hrauth.service.UserLoginService; import com.daqing.financial.hrauth.service.UserLoginService;
@ -59,18 +62,7 @@ public class UserLoginController implements UserLoginControllerApi {
@Autowired @Autowired
private HrmsFeignService hrmsFeignService; private HrmsFeignService hrmsFeignService;
@PostMapping("/loginSuccess") @Log(detail = "验证手机号及验证码",level = 2,operationUnit = OperationUnit.LOGIN,operationType = OperationType.UPDATE)
public String loginSuccess(){
return "success";
}
@GetMapping("/test")
public String test(){
return "Hello";
}
@PostMapping("/verifyMobile") @PostMapping("/verifyMobile")
@ApiOperation(value = "验证手机号及验证码") @ApiOperation(value = "验证手机号及验证码")
public ResponseResult verifyMobile(@RequestBody @Valid UserLoginRequest user){ public ResponseResult verifyMobile(@RequestBody @Valid UserLoginRequest user){
@ -78,6 +70,7 @@ public class UserLoginController implements UserLoginControllerApi {
return ResponseResult.SUCCESS(result); return ResponseResult.SUCCESS(result);
} }
@Log(detail = "重置密码",level = 2,operationUnit = OperationUnit.LOGIN,operationType = OperationType.UPDATE)
@PostMapping("/getBackPwd") @PostMapping("/getBackPwd")
@ApiOperation(value = "重置密码") @ApiOperation(value = "重置密码")
public ResponseResult getBackPwd(@RequestBody @Valid ResetPwdRequest user){ public ResponseResult getBackPwd(@RequestBody @Valid ResetPwdRequest user){
@ -85,25 +78,16 @@ public class UserLoginController implements UserLoginControllerApi {
return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
} }
@Log(detail = "用户登录",level = 1,operationUnit = OperationUnit.LOGIN,operationType = OperationType.INSERT)
@PostMapping(value = "/login") @PostMapping(value = "/login")
@ApiOperation(value = "用户登录") @ApiOperation(value = "用户登录")
/*@SysLog(MODULE = "登录日志", REMARK = "登录日志")*/ /*@SysLog(MODULE = "登录日志", REMARK = "登录日志")*/
public ResponseResult login( public ResponseResult login(@RequestBody LoginRequest loginRequest){
@RequestBody LoginRequest loginRequest
/* @RequestParam("password") String password, @RequestParam("phone") String phone,
@RequestParam("type")int type, @RequestParam("wechatId") String wechatId,
@RequestParam("tenDayEffective") int tenDayEffective*/
){
/* LoginRequest loginRequest = new LoginRequest();
loginRequest.setTenDayEffective(tenDayEffective);
loginRequest.setType(type);
loginRequest.setWechatId(wechatId);
loginRequest.setPassword(password);
loginRequest.setPhone(phone);*/
System.out.println("wechatId================"+loginRequest.getWechatId()); System.out.println("wechatId================"+loginRequest.getWechatId());
return userLoginService.login(loginRequest); return userLoginService.login(loginRequest);
} }
@Log(detail = "修改平台超管员密码",level = 2,operationUnit = OperationUnit.LOGIN,operationType = OperationType.UPDATE)
@PostMapping("/updatePwd") @PostMapping("/updatePwd")
@ApiOperation(value = "修改平台超管员密码") @ApiOperation(value = "修改平台超管员密码")
public ResponseResult updatePwd(@RequestBody @Valid UpdatePwdRequest user){ public ResponseResult updatePwd(@RequestBody @Valid UpdatePwdRequest user){
@ -138,6 +122,7 @@ public class UserLoginController implements UserLoginControllerApi {
* @param response * @param response
* @throws IOException * @throws IOException
*/ */
@Log(detail = "微信扫码登录",level = 1,operationUnit = OperationUnit.LOGIN,operationType = OperationType.INSERT)
@GetMapping("/user/callback") @GetMapping("/user/callback")
public void wechatUserCallback(@RequestParam(value = "code",required = true) String code, public void wechatUserCallback(@RequestParam(value = "code",required = true) String code,
String state, HttpServletResponse response) throws IOException { String state, HttpServletResponse response) throws IOException {
@ -169,8 +154,8 @@ public class UserLoginController implements UserLoginControllerApi {
//account = new String(username.getBytes("GBK"),"iso-8859-1"); //account = new String(username.getBytes("GBK"),"iso-8859-1");
log.info("account==========="+account+"headerImg============="+headerImg); log.info("account==========="+account+"headerImg============="+headerImg);
//response.sendRedirect("http://8.129.127.185/dq/index.html#/login?token="+token+"&account="+account+"&headerImg="+headerImg); //response.sendRedirect("http://8.129.127.185/dq/index.html#/login?token="+token+"&account="+account+"&headerImg="+headerImg);
//response.sendRedirect("https://www.huorantech.cn/index/#/login?token="+token+"&account="+account+"&headerImg="+headerImg); response.sendRedirect("https://www.huorantech.cn/index/#/login?token="+token+"&account="+account+"&headerImg="+headerImg);
response.sendRedirect("https://www.feifanhitech.com/index/#/login?token="+token+"&account="+account+"&headerImg="+headerImg); // response.sendRedirect("https://www.feifanhitech.com/index/#/login?token="+token+"&account="+account+"&headerImg="+headerImg);
} }
}else { }else {
userService.weChatBinding(code,response,state); userService.weChatBinding(code,response,state);
@ -182,6 +167,7 @@ public class UserLoginController implements UserLoginControllerApi {
* @param bindOpenIdRequest * @param bindOpenIdRequest
* @return * @return
*/ */
@Log(detail = "绑定手机号和openId",level = 1,operationUnit = OperationUnit.LOGIN,operationType = OperationType.UPDATE)
@PostMapping("/bindPhoneAndOpenId") @PostMapping("/bindPhoneAndOpenId")
public ResponseResult bindPhoneAndOpenId(@RequestBody @Valid BindOpenIdRequest bindOpenIdRequest){ public ResponseResult bindPhoneAndOpenId(@RequestBody @Valid BindOpenIdRequest bindOpenIdRequest){
boolean result = userLoginService.bindPhoneAndOpenId(bindOpenIdRequest); boolean result = userLoginService.bindPhoneAndOpenId(bindOpenIdRequest);
@ -201,6 +187,7 @@ public class UserLoginController implements UserLoginControllerApi {
* @param mobile * @param mobile
* @return * @return
*/ */
@Log(detail = "获取验证码",level = 1,operationUnit = OperationUnit.LOGIN,operationType = OperationType.UPDATE)
@GetMapping("/sendCode") @GetMapping("/sendCode")
public ResponseResult sendCode(@RequestParam("mobile") String mobile){ public ResponseResult sendCode(@RequestParam("mobile") String mobile){
boolean result = SendUtil.sendMs(mobile); boolean result = SendUtil.sendMs(mobile);
@ -223,6 +210,7 @@ public class UserLoginController implements UserLoginControllerApi {
* @param * @param
* @return * @return
*/ */
@Log(detail = "微信小程序授权登录",level = 1,operationUnit = OperationUnit.LOGIN,operationType = OperationType.INSERT)
@PostMapping(value = "/wxAuthLogin") @PostMapping(value = "/wxAuthLogin")
public ResponseResult wxAuthLogin(@RequestBody XccLoginReq xccLoginReq){ public ResponseResult wxAuthLogin(@RequestBody XccLoginReq xccLoginReq){

@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.daqing.framework.domain.hrms.SystemLog; import com.daqing.framework.domain.hrms.SystemLog;
import com.daqing.framework.domain.hrms.request.UserLoginLogRequest;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/** /**
* @ClassName SystemLogMapper * @ClassName SystemLogMapper
@ -15,6 +17,6 @@ import org.apache.ibatis.annotations.Mapper;
*/ */
@Mapper @Mapper
public interface SystemLogMapper extends BaseMapper<SystemLog> { public interface SystemLogMapper extends BaseMapper<SystemLog> {
IPage<SystemLog> pageByCondition(Page page); IPage<SystemLog> pageByCondition(Page page, @Param("sysLog") UserLoginLogRequest userLoginLogRequest);
} }

@ -5,6 +5,26 @@ public enum OperationUnit {
* 被操作的单元 * 被操作的单元
*/ */
UNKNOWN("unknown"), UNKNOWN("unknown"),
APPLYAMOUNTINFO("业务申请"),
GUARANTEE("担保部调查"),
ASSETS("资产部调查"),
MESSAGE("信息部调查"),
COMPLIANCE("合规调查"),
WORKCONFERENCE("工作会"),
LOANCOMMITTEE("贷审会"),
GUARANTEELETTER("担保函"),
PAYMENTCONFIRMATION("财务确认"),
LOANNOTICE("放款通知"),
COPYFOR("抄送"),
EFFICIENCY("流程效率"),
FORMDESIGN("表单设计"),
PROCESSMANAGE("流程管理"),
STATISTICS("业务统计"),
LOGIN("登录"),
ROLEPERMISSION("角色权限管理"),
EMPLOYEE("员工信息"),
COMPANY("企业信息"),
SYSLOG("日志管理"),
USER("user"), USER("user"),
LOG("log"), LOG("log"),
PERMISSION("permission"), PERMISSION("permission"),

@ -2,9 +2,12 @@ package com.daqing.financial.hrauth.feign;
import com.daqing.framework.domain.hrms.PermissionEntity; import com.daqing.framework.domain.hrms.PermissionEntity;
import com.daqing.framework.domain.hrms.RoleEntity; import com.daqing.framework.domain.hrms.RoleEntity;
import com.daqing.framework.domain.hrms.SystemLog;
import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.model.response.ResponseResult;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import java.util.List; import java.util.List;
@ -21,4 +24,7 @@ public interface HrauthFeignService {
@GetMapping("/hrms/auth/permission/queryPermissionList") @GetMapping("/hrms/auth/permission/queryPermissionList")
ResponseResult<List<PermissionEntity>> queryPermissionList(@RequestParam("jiacan")String jiacan); ResponseResult<List<PermissionEntity>> queryPermissionList(@RequestParam("jiacan")String jiacan);
@PostMapping("/hrms/auth/systemLog/insert")
ResponseResult insert(@RequestBody SystemLog operationLog);
} }

@ -32,4 +32,7 @@ public interface HrmsFeignService {
*/ */
@PostMapping("hrms/employee/getAccountAndDeptNameById") @PostMapping("hrms/employee/getAccountAndDeptNameById")
ResponseResult getAccountAndDeptNameById(@RequestBody List<Integer> ids); ResponseResult getAccountAndDeptNameById(@RequestBody List<Integer> ids);
@PostMapping("hrms/employee/getEmpmsgById")
EmployeeEntity getEmpmsgById(@RequestParam("id") Long id);
} }

@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.daqing.framework.domain.hrms.EmployeeEntity; import com.daqing.framework.domain.hrms.EmployeeEntity;
import com.daqing.framework.domain.hrms.LoginLog; import com.daqing.framework.domain.hrms.LoginLog;
import com.daqing.framework.domain.hrms.SystemLog; import com.daqing.framework.domain.hrms.SystemLog;
import com.daqing.framework.domain.hrms.request.UserLoginLogRequest;
import com.daqing.framework.utils.PageUtils; import com.daqing.framework.utils.PageUtils;
public interface SystemLogService extends IService<SystemLog> { public interface SystemLogService extends IService<SystemLog> {
PageUtils queryPage(Integer page, Integer size); PageUtils queryPage(Integer page, Integer size, UserLoginLogRequest userLoginLogRequest);
int insertLog(SystemLog operationLog);
} }

@ -11,13 +11,14 @@ import com.daqing.framework.domain.hrms.EmployeeEntity;
import com.daqing.framework.domain.hrms.LoginLog; import com.daqing.framework.domain.hrms.LoginLog;
import com.daqing.framework.domain.hrms.SystemLog; import com.daqing.framework.domain.hrms.SystemLog;
import com.daqing.framework.domain.hrms.ext.EmployeeVO; import com.daqing.framework.domain.hrms.ext.EmployeeVO;
import com.daqing.framework.domain.hrms.request.UserLoginLogRequest;
import com.daqing.framework.utils.PageUtils; import com.daqing.framework.utils.PageUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service @Service
public class SystemLogServiceImpl extends ServiceImpl<SystemLogMapper, SystemLog> implements SystemLogService { public class SystemLogServiceImpl extends ServiceImpl<SystemLogMapper, SystemLog> implements SystemLogService {
@Override @Override
public PageUtils queryPage(Integer page, Integer size) { public PageUtils queryPage(Integer page, Integer size, UserLoginLogRequest userLoginLogRequest) {
//分页参数 //分页参数
if (page <= 0) { if (page <= 0) {
page = 1; page = 1;
@ -25,8 +26,14 @@ public class SystemLogServiceImpl extends ServiceImpl<SystemLogMapper, SystemLog
if (size <= 0) { if (size <= 0) {
size = 10; size = 10;
} }
IPage<SystemLog> systemLogVo = this.getBaseMapper().pageByCondition(new Page(page, size)); IPage<SystemLog> systemLogVo = this.getBaseMapper().pageByCondition(new Page(page, size),userLoginLogRequest);
return new PageUtils(systemLogVo); return new PageUtils(systemLogVo);
} }
@Override
public int insertLog(SystemLog operationLog) {
int b = this.baseMapper.insert(operationLog);
return b;
}
} }

@ -92,8 +92,8 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
if(dbUser == null){//openId不存在,返回绑定手机号页面,须另写绑定手机号接口 if(dbUser == null){//openId不存在,返回绑定手机号页面,须另写绑定手机号接口
log.info("dbUser为空,openId不存在,请先绑定手机号哦~~~"); log.info("dbUser为空,openId不存在,请先绑定手机号哦~~~");
try { try {
response.sendRedirect("https://www.feifanhitech.com/index/#/bind-phone?matched="+md5UnionId); // response.sendRedirect("https://www.feifanhitech.com/index/#/bind-phone?matched="+md5UnionId);
//response.sendRedirect("https://www.huorantech.cn/index/#/bind-phone?matched="+md5UnionId);//跳转绑定手机号页面 response.sendRedirect("https://www.huorantech.cn/index/#/bind-phone?matched="+md5UnionId);//跳转绑定手机号页面
//response.sendRedirect("http://8.129.127.185/dq/index.html#/bind-phone?matched="+md5UnionId);//跳转绑定手机号页面 //response.sendRedirect("http://8.129.127.185/dq/index.html#/bind-phone?matched="+md5UnionId);//跳转绑定手机号页面
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
@ -157,9 +157,9 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
if (countWeChatId > 0){ if (countWeChatId > 0){
try { try {
log.info("微信重复了,我走到了这里............................."); log.info("微信重复了,我走到了这里.............................");
//response.sendRedirect("https://www.huorantech.cn/index/#/workbench-manpower?token="+token+"&message=1"); response.sendRedirect("https://www.huorantech.cn/index/#/workbench-manpower?token="+token+"&message=1");
//response.sendRedirect("http://8.129.127.185/dq/index.html#/workbench-manpower?token="+token+"&message=1"); //response.sendRedirect("http://8.129.127.185/dq/index.html#/workbench-manpower?token="+token+"&message=1");
response.sendRedirect("https://www.feifanhitech.com/index/#/workbench-manpower?token="+token+"&message=1"); // response.sendRedirect("https://www.feifanhitech.com/index/#/workbench-manpower?token="+token+"&message=1");
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -169,9 +169,9 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> imple
if (result){ if (result){
try { try {
log.info("转发成功---------------------------------------"); log.info("转发成功---------------------------------------");
//response.sendRedirect("https://www.huorantech.cn/index/#/workbench-manpower?token="+token); response.sendRedirect("https://www.huorantech.cn/index/#/workbench-manpower?token="+token);
//response.sendRedirect("http://8.129.127.185/dq/index.html#/workbench-manpower?token="+token); //response.sendRedirect("http://8.129.127.185/dq/index.html#/workbench-manpower?token="+token);
response.sendRedirect("https://www.feifanhitech.com/index/#/workbench-manpower?token="+token); // response.sendRedirect("https://www.feifanhitech.com/index/#/workbench-manpower?token="+token);
}catch (IOException e){ }catch (IOException e){
e.printStackTrace(); e.printStackTrace();
} }

@ -1,27 +1,27 @@
#服务名称 #服务名称
spring.application.name=dq-financial-hrms-auth #spring.application.name=dq-financial-hrms-auth
#配置中心地址 ##配置中心地址
spring.cloud.nacos.config.server-addr=127.0.0.1:8848 #spring.cloud.nacos.config.server-addr=127.0.0.1:8848
spring.cloud.nacos.config.file-extension=yml #spring.cloud.nacos.config.file-extension=yml
#redis配置 ##redis配置
spring.redis.host=127.0.0.1 #spring.redis.host=127.0.0.1
spring.redis.port=6379 #spring.redis.port=6379
spring.redis.password= #spring.redis.password=
spring.redis.database=0 #spring.redis.database=0
spring.redis.timeout=30000 #spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8 #spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1 #spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=8 #spring.redis.jedis.pool.max-idle=8
spring.redis.jedis.pool.min-idle=0 #spring.redis.jedis.pool.min-idle=0
#
#本地测试环境 ##本地测试环境
#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
#线上测试环境 #线上测试环境
#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
#线上生产环境 #线上生产环境
spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406 #spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406
#请求处理的超时时间 #请求处理的超时时间
ribbon.ReadTimeout: 120000 ribbon.ReadTimeout: 120000
@ -30,30 +30,30 @@ ribbon.ConnectTimeout: 30000
#正式环境(prod) #正式环境(prod)
#spring.application.name=dq-financial-hrms-auth spring.application.name=dq-financial-hrms-auth
#
#spring.cloud.nacos.config.server-addr=120.78.127.12:8848 spring.cloud.nacos.config.server-addr=120.78.127.12:8848
#spring.cloud.nacos.config.namespace=b590c830-7ada-44b7-968f-e8d0c81990c4 spring.cloud.nacos.config.namespace=b590c830-7ada-44b7-968f-e8d0c81990c4
##spring.cloud.nacos.config.group=prod #spring.cloud.nacos.config.group=prod
#
#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
#spring.cloud.nacos.config.ext-config[0].group=prod spring.cloud.nacos.config.ext-config[0].group=prod
#spring.cloud.nacos.config.ext-config[0].refresh=true 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].data-id=mybatis.yml
#spring.cloud.nacos.config.ext-config[1].group=prod spring.cloud.nacos.config.ext-config[1].group=prod
#spring.cloud.nacos.config.ext-config[1].refresh=true 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].data-id=other.yml
#spring.cloud.nacos.config.ext-config[2].group=prod spring.cloud.nacos.config.ext-config[2].group=prod
#spring.cloud.nacos.config.ext-config[2].refresh=true spring.cloud.nacos.config.ext-config[2].refresh=true
#
#spring.redis.host=127.0.0.1 spring.redis.host=127.0.0.1
#spring.redis.port=6379 spring.redis.port=6379
#spring.redis.password=dq123456 spring.redis.password=dq123456
#spring.redis.database=0 spring.redis.database=0
#spring.redis.timeout=30000 spring.redis.timeout=30000
#spring.redis.jedis.pool.max-active=8 spring.redis.jedis.pool.max-active=8
#spring.redis.jedis.pool.max-wait=-1 spring.redis.jedis.pool.max-wait=-1
#spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.max-idle=8
#spring.redis.jedis.pool.min-idle=0 spring.redis.jedis.pool.min-idle=0

@ -11,6 +11,18 @@
SELECT * SELECT *
FROM FROM
sys_action_log sys_action_log
<where>
<if test="sysLog.jobNumberOrName != null and sysLog.jobNumberOrName != ''">
AND user_name LIKE CONCAT('%',#{sysLog.jobNumberOrName},'%')
</if>
<if test="sysLog.startTime != null and sysLog.startTime != '' ">
AND create_time &gt;= #{sysLog.startTime}
</if>
<if test="sysLog.endTime != null and sysLog.endTime != '' ">
AND create_time &lt;= #{sysLog.endTime}
</if>
</where>
order by create_time desc limit 1000
</select> </select>
</mapper> </mapper>

@ -39,12 +39,12 @@
<artifactId>ooxml-schemas</artifactId> <artifactId>ooxml-schemas</artifactId>
<version>1.0</version> <version>1.0</version>
</dependency> </dependency>
<!-- <dependency> <dependency>
<groupId>com.daqing.financial</groupId> <groupId>com.daqing.financial</groupId>
<artifactId>dq-financial-hrms-auth</artifactId> <artifactId>dq-financial-hrms-auth</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency>--> </dependency>
<!-- <dependency> <!-- <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId> <artifactId>spring-security-core</artifactId>

@ -1,11 +1,13 @@
package com.daqing.financial.hrms; package com.daqing.financial.hrms;
import com.daqing.financial.hrauth.config.SecurityConfig;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.ComponentScans; import org.springframework.context.annotation.ComponentScans;
import org.springframework.context.annotation.Import;
import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.EnableScheduling;
@EnableFeignClients(basePackages = "com.daqing.financial.hrms.feign") @EnableFeignClients(basePackages = "com.daqing.financial.hrms.feign")
@ -13,6 +15,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
@SpringBootApplication @SpringBootApplication
@ComponentScan(basePackages = "com.daqing") @ComponentScan(basePackages = "com.daqing")
@EnableScheduling @EnableScheduling
@Import({SecurityConfig.class})
public class DqFinancialHrmsApplication { public class DqFinancialHrmsApplication {
public static void main(String[] args) { public static void main(String[] args) {

@ -1,13 +1,13 @@
package com.daqing.financial.hrms.config; //package com.daqing.financial.hrms.config;
//
import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; //import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
import org.springframework.context.annotation.Bean; //import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; //import org.springframework.context.annotation.Configuration;
//
@Configuration //@Configuration
public class IPageConfig { //public class IPageConfig {
@Bean // @Bean
public PaginationInterceptor paginationInterceptor() { // public PaginationInterceptor paginationInterceptor() {
return new PaginationInterceptor(); // return new PaginationInterceptor();
} // }
} //}

@ -1,6 +1,9 @@
package com.daqing.financial.hrms.controller; package com.daqing.financial.hrms.controller;
import com.daqing.financial.hrauth.annotation.Log;
import com.daqing.financial.hrauth.enums.OperationType;
import com.daqing.financial.hrauth.enums.OperationUnit;
import com.daqing.financial.hrms.EmployeeControllerApi; import com.daqing.financial.hrms.EmployeeControllerApi;
import com.daqing.financial.hrms.service.EmployeeService; import com.daqing.financial.hrms.service.EmployeeService;
import com.daqing.framework.domain.crms.request.EmployeeDisableRequest; import com.daqing.framework.domain.crms.request.EmployeeDisableRequest;
@ -41,7 +44,7 @@ public class EmployeeController implements EmployeeControllerApi {
private EmployeeService employeeService; private EmployeeService employeeService;
@GetMapping("/list") @GetMapping("/list")
//@Log(detail = "员工列表",level = 3,operationUnit = OperationUnit.ROLE,operationType = OperationType.INSERT) @Log(detail = "员工列表",level = 3,operationUnit = OperationUnit.EMPLOYEE,operationType = OperationType.SELECT)
//@RequiresPermissions("hrms:employee:info") //@RequiresPermissions("hrms:employee:info")
public ResponseResult list(@RequestParam("page") Integer page, public ResponseResult list(@RequestParam("page") Integer page,
@RequestParam("size") Integer size, @RequestParam("size") Integer size,
@ -53,6 +56,7 @@ public class EmployeeController implements EmployeeControllerApi {
/** /**
* 详情 * 详情
*/ */
@Log(detail = "员工详情",level = 4,operationUnit = OperationUnit.EMPLOYEE,operationType = OperationType.SELECT)
@GetMapping("/info") @GetMapping("/info")
//@RequiresPermissions("hrms:employee:info") //@RequiresPermissions("hrms:employee:info")
public ResponseResult info(@RequestParam("id") Long id) { public ResponseResult info(@RequestParam("id") Long id) {
@ -65,6 +69,7 @@ public class EmployeeController implements EmployeeControllerApi {
/** /**
* 权限树 * 权限树
*/ */
@Log(detail = "员工权限树",level = 4,operationUnit = OperationUnit.EMPLOYEE,operationType = OperationType.SELECT)
@Override @Override
@PostMapping("/tree") @PostMapping("/tree")
public ResponseResult tree(@RequestBody List<Long> ids) { public ResponseResult tree(@RequestBody List<Long> ids) {
@ -77,6 +82,7 @@ public class EmployeeController implements EmployeeControllerApi {
*/ */
@Override @Override
@PostMapping("/update") @PostMapping("/update")
@Log(detail = "修改员工信息",level = 4,operationUnit = OperationUnit.EMPLOYEE,operationType = OperationType.UPDATE)
public ResponseResult update(@RequestBody @Valid EmployeeInfoVO employeeInfoVO) { public ResponseResult update(@RequestBody @Valid EmployeeInfoVO employeeInfoVO) {
Boolean result = employeeService.update(employeeInfoVO); Boolean result = employeeService.update(employeeInfoVO);
@ -88,6 +94,7 @@ public class EmployeeController implements EmployeeControllerApi {
* 保存 * 保存
*/ */
@PostMapping("/save") @PostMapping("/save")
@Log(detail = "保存员工信息",level = 4,operationUnit = OperationUnit.EMPLOYEE,operationType = OperationType.INSERT)
//@RequiresPermissions("hrms:employee:save") //@RequiresPermissions("hrms:employee:save")
public ResponseResult save(@RequestBody @Valid EmployeeInfoVO employeeInfoVO) { public ResponseResult save(@RequestBody @Valid EmployeeInfoVO employeeInfoVO) {
@ -99,6 +106,7 @@ public class EmployeeController implements EmployeeControllerApi {
/** /**
* 导出 * 导出
*/ */
@Log(detail = "导出员工信息",level = 4,operationUnit = OperationUnit.EMPLOYEE,operationType = OperationType.SELECT)
@GetMapping("/excelExport") @GetMapping("/excelExport")
@Override @Override
public ResponseResult excelExport(HttpServletResponse response) { public ResponseResult excelExport(HttpServletResponse response) {
@ -111,6 +119,7 @@ public class EmployeeController implements EmployeeControllerApi {
/** /**
* 导出模板 * 导出模板
*/ */
@Log(detail = "导出模板",level = 4,operationUnit = OperationUnit.EMPLOYEE,operationType = OperationType.SELECT)
@GetMapping("/excelTemplate") @GetMapping("/excelTemplate")
@Override @Override
public ResponseResult excelTemplate(HttpServletResponse response) { public ResponseResult excelTemplate(HttpServletResponse response) {
@ -123,6 +132,7 @@ public class EmployeeController implements EmployeeControllerApi {
/** /**
* 导入 * 导入
*/ */
@Log(detail = "导入员工信息",level = 4,operationUnit = OperationUnit.EMPLOYEE,operationType = OperationType.INSERT)
@PostMapping("/excelImport") @PostMapping("/excelImport")
@Override @Override
public ResponseResult excelImport(MultipartFile file) { public ResponseResult excelImport(MultipartFile file) {
@ -135,6 +145,7 @@ public class EmployeeController implements EmployeeControllerApi {
/** /**
* 删除 * 删除
*/ */
@Log(detail = "删除员工信息",level = 4,operationUnit = OperationUnit.EMPLOYEE,operationType = OperationType.DELETE)
@DeleteMapping("/delete") @DeleteMapping("/delete")
//@RequiresPermissions("hrms:employee:delete") //@RequiresPermissions("hrms:employee:delete")
public ResponseResult delete(@RequestBody List<Long> ids) { public ResponseResult delete(@RequestBody List<Long> ids) {
@ -146,6 +157,7 @@ public class EmployeeController implements EmployeeControllerApi {
/** /**
* 启用 * 启用
*/ */
@Log(detail = "启用",level = 4,operationUnit = OperationUnit.EMPLOYEE,operationType = OperationType.UPDATE)
@Override @Override
@GetMapping("/start") @GetMapping("/start")
public ResponseResult start(@RequestParam("id") Long id) { public ResponseResult start(@RequestParam("id") Long id) {
@ -158,6 +170,7 @@ public class EmployeeController implements EmployeeControllerApi {
/** /**
* 禁用 * 禁用
*/ */
@Log(detail = "禁用",level = 4,operationUnit = OperationUnit.EMPLOYEE,operationType = OperationType.UPDATE)
@Override @Override
@PostMapping("/stop") @PostMapping("/stop")
public ResponseResult stop(@RequestBody @Valid EmployeeDisableRequest employeeDisableRequest) { public ResponseResult stop(@RequestBody @Valid EmployeeDisableRequest employeeDisableRequest) {
@ -170,6 +183,7 @@ public class EmployeeController implements EmployeeControllerApi {
/** /**
* 禁用详情 * 禁用详情
*/ */
@Log(detail = "禁用详情",level = 4,operationUnit = OperationUnit.EMPLOYEE,operationType = OperationType.SELECT)
@GetMapping("/forbidInfo") @GetMapping("/forbidInfo")
@Override @Override
public ResponseResult forbidInfo(@RequestParam("id") Long id) { public ResponseResult forbidInfo(@RequestParam("id") Long id) {
@ -182,6 +196,7 @@ public class EmployeeController implements EmployeeControllerApi {
/** /**
* 重置密码 * 重置密码
*/ */
@Log(detail = "重置密码",level = 4,operationUnit = OperationUnit.EMPLOYEE,operationType = OperationType.SELECT)
@Override @Override
@GetMapping("/reset") @GetMapping("/reset")
public ResponseResult reset(@RequestParam("id") Long id) { public ResponseResult reset(@RequestParam("id") Long id) {
@ -289,4 +304,15 @@ public class EmployeeController implements EmployeeControllerApi {
public String getDepartmentIds(Integer userId) { public String getDepartmentIds(Integer userId) {
return employeeService.getDeptIds(userId); return employeeService.getDeptIds(userId);
} }
/**
* 根据id查询员工姓名和工号
*
* @param id
* @return
*/
@GetMapping("/getEmpmsgById")
public EmployeeEntity getEmpmsgById(@RequestParam("id") Long id) {
return employeeService.getEmpmsgById(id);
}
} }

@ -115,4 +115,6 @@ public interface EmployeeDao extends BaseMapper<EmployeeEntity> {
int selectUserRole(@Param("userId") Long userId, @Param("roleId") Long roleId); int selectUserRole(@Param("userId") Long userId, @Param("roleId") Long roleId);
Boolean deleteRoleByUserId(@Param("ids") List<Long> ids); Boolean deleteRoleByUserId(@Param("ids") List<Long> ids);
EmployeeEntity getEmpmsgById(Long id);
} }

@ -77,5 +77,8 @@ public interface EmployeeService extends IService<EmployeeEntity> {
int selectUserRole(Long userId, Long roleId); int selectUserRole(Long userId, Long roleId);
String getDeptIds(Integer userId); String getDeptIds(Integer userId);
EmployeeEntity getEmpmsgById(Long id);
} }

@ -714,4 +714,12 @@ public class EmployeeServiceImpl extends ServiceImpl<EmployeeDao, EmployeeEntity
} }
return ids; return ids;
} }
/**
* 根据id查询员工的姓名
*/
@Override
public EmployeeEntity getEmpmsgById(Long id) {
return this.getBaseMapper().getEmpmsgById(id);
}
} }

@ -1,27 +1,27 @@
#服务名称 #服务名称
spring.application.name=dq-financial-hrms #spring.application.name=dq-financial-hrms
#配置中心地址 ##配置中心地址
spring.cloud.nacos.config.server-addr=192.168.31.140:8848 #spring.cloud.nacos.config.server-addr=192.168.31.140:8848
spring.cloud.nacos.config.file-extension=yml #spring.cloud.nacos.config.file-extension=yml
#redis配置 ##redis配置
spring.redis.host=127.0.0.1 #spring.redis.host=127.0.0.1
spring.redis.port=6379 #spring.redis.port=6379
spring.redis.password= #spring.redis.password=
spring.redis.database=0 #spring.redis.database=0
spring.redis.timeout=30000 #spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8 #spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1 #spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=8 #spring.redis.jedis.pool.max-idle=8
spring.redis.jedis.pool.min-idle=0 #spring.redis.jedis.pool.min-idle=0
#
#本地测试环境 ##本地测试环境
#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
#线上测试环境 #线上测试环境
#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
#线上生产环境 #线上生产环境
spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406 #spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406
#请求处理的超时时间 #请求处理的超时时间
ribbon.ReadTimeout: 120000 ribbon.ReadTimeout: 120000
@ -33,30 +33,30 @@ spring.servlet.multipart.max-request-size=10MB
# 正式环境(prod) # 正式环境(prod)
#服务名称 #服务名称
#spring.application.name=dq-financial-hrms spring.application.name=dq-financial-hrms
##配置中心地址 #配置中心地址
#spring.cloud.nacos.config.server-addr=120.78.127.12:8848 spring.cloud.nacos.config.server-addr=120.78.127.12:8848
#spring.cloud.nacos.config.namespace=69614b55-1521-421c-ac58-dbe4a5b01b43 spring.cloud.nacos.config.namespace=69614b55-1521-421c-ac58-dbe4a5b01b43
##spring.cloud.nacos.config.group=prod #spring.cloud.nacos.config.group=prod
#
#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
#spring.cloud.nacos.config.ext-config[0].group=prod spring.cloud.nacos.config.ext-config[0].group=prod
#spring.cloud.nacos.config.ext-config[0].refresh=true 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].data-id=mybatis.yml
#spring.cloud.nacos.config.ext-config[1].group=prod spring.cloud.nacos.config.ext-config[1].group=prod
#spring.cloud.nacos.config.ext-config[1].refresh=true 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].data-id=other.yml
#spring.cloud.nacos.config.ext-config[2].group=prod spring.cloud.nacos.config.ext-config[2].group=prod
#spring.cloud.nacos.config.ext-config[2].refresh=true spring.cloud.nacos.config.ext-config[2].refresh=true
#
#spring.redis.host=127.0.0.1 spring.redis.host=127.0.0.1
#spring.redis.port=6379 spring.redis.port=6379
#spring.redis.password=dq123456 spring.redis.password=dq123456
#spring.redis.database=0 spring.redis.database=0
#spring.redis.timeout=30000 spring.redis.timeout=30000
#spring.redis.jedis.pool.max-active=8 spring.redis.jedis.pool.max-active=8
#spring.redis.jedis.pool.max-wait=-1 spring.redis.jedis.pool.max-wait=-1
#spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.max-idle=8
#spring.redis.jedis.pool.min-idle=0 spring.redis.jedis.pool.min-idle=0

@ -634,4 +634,14 @@
</foreach> </foreach>
</delete> </delete>
<!-- 根据id查询员工姓名 -->
<select id="getEmpmsgById" parameterType="long" resultType="com.daqing.framework.domain.hrms.EmployeeEntity">
SELECT e.name,e.job_number
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}
</select>
</mapper> </mapper>

@ -32,17 +32,17 @@ public class PromptSuccess {
public static final String UPLOAD_FILE_PATH = "//usr//local//nginx//html//admin//headImg//"; // linux图片存放路径 public static final String UPLOAD_FILE_PATH = "//usr//local//nginx//html//admin//headImg//"; // linux图片存放路径
//public static final String IMAGE_URL_PATH = "https://www.huorantech.cn/headImg/"; // 数据库/预加载图片路径 public static final String IMAGE_URL_PATH = "https://www.huorantech.cn/headImg/"; // 数据库/预加载图片路径
//public static final String IMAGE_URL_PATH = "http://8.129.127.185/headImg/"; // 数据库/预加载图片路径 //public static final String IMAGE_URL_PATH = "http://8.129.127.185/headImg/"; // 数据库/预加载图片路径
public static final String IMAGE_URL_PATH = "https://www.feifanhitech.com/headImg/"; // 数据库/预加载图片路径 // public static final String IMAGE_URL_PATH = "https://www.feifanhitech.com/headImg/"; // 数据库/预加载图片路径
public static final String[] LETTERS = {"A","B","C","D","E"}; // 员工姓名重复时自动加的字母,可再添加 public static final String[] LETTERS = {"A","B","C","D","E"}; // 员工姓名重复时自动加的字母,可再添加
public static final String STATUS_REFUSE = "拒绝"; public static final String STATUS_REFUSE = "拒绝";
//public static final String ENCLOSUREFILE_URL_PATH = "https://www.huorantech.cn/enclosureFile/"; // 附件文件存放路径 public static final String ENCLOSUREFILE_URL_PATH = "https://www.huorantech.cn/enclosureFile/"; // 附件文件存放路径
//public static final String ENCLOSUREFILE_URL_PATH = "http://8.129.127.185/enclosureFile/"; // 附件文件存放路径 //public static final String ENCLOSUREFILE_URL_PATH = "http://8.129.127.185/enclosureFile/"; // 附件文件存放路径
public static final String ENCLOSUREFILE_URL_PATH = "https://www.feifanhitech.com/enclosureFile/"; // 附件文件存放路径 // public static final String ENCLOSUREFILE_URL_PATH = "https://www.feifanhitech.com/enclosureFile/"; // 附件文件存放路径
public static final String FILE_URL_PATH = "//usr//local//nginx//html//admin//enclosureFile//"; // 附件文件存放路径 public static final String FILE_URL_PATH = "//usr//local//nginx//html//admin//enclosureFile//"; // 附件文件存放路径

@ -99,4 +99,7 @@ public class SystemLog {
*/ */
@ApiModelProperty("外网IP地址") @ApiModelProperty("外网IP地址")
private String ipAddressWan; private String ipAddressWan;
@ApiModelProperty("工号")
private String jobNumber;
} }

@ -1,48 +1,48 @@
#服务名称 #服务名称
spring.application.name=dq-govern-gateway #spring.application.name=dq-govern-gateway
#配置中心地址 ##配置中心地址
spring.cloud.nacos.config.server-addr=192.168.31.140:8848 #spring.cloud.nacos.config.server-addr=192.168.31.140:8848
spring.cloud.nacos.config.file-extension=yml #spring.cloud.nacos.config.file-extension=yml
#redis配置 ##redis配置
spring.redis.host=127.0.0.1 #spring.redis.host=127.0.0.1
spring.redis.port=6379 #spring.redis.port=6379
spring.redis.password= #spring.redis.password=
spring.redis.database=0 #spring.redis.database=0
spring.redis.timeout=30000 #spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8 #spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1 #spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=8 #spring.redis.jedis.pool.max-idle=8
spring.redis.jedis.pool.min-idle=0 #spring.redis.jedis.pool.min-idle=0
#
#本地测试环境 ##本地测试环境
#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99
#线上测试环境 #线上测试环境
#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128
#线上生产环境 #线上生产环境
spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406 #spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406
spring.servlet.multipart.max-file-size=10MB spring.servlet.multipart.max-file-size=10MB
spring.servlet.multipart.max-request-size=10MB spring.servlet.multipart.max-request-size=10MB
# 正式环境(prod) # 正式环境(prod)
#服务名称 #服务名称
#spring.application.name=dq-govern-gateway spring.application.name=dq-govern-gateway
##配置中心地址 #配置中心地址
#spring.cloud.nacos.config.server-addr=120.78.127.12:8848 spring.cloud.nacos.config.server-addr=120.78.127.12:8848
#spring.cloud.nacos.config.namespace=68738215-903f-426c-8658-2dcd99b20009 spring.cloud.nacos.config.namespace=68738215-903f-426c-8658-2dcd99b20009
#
#spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml
#spring.cloud.nacos.config.ext-config[0].group=prod spring.cloud.nacos.config.ext-config[0].group=prod
#spring.cloud.nacos.config.ext-config[0].refresh=true spring.cloud.nacos.config.ext-config[0].refresh=true
#
#spring.redis.host=127.0.0.1 spring.redis.host=127.0.0.1
#spring.redis.port=6379 spring.redis.port=6379
#spring.redis.password=dq123456 spring.redis.password=dq123456
#spring.redis.database=0 spring.redis.database=0
#spring.redis.timeout=30000 spring.redis.timeout=30000
#spring.redis.jedis.pool.max-active=8 spring.redis.jedis.pool.max-active=8
#spring.redis.jedis.pool.max-wait=-1 spring.redis.jedis.pool.max-wait=-1
#spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.max-idle=8
#spring.redis.jedis.pool.min-idle=0 spring.redis.jedis.pool.min-idle=0
Loading…
Cancel
Save