1.考勤和年假添加日志

zs-manager/src/main/java/com/ruoyi/zhushi/controller/DkAttendanceGroupController.java

@@ -1,10 +1,12 @@
 package com.ruoyi.zhushi.controller;
 
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.zhushi.entity.AppDTO;
 import com.ruoyi.zhushi.entity.DkAttendanceGroupDTO;
 import com.ruoyi.zhushi.entity.DkCheckInConfigDTO;
@@ -41,18 +43,21 @@ public class DkAttendanceGroupController extends BaseController {
 
     // 新增打卡配置
     @PostMapping("/add")
+    @Log(title = "考勤组", businessType = BusinessType.INSERT)
     public R<String> addOrUpdate(@RequestBody DkAttendanceGroupDTO dkAttendanceGroupDTO) {
         return R.ok(dkAttendanceGroupService.addOrUpdate(dkAttendanceGroupDTO));
     }
 
     // 删除打卡配置
     @DeleteMapping("/del/{id}")
+    @Log(title = "考勤组", businessType = BusinessType.DELETE)
     public R<Void> del(@PathVariable Long id) {
         return toAjax(dkAttendanceGroupService.del(id));
     }
 
     // 删除用户配置
     @DeleteMapping("/delUser/{id}")
+    @Log(title = "考勤组-用户", businessType = BusinessType.DELETE)
     public R<Void> delUser(@PathVariable long id) {
         return toAjax(dkAttendanceGroupService.deleteConfig(id));
     }

zs-manager/src/main/java/com/ruoyi/zhushi/controller/DkConfigController.java

@@ -1,9 +1,11 @@
 package com.ruoyi.zhushi.controller;
 
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.zhushi.entity.DkCheckInConfigDTO;
 import com.ruoyi.zhushi.service.DkConfigService;
 import lombok.RequiredArgsConstructor;
@@ -37,6 +39,7 @@ public class DkConfigController extends BaseController {
 
     // 新增
     @PostMapping("/add")
+    @Log(title = "打卡设置", businessType = BusinessType.INSERT)
     public R<Void> add(@Validated(AddGroup.class) @RequestBody DkCheckInConfigDTO dkCheckInConfigDTO) {
         return toAjax(dkConfigService.addConfig(dkCheckInConfigDTO));
     }
@@ -44,12 +47,14 @@ public class DkConfigController extends BaseController {
 
     // 删除
     @DeleteMapping("/deleteConfig/{id}")
+    @Log(title = "打卡设置", businessType = BusinessType.DELETE)
     public R<Integer> remove(@PathVariable Long id) {
         return R.ok(dkConfigService.deleteConfig(id));
     }
 
     // 修改
     @PutMapping("/updateConfig")
+    @Log(title = "打卡设置", businessType = BusinessType.UPDATE)
     public R<Void> edit(@RequestBody DkCheckInConfigDTO bo) {
         return toAjax(dkConfigService.updateConfig(bo));
     }

zs-manager/src/main/java/com/ruoyi/zhushi/controller/DkRecordController.java

@@ -1,9 +1,11 @@
 package com.ruoyi.zhushi.controller;
 
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.zhushi.entity.DkCheckInRecordDTO;
 import com.ruoyi.zhushi.service.DkRecordService;
@@ -42,6 +44,7 @@ public class DkRecordController extends BaseController {
      * 导出结果列表
      */
     @PostMapping("/exportNew")
+    @Log(title = "考勤记录", businessType = BusinessType.EXPORT)
     public void exportNew(DkCheckInRecordDTO bo, HttpServletResponse response) {
         dkRecordService.exportNew(bo, response);
     }
@@ -50,6 +53,7 @@ public class DkRecordController extends BaseController {
      * 修改打卡记录信息
      */
     @PutMapping()
+    @Log(title = "考勤记录", businessType = BusinessType.UPDATE)
     public  R<Integer> updateDkRecord(@RequestBody DkCheckInRecordDTO bo) {
        return  R.ok(dkRecordService.updateDkRecord(bo));
     }

zs-manager/src/main/java/com/ruoyi/zhushi/controller/NjBalanceManageController.java

@@ -1,9 +1,11 @@
 package com.ruoyi.zhushi.controller;
 
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.zhushi.entity.*;
 import com.ruoyi.zhushi.service.NjBalanceManageService;
 import lombok.RequiredArgsConstructor;
@@ -49,6 +51,7 @@ public class NjBalanceManageController extends BaseController {
 
     // 手动更新年假数据
     @PutMapping("/update")
+    @Log(title = "年假手动更新", businessType = BusinessType.UPDATE)
     public R<Integer> update(@RequestBody NjBalanceManageDTO njBalanceManageDTO){
         return R.ok(njBalanceManageService.update(njBalanceManageDTO));
     }

zs-manager/src/main/java/com/ruoyi/zhushi/controller/NjBalanceManageDetailController.java

@@ -44,6 +44,7 @@ public class NjBalanceManageDetailController extends BaseController {
 
     // 年假申请
     @PostMapping("/apply")
+    @Log(title = "年假余额申请", businessType = BusinessType.UPDATE)
     public R<Void> insert(@Validated(AddGroup.class) @RequestBody NjBalanceManageDetailDTO njBalanceManageDetailDTO) {
         return toAjax(njBalanceManageDetailService.insert(njBalanceManageDetailDTO));
     }
@@ -62,6 +63,7 @@ public class NjBalanceManageDetailController extends BaseController {
      * @param ids 主键串
      */
     @DeleteMapping("/{ids}")
+    @Log(title = "年假余额申请撤销", businessType = BusinessType.UPDATE)
     public R<Void> cancelByIds(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
         return toAjax(njBalanceManageDetailService.cancelByIds(Arrays.asList(ids)));

zs-manager/src/main/java/com/ruoyi/zhushi/controller/NjRuleConfigController.java

@@ -1,9 +1,11 @@
 package com.ruoyi.zhushi.controller;
 
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.zhushi.entity.NjRuleConfigDTO;
 import com.ruoyi.zhushi.service.NjRuleConfigService;
 import lombok.RequiredArgsConstructor;
@@ -43,6 +45,7 @@ public class NjRuleConfigController extends BaseController {
      * @return
      */
     @PostMapping("/addRuleConfig")
+    @Log(title = "年假规则", businessType = BusinessType.UPDATE)
     public R<Boolean> addRule(@RequestBody NjRuleConfigDTO njRuleConfigDTO) {
         return R.ok(njRuleConfigService.addRule(njRuleConfigDTO));
     }
@@ -53,6 +56,7 @@ public class NjRuleConfigController extends BaseController {
      * @return
      */
     @GetMapping("/delRule")
+    @Log(title = "年假规则", businessType = BusinessType.DELETE)
     public R<Integer> delRule(@RequestParam("id") long id) {
         return R.ok(njRuleConfigService.delRule(id));
     }
@@ -63,6 +67,7 @@ public class NjRuleConfigController extends BaseController {
      * @return
      */
     @DeleteMapping("/delUser/{id}")
+    @Log(title = "年假规则关联用户", businessType = BusinessType.DELETE)
     public R<Void> delUser(@PathVariable Long id) {
         return toAjax(njRuleConfigService.delUser(id));
     }