Просмотр исходного кода

日志完成:包括业务、任务、调试3中日志

soft5566 2 лет назад
Родитель
Сommit
13ef79a3aa

+ 16 - 0
src/main/java/com/template/api/SmartDataSourceLogControllerAPI.java

@@ -33,6 +33,22 @@ public interface SmartDataSourceLogControllerAPI {
                                               @RequestParam(required = false) String endTime,
                                               SmartDataSourceLog smartDataSourceLog);
 
+    @GetMapping(value = "/queryDistinctActionName")
+    @ApiOperation(value = "操作日志记录操作名称数据", notes = "操作日志记录操作名称数据", httpMethod = "GET")
+    CommonResult queryDistinctActionName();
+
+    @GetMapping(value = "/queryDistinctActionPeople")
+    @ApiOperation(value = "操作日志记录操作人数据", notes = "操作日志记录操作人数据", httpMethod = "GET")
+    CommonResult queryDistinctActionPeople();
+
+    @GetMapping(value = "/queryDistinctActionModule")
+    @ApiOperation(value = "操作日志记录操作模块数据", notes = "操作日志记录操作模块数据", httpMethod = "GET")
+    CommonResult queryDistinctActionModule();
+
+    @GetMapping(value = "/queryDistinctActionBusiness")
+    @ApiOperation(value = "操作日志记录操作业务数据", notes = "操作日志记录操作业务数据", httpMethod = "GET")
+    CommonResult queryDistinctActionBusiness();
+
 //    @GetMapping(value = "/deleteSmartDataSourceLogById")
 //    @ApiOperation(value = "根据ID删除指定操作日志记录", notes = "根据ID删除指定操作日志记录", httpMethod = "GET")
 //    CommonResult deleteSmartDataSourceLogById(@RequestParam int id);

+ 8 - 0
src/main/java/com/template/api/SmartDataTaskControllerAPI.java

@@ -123,4 +123,12 @@ public interface SmartDataTaskControllerAPI {
                                            @RequestParam(required = false) Integer tkLogExeStatus,
                                            @RequestParam(required = false) String startTime,
                                            @RequestParam(required = false) String endTime);
+
+    @GetMapping(value = "/queryTaskDebugSql")
+    @ApiOperation(value = "任务debugSql", notes = "任务debugSql", httpMethod = "GET")
+    CommonResult queryTaskDebugSql();
+
+    @GetMapping(value = "/queryTaskSetDebugSql")
+    @ApiOperation(value = "任务debugSql", notes = "任务debugSql", httpMethod = "GET")
+    CommonResult queryTaskSetDebugSql(@RequestParam int tkId, @RequestParam int tkDebugSql);
 }

+ 27 - 0
src/main/java/com/template/controller/SmartDataSourceLogController.java

@@ -11,6 +11,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 数据源操作日志 前端控制器
@@ -90,6 +93,30 @@ public class SmartDataSourceLogController implements SmartDataSourceLogControlle
         return CommonResult.ok(result);
     }
 
+    @Override
+    public CommonResult queryDistinctActionName() {
+        Map<String, Object> actionName = smartDataSourceLogService.queryDistinctActionName();
+        return CommonResult.ok(actionName);
+    }
+
+    @Override
+    public CommonResult queryDistinctActionPeople() {
+        Map<String, Object> actionPeople = smartDataSourceLogService.queryDistinctActionPeople();
+        return CommonResult.ok(actionPeople);
+    }
+
+    @Override
+    public CommonResult queryDistinctActionModule() {
+        Map<String, Object> actionModule = smartDataSourceLogService.queryDistinctActionModule();
+        return CommonResult.ok(actionModule);
+    }
+
+    @Override
+    public CommonResult queryDistinctActionBusiness() {
+        Map<String, Object> actionBusiness = smartDataSourceLogService.queryDistinctActionBusiness();
+        return CommonResult.ok(actionBusiness);
+    }
+
 
     /**
      * 更新日志

+ 30 - 4
src/main/java/com/template/controller/SmartDataTaskController.java

@@ -6,10 +6,7 @@ import com.github.pagehelper.PageInfo;
 import com.template.api.SmartDataTaskControllerAPI;
 import com.template.common.utils.CommonUtil;
 import com.template.common.utils.paramUtils;
-import com.template.model.pojo.SmartDataSourceLog;
-import com.template.model.pojo.SmartDataTask;
-import com.template.model.pojo.SmartDataTaskDebug;
-import com.template.model.pojo.SmartDataTaskLog;
+import com.template.model.pojo.*;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.services.SmartDataSourceLogService;
@@ -19,6 +16,7 @@ import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -469,5 +467,33 @@ public class SmartDataTaskController implements SmartDataTaskControllerAPI {
 
         return CommonResult.ok(result);
     }
+
+    @Override
+    public CommonResult queryTaskDebugSql() {
+        List<SmartDataTaskSetDebugSql> result = smartDataTaskService.queryTaskDebugSql();
+        if (result.size() > 0) {
+            return CommonResult.ok(result);
+        } else {
+            return CommonResult.fail("没有任何任务");
+        }
+    }
+
+    @Override
+    public CommonResult queryTaskSetDebugSql(int tkId, int tkDebugSql) {
+        int count = smartDataTaskService.queryTaskSetDebugSql(tkId, tkDebugSql);
+        if (count > 0) {
+            if (tkDebugSql == 1) {
+                return CommonResult.ok("启用调试成功");
+            } else {
+                return CommonResult.ok("关闭调试成功");
+            }
+        } else {
+            if (tkDebugSql == 1) {
+                return CommonResult.ok("启用调试失败");
+            } else {
+                return CommonResult.ok("关闭调试失败");
+            }
+        }
+    }
 }
 

+ 39 - 0
src/main/java/com/template/mapper/SmartDataSourceLogMapper.java

@@ -2,8 +2,12 @@ package com.template.mapper;
 
 import com.template.model.pojo.SmartDataSourceLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 数据源操作日志 Mapper 接口
@@ -15,4 +19,39 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface SmartDataSourceLogMapper extends BaseMapper<SmartDataSourceLog> {
 
+    @Select(" SELECT DISTINCT " +
+            "    log_action_name " +
+            " FROM " +
+            "    smart_data_source_log " +
+            " ORDER BY " +
+            "    log_action_name DESC "
+    )
+    List<String> queryDistinctActionName();
+
+    @Select(" SELECT DISTINCT " +
+            "    log_action_people " +
+            " FROM " +
+            "    smart_data_source_log " +
+            " ORDER BY " +
+            "    log_action_people "
+    )
+    List<String> queryDistinctActionPeople();
+
+    @Select(" SELECT DISTINCT " +
+            "    log_action_module " +
+            " FROM " +
+            "    smart_data_source_log " +
+            " ORDER BY " +
+            "    log_action_module "
+    )
+    List<String> queryDistinctActionModule();
+
+    @Select(" SELECT DISTINCT " +
+            "    log_action_business " +
+            " FROM " +
+            "    smart_data_source_log " +
+            " ORDER BY " +
+            "    log_action_business DESC "
+    )
+    List<String> queryDistinctActionBusiness();
 }

+ 20 - 0
src/main/java/com/template/mapper/SmartDataTaskMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.template.model.pojo.SmartDataTask;
 import com.template.model.pojo.SmartDataTaskDebug;
 import com.template.model.pojo.SmartDataTaskLog;
+import com.template.model.pojo.SmartDataTaskSetDebugSql;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 
@@ -417,4 +418,23 @@ public interface SmartDataTaskMapper extends BaseMapper<SmartDataTask> {
             "</script>"
     })
     List<SmartDataTaskLog> queryTaskExecuting(Integer tkLogTaskId, Integer tkLogExeStatus);
+
+    @Select({
+            "<script>",
+            "   SELECT ",
+            "      tk_id, tk_name, tk_debug_sql ",
+            "   FROM ",
+            "      smart_data_task ",
+            "   ORDER BY ",
+            "      tk_name ",
+            "</script>"
+    })
+    List<SmartDataTaskSetDebugSql> queryTaskDebugSql();
+
+    @Update("UPDATE smart_data_task " +
+            "SET tk_debug_sql = #{tkDebugSql} " +
+            "WHERE " +
+            "    tk_id = #{tkId} "
+    )
+    int queryTaskSetDebugSql(int tkId, int tkDebugSql);
 }

+ 40 - 0
src/main/java/com/template/model/pojo/SmartDataTaskSetDebugSql.java

@@ -0,0 +1,40 @@
+package com.template.model.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 数据源操作日志
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-12-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="SmartDataTaskSetDebugSql对象", description="数据源任务设置debug调试SQL")
+public class SmartDataTaskSetDebugSql implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键id")
+    @TableId(value = "tk_id", type = IdType.AUTO)
+    private Integer tkId;
+
+    @ApiModelProperty(value = "任务名称")
+    private String tkName;
+
+    @ApiModelProperty(value = "调试SQL语句")
+    private Integer tkDebugSql;
+}

+ 11 - 0
src/main/java/com/template/services/SmartDataSourceLogService.java

@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.result.PageUtils;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 数据源操作日志 服务类
@@ -26,4 +29,12 @@ public interface SmartDataSourceLogService extends IService<SmartDataSourceLog>
 //    int deleteSmartDataSourceLogById(int id);
 
     SmartDataSourceLog getSmartById(int id);
+
+    Map<String, Object> queryDistinctActionName();
+
+    Map<String, Object> queryDistinctActionPeople();
+
+    Map<String, Object> queryDistinctActionModule();
+
+    Map<String, Object> queryDistinctActionBusiness();
 }

+ 7 - 0
src/main/java/com/template/services/SmartDataTaskService.java

@@ -6,8 +6,11 @@ import com.github.pagehelper.PageInfo;
 import com.template.model.pojo.SmartDataTask;
 import com.template.model.pojo.SmartDataTaskDebug;
 import com.template.model.pojo.SmartDataTaskLog;
+import com.template.model.pojo.SmartDataTaskSetDebugSql;
 import com.template.model.result.PageUtils;
+import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -69,4 +72,8 @@ public interface SmartDataTaskService extends IService<SmartDataTask> {
     PageInfo<SmartDataTaskLog> queryPageSmartDataTaskLog(int currentPage, int pageCount, Integer eTaskId, String tkLogTaskName, Integer tkLogAutoManual,
                                                          Integer tkLogDsSourceId, Integer tkLogDsDestinationId,
                                                          Integer tkLogCostTime, Integer tkLogExeStatus, String startTime, String endTime);
+
+    List<SmartDataTaskSetDebugSql>  queryTaskDebugSql();
+
+    int queryTaskSetDebugSql(int tkId, int tkDebugSql);
 }

+ 37 - 0
src/main/java/com/template/services/impl/SmartDataSourceLogServiceImpl.java

@@ -14,6 +14,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 数据源操作日志 服务实现类
@@ -70,4 +75,36 @@ public class SmartDataSourceLogServiceImpl extends ServiceImpl<SmartDataSourceLo
         SmartDataSourceLog result = smartDataSourceLogMapper.selectById(id);
         return result;
     }
+
+    @Override
+    public Map<String, Object> queryDistinctActionName() {
+        List<String> actionName = smartDataSourceLogMapper.queryDistinctActionName();
+        Map<String, Object> returnMap = new HashMap<>();
+        returnMap.put("list", actionName);
+        return returnMap;
+    }
+
+    @Override
+    public Map<String, Object> queryDistinctActionPeople() {
+        List<String> actionName = smartDataSourceLogMapper.queryDistinctActionPeople();
+        Map<String, Object> returnMap = new HashMap<>();
+        returnMap.put("list", actionName);
+        return returnMap;
+    }
+
+    @Override
+    public Map<String, Object> queryDistinctActionModule() {
+        List<String> actionName = smartDataSourceLogMapper.queryDistinctActionModule();
+        Map<String, Object> returnMap = new HashMap<>();
+        returnMap.put("list", actionName);
+        return returnMap;
+    }
+
+    @Override
+    public Map<String, Object> queryDistinctActionBusiness() {
+        List<String> actionName = smartDataSourceLogMapper.queryDistinctActionBusiness();
+        Map<String, Object> returnMap = new HashMap<>();
+        returnMap.put("list", actionName);
+        return returnMap;
+    }
 }

+ 11 - 0
src/main/java/com/template/services/impl/SmartDataTaskServiceImpl.java

@@ -990,6 +990,17 @@ public class SmartDataTaskServiceImpl extends ServiceImpl<SmartDataTaskMapper, S
         return new PageInfo<>(result);
     }
 
+    @Override
+    public List<SmartDataTaskSetDebugSql> queryTaskDebugSql() {
+        List<SmartDataTaskSetDebugSql> smartDataTaskSetDebugSqls = smartDataTaskMapper.queryTaskDebugSql();
+        return smartDataTaskSetDebugSqls;
+    }
+
+    @Override
+    public int queryTaskSetDebugSql(int tkId, int tkDebugSql) {
+        return smartDataTaskMapper.queryTaskSetDebugSql(tkId, tkDebugSql);
+    }
+
     // 计算任务执行的时间
     private String convertMillisToDaysHoursMinutesSecondsMillis(long millis) {
         long days = millis / (1000 * 60 * 60 * 24);