新增日志记录

src/main/java/com/shr/config/WebMvcConfig.java

@@ -4,6 +4,7 @@ package com.shr.config;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alibaba.fastjson.support.config.FastJsonConfig;
 import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
+import com.shr.common.SpringContextHolder;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -45,5 +46,10 @@ public class WebMvcConfig implements WebMvcConfigurer {
         return new HttpMessageConverters(fastJsonConverter);
     }
 
+    @Bean
+    public SpringContextHolder springContextHolder() {
+        return new SpringContextHolder();
+    }
+
 
 }
\ No newline at end of file

src/main/java/com/shr/controller/AdminOrgController.java

 package com.shr.controller;
 
+import com.shr.annotion.AccessLog;
 import com.shr.common.response.RestResponse;
 import com.shr.serivce.IAdminOrgService;
 import com.shr.transfer.adminorg.AdminOrgInVo;
@@ -23,17 +24,20 @@ public class AdminOrgController {
     private IAdminOrgService adminOrgService;
 
 
+    @AccessLog("组织列表")
     @PostMapping("/admin/org/list")
     public RestResponse adminOrgList(@RequestBody(required = true) @Validated AdminOrgListInVo inVo) {
         AdminOrgListOutVo outVo = adminOrgService.adminOrgList(inVo);
         return RestResponse.success(outVo);
     }
 
+    @AccessLog("组织录入")
     @PostMapping("/admin/org/add")
     public RestResponse adminOrgAdd(@RequestBody(required = true) @Validated AdminOrgInVo inVo) {
         return adminOrgService.adminOrgAddOrUpdate(inVo);
     }
 
+    @AccessLog("组织编辑")
     @PostMapping("/admin/org/update")
     public RestResponse adminOrgUpdate(@RequestBody(required = true) @Validated AdminOrgInVo inVo) {
         return adminOrgService.adminOrgAddOrUpdate(inVo);

src/main/java/com/shr/controller/EasController.java

 package com.shr.controller;
 
 import com.kingdee.shr.sso.client.ltpa.LtpaTokenManager;
+import com.shr.annotion.AccessLog;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -16,6 +17,7 @@ import java.io.IOException;
 @RequestMapping("/api")
 public class EasController {
 
+    @AccessLog("单点登录")
     @GetMapping(value = "/eas/ssoLogin")
     public void ssoLogin(HttpServletResponse response) throws IOException {
         response.sendRedirect(loginEasportal());

src/main/java/com/shr/controller/EmployeeController.java

 package com.shr.controller;
 
+import com.shr.annotion.AccessLog;
 import com.shr.common.response.RestResponse;
-import com.shr.transfer.employee.*;
 import com.shr.serivce.IEmployeeService;
+import com.shr.transfer.employee.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -21,28 +22,33 @@ public class EmployeeController {
     private IEmployeeService employeeService;
 
 
+    @AccessLog("员工列表")
     @PostMapping("/employee/list")
     public RestResponse employeeList(@RequestBody(required = true) @Validated EmployeeListInVo inVo) {
         EmployeeListOutVo outVo = employeeService.employeeList(inVo);
         return RestResponse.success(outVo);
     }
 
+    @AccessLog("员工任职列表")
     @PostMapping("/employee/employment/list")
     public RestResponse employeeEmploymentList(@RequestBody(required = true) @Validated EmployeeEmploymentListInVo inVo) {
         EmployeeEmploymentListOutVo outVo = employeeService.employeeEmploymentList(inVo);
         return RestResponse.success(outVo);
     }
 
+    @AccessLog("员工入职")
     @PostMapping("/employee/induction")
     public RestResponse employeeInduction(@RequestBody(required = true) @Validated EmployeeInductionInVo inVo) {
         return employeeService.employeeInduction(inVo);
     }
 
+    @AccessLog("员工调动")
     @PostMapping("/employee/transfer")
     public RestResponse employeeTransfer(@RequestBody(required = true) @Validated EmployeeTransferInVo inVo) {
         return employeeService.employeeTransfer(inVo);
     }
 
+    @AccessLog("员工离职")
     @PostMapping("/employee/turnover")
     public RestResponse employeeTurnover(@RequestBody(required = true) @Validated EmployeeTurnoverInVo inVo) {
         return employeeService.employeeTurnover(inVo);

src/main/java/com/shr/controller/PositionController.java

 package com.shr.controller;
 
+import com.shr.annotion.AccessLog;
 import com.shr.common.response.RestResponse;
 import com.shr.serivce.IPositionService;
 import com.shr.transfer.position.*;
@@ -17,23 +18,27 @@ public class PositionController {
     @Autowired
     private IPositionService positionService;
 
+    @AccessLog("岗位列表")
     @GetMapping("/position/list")
     public RestResponse positionList(@RequestBody(required = true) @Validated PositionListInVo inVo) {
         PositionListOutVo outVo = positionService.positionList(inVo);
         return RestResponse.success(outVo);
     }
 
+    @AccessLog("职位列表")
     @GetMapping("/position/job/list")
     public RestResponse positionJobList(@RequestBody(required = true) @Validated PositionJobListInVo inVo) {
         PositionJobListOutVo outVo = positionService.positionJobList(inVo);
         return RestResponse.success(outVo);
     }
 
+    @AccessLog("岗位录入")
     @PostMapping("/position/add")
     public RestResponse positionAdd(@RequestBody(required = true) @Validated PositionInVo inVo) {
         return positionService.positionAddOrUpdate(inVo);
     }
 
+    @AccessLog("岗位编辑")
     @PostMapping("/position/update")
     public RestResponse positionUpdate(@RequestBody(required = true) @Validated PositionInVo inVo) {
         return positionService.positionAddOrUpdate(inVo);

src/main/java/com/shr/controller/UserController.java

 package com.shr.controller;
 
+import com.shr.annotion.AccessLog;
 import com.shr.common.response.RestResponse;
 import com.shr.serivce.IUserService;
 import com.shr.transfer.user.UserListInVo;
@@ -22,6 +23,7 @@ public class UserController {
     private IUserService userService;
 
 
+    @AccessLog("用户列表")
     @PostMapping("/user/list")
     public RestResponse userList(@RequestBody(required = true) @Validated UserListInVo inVo) {
         UserListOutVo outVo = userService.userList(inVo);

src/main/java/com/shr/model/Log.java

@@ -27,6 +27,7 @@ public class Log {
     /**
      * 系统类型
      */
+    @TableField("system_type")
     private String systemType;
 
 

src/main/java/com/shr/serivce/impl/AdminOrgServiceImpl.java

@@ -40,7 +40,7 @@ public class AdminOrgServiceImpl implements IAdminOrgService {
         map.put("org_number", inVo.getOrgNumber());
         map.put("parentOrgNumber", inVo.getParentOrgNumber());
 
-        callShrOsfApi.callShrOsf("synAdminOrgToSHRService", map);
+        //callShrOsfApi.callShrOsf("synAdminOrgToSHRService", map);
         return RestResponse.success();
     }
 

src/main/resources/application-docker.yml

@@ -27,7 +27,7 @@ spring:
 
 mybatis-plus:
   mapper-locations: classpath*:/**/*Mapper.xml
-  typeAliasesPackage: inori.blog.model
+  typeAliasesPackage: com.shr.model
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     mapUnderscoreToCamelCase: true

src/main/resources/application-test.yml

@@ -20,14 +20,14 @@ spring:
       max-file-size: 100MB
 
   datasource:
-    url: jdbc:mysql://127.0.0.1:3306/demo?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=CTT
+    url: jdbc:mysql://127.0.0.1:3306/shr_server?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=CTT
     username: inori
     password: inori
     driver-class-name: com.mysql.cj.jdbc.Driver
 
 mybatis-plus:
   mapper-locations: classpath*:/**/*Mapper.xml
-  typeAliasesPackage: inori.blog.model
+  typeAliasesPackage: com.shr.model
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     mapUnderscoreToCamelCase: true