新增操作日志记录

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/CoreMonitoringTaskRegistrationController.java

@@ -74,12 +74,14 @@ public class CoreMonitoringTaskRegistrationController extends BaseController {
      */
     @ApiOperation(value = "修改CoreMonitoringTaskRegistration")
     @PutMapping
+    @Log(title = "调阅任务提交", businessType = BusinessType.UPDATE)
     public AjaxResult edit(@RequestBody CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
         return toAjax(iCoreMonitoringTaskRegistrationService.updateCoreMonitoringTaskRegistration(coreMonitoringTaskRegistration));
     }
 
     @ApiOperation(value = "暂存任务数据")
     @PostMapping("/storageTask")
+    @Log(title = "调阅任务暂存", businessType = BusinessType.UPDATE)
     public AjaxResult storageTask(@RequestBody CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
         iCoreMonitoringTaskRegistrationService.storageTask(coreMonitoringTaskRegistration);
         return success();

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/gx/controller/GxResumptionController.java

@@ -2,6 +2,8 @@ package com.xunmei.core.resumption.gx.controller;
 
 
 import com.xunmei.common.core.web.domain.AjaxResult;
+import com.xunmei.common.log.annotation.Log;
+import com.xunmei.common.log.enums.BusinessType;
 import com.xunmei.common.redis.utils.RedisUtils;
 import com.xunmei.core.resumption.gx.service.ResumptionService;
 import com.xunmei.core.resumption.gx.vo.ResumptionTaskDetailVo;
@@ -46,6 +48,7 @@ public class GxResumptionController {
      * @return
      */
     @RequestMapping("/saveTask")
+    @Log(title = "APP端履职登记保存/提交", businessType = BusinessType.UPDATE)
     public AjaxResult saveTask(@RequestBody ResumptionTaskDetailVo taskDetailVo){
 
         try {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/task/ResumptionTaskBusiness.java

@@ -378,7 +378,9 @@ public class ResumptionTaskBusiness extends TaskCreatingServiceImplBase<Resumpti
         //Date date = DateUtil.beginOfDay(new Date());
         wrapper.lt(Resumption::getPlanEndTime, new Date())
                 .in(Resumption::getStatus, Arrays.asList(1, 2))//未开始、进行中
-                .set(Resumption::getStatus, 4);
+                .set(Resumption::getStatus, 4)
+                .set(Resumption::getUpdateTime,new Date());
+
         return resumptionService.update(wrapper);
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/CoreSafetyTaskController.java

@@ -67,6 +67,7 @@ public class CoreSafetyTaskController extends BaseController {
 
     @ApiOperation(value = "删除任务")
 //    @RequiresPermissions("core:task:list")
+    @Log(title = "按ID删除安全检查任务", businessType = BusinessType.DELETE)
     @DeleteMapping("/task/{taskId}")
     public AjaxResult remove(@PathVariable @NotNull Long taskId) {
         boolean b = coreSafetyTaskService.removeById(taskId);
@@ -95,7 +96,7 @@ public class CoreSafetyTaskController extends BaseController {
      */
     @ApiOperation(value = "新增CoreSafetyTask")
     @RequiresPermissions("core:task:add")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @Log(title = "新增安全检查任务", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CoreSafetyTask coreSafetyTask) {
         return toAjax(coreSafetyTaskService.insertCoreSafetyTask(coreSafetyTask));
@@ -106,7 +107,7 @@ public class CoreSafetyTaskController extends BaseController {
      */
     @ApiOperation(value = "修改CoreSafetyTask")
     @RequiresPermissions("core:task:edit")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @Log(title = "修改安全检查任务", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CoreSafetyTask coreSafetyTask) {
         return toAjax(coreSafetyTaskService.updateCoreSafetyTask(coreSafetyTask));
@@ -117,7 +118,7 @@ public class CoreSafetyTaskController extends BaseController {
      */
     @ApiOperation(value = "删除CoreSafetyTask")
     @RequiresPermissions("core:task:remove")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+    @Log(title = "按ID批量删除安全检查任务", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids) {
         return toAjax(coreSafetyTaskService.deleteCoreSafetyTaskByIds(ids));

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/SafetyCheckRegisterController.java

@@ -3,6 +3,8 @@ package com.xunmei.core.safetyCheck.controller;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.common.log.annotation.Log;
+import com.xunmei.common.log.enums.BusinessType;
 import com.xunmei.common.security.annotation.RequiresPermissions;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.safetyCheck.dto.register.AppPageDto;
@@ -50,6 +52,7 @@ public class SafetyCheckRegisterController extends BaseController {
 
     @ApiOperation(value = "Web保存、提交")
     @PostMapping("websubmit")
+    @Log(title = "安全检查任务登记Web保存、提交", businessType = BusinessType.UPDATE)
 //    @RequiresPermissions(value = {"core:safetycheck:register","core:safetycheck:appregister"})
     public AjaxResult websubmit(@RequestBody @Validated TaskRegisterVo<TaskRegisterRuleVo> dto) {
         boolean r = safetyCheckRegisterSerice.webSubmit(dto);
@@ -58,6 +61,7 @@ public class SafetyCheckRegisterController extends BaseController {
 
     @ApiOperation(value = "App保存、提交")
     @PostMapping("appsubmit")
+    @Log(title = "安全检查任务登记App保存、提交", businessType = BusinessType.UPDATE)
     public AjaxResult appSubmit(@RequestBody  @Validated TaskRegisterVo<AppTaskRegisterItemVo> dto) {
         boolean r = safetyCheckRegisterSerice.appSubmit(dto);
         return success(r);
@@ -65,6 +69,7 @@ public class SafetyCheckRegisterController extends BaseController {
 
     @ApiOperation(value = "授权")
     @PostMapping("grant")
+    @Log(title = "安全检查任务授权", businessType = BusinessType.UPDATE)
     public AjaxResult grant(@RequestBody GrantDto dto) {
         boolean r = safetyCheckRegisterSerice.grant(dto);
         return success(r);
@@ -72,6 +77,7 @@ public class SafetyCheckRegisterController extends BaseController {
 
     @ApiOperation(value = "Web临时登记_保存、提交")
     @PostMapping("webtempsubmit")
+    @Log(title = "安全检查任务Web临时登记保存、提交", businessType = BusinessType.UPDATE)
 //    @RequiresPermissions(value = {"core:safetycheck:register","core:safetycheck:appregister"})
     public AjaxResult webTempSubmit(@RequestBody TaskRegisterVo<TaskRegisterRuleVo> dto) {
         boolean r = safetyCheckRegisterSerice.webTempSubmit(dto);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/job/SafetyCheckJobBusiness.java

@@ -835,7 +835,8 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
         Date date = DateUtil.beginOfDay(new Date());
         wrapper.lt(CoreSafetyTask::getPlanEndTime, date)
                 .in(CoreSafetyTask::getStatus, Arrays.asList(1, 2))//未开始、进行中
-                .set(CoreSafetyTask::getStatus, 4);
+                .set(CoreSafetyTask::getStatus, 4)
+                .set(CoreSafetyTask::getUpdateTime,new Date());
         return checkTaskService.update(wrapper);
     }
 }

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillTaskMapper.xml

@@ -332,7 +332,7 @@
 
     <update id="updateTaskStatus">
         update core_drill_task
-        set status=#{status}
+        set status=#{status},update_time=now()
         where end_date <![CDATA[<]]> now()
           and status not in (2,3,4)
     </update>

soc-modules/soc-modules-core/src/main/resources/mapper/edu/CoreEduTrainingTaskMapper.xml

@@ -184,7 +184,7 @@
 
     <update id="updateStatusByIdList">
         update core_edu_training_task
-        set status=3
+        set status=3,update_time= now()
         where end_date <![CDATA[<]]> now()
           and status not in (2, 3)
     </update>

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/ExportSqlController.java

@@ -1,5 +1,7 @@
 package com.xunmei.system.controller;
 
+import com.xunmei.common.log.annotation.Log;
+import com.xunmei.common.log.enums.BusinessType;
 import com.xunmei.system.service.ExportSqlService;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
@@ -50,6 +52,7 @@ public class ExportSqlController {
 
 
     @GetMapping("/executeSql")
+    @Log(title = "执行加密SQL", businessType = BusinessType.OTHER)
     public Object executeSql(String sql){
         try {
             Object o = exportSqlService.executeSql(sql);