数据连接日志

bi-server/src/main/java/com/usoftchina/bi/server/controller/dataSource/DataBasesController.java

@@ -5,6 +5,7 @@ import com.usoftchina.bi.server.model.pojo.annotation.CheckToken;
 import com.usoftchina.bi.server.model.po.Databases;
 import com.usoftchina.bi.core.base.RepEntity;
 import com.usoftchina.bi.core.base.TestPage;
+import com.usoftchina.bi.server.model.pojo.annotation.Log;
 import com.usoftchina.bi.server.model.vo.configVo.DatabasesInfo;
 import com.usoftchina.bi.server.service.dataSource.DataBasesService;
 import com.usoftchina.bi.server.service.dataSource.ImplementSqlService;
@@ -13,8 +14,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 @RestController
 @RequestMapping("/DataBase")
 @Api(description = "数据连接相关接口")
@@ -30,6 +29,7 @@ public class DataBasesController {
     @ApiOperation(value = "保存数据库配置", notes = "保存数据库配置", response = RepEntity.class)
     @CheckToken
     @Auth(user = "admin")
+    @Log(module = "数据连接", name = "#body.name", token = "#token")
     @PostMapping("/inputDatabases")
     public RepEntity inputDatabases(@RequestHeader String token, @RequestBody DatabasesInfo body){
         return dataBasesService.inputDatabases(body);
@@ -54,7 +54,7 @@ public class DataBasesController {
     @Auth(user = "admin")
     @PostMapping("/delDatabases")
     public RepEntity delDatabases(@RequestHeader String token,@RequestBody Long body){
-        return dataBasesService.delDatabases(body);
+        return dataBasesService.delDatabases(token, body);
     }
 
     /*
@@ -63,6 +63,7 @@ public class DataBasesController {
     @ApiOperation(value = "更新数据库配置", notes = "更新数据库配置", response = RepEntity.class)
     @CheckToken
     @Auth(user = "admin")
+    @Log(module = "数据连接", name = "#databasesInfo.name", token = "#token")
     @PostMapping("/updatabases")
     public RepEntity updatabases(@RequestHeader String token,@RequestBody DatabasesInfo databasesInfo){
         return dataBasesService.updatabases(databasesInfo);

bi-server/src/main/java/com/usoftchina/bi/server/service/dataSource/DataBasesService.java

@@ -2,7 +2,7 @@ package com.usoftchina.bi.server.service.dataSource;
 
 import com.usoftchina.bi.core.exception.MyException;
 import com.usoftchina.bi.core.utils.ContextUtil;
-import com.usoftchina.bi.core.utils.JsonUtils;
+import com.usoftchina.bi.core.utils.GetTokenDataUtil;
 import com.usoftchina.bi.server.dao.dataSource.DataConnectorMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.CollectionType;
@@ -19,6 +19,7 @@ import com.usoftchina.bi.server.service.chart.GetChartsDataUtilService;
 import com.usoftchina.bi.core.jdbc.DynamicDataSource;
 import com.usoftchina.bi.core.jdbc.DynamicDataSourceContextHolder;
 import com.usoftchina.bi.core.jdbc.DynamicDataSourceRegister;
+import com.usoftchina.bi.server.service.common.MessageLogService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -41,6 +42,8 @@ public class DataBasesService {
     GetChartsDataUtilService getChartsDataUtilService;
     @Autowired
     private ImplementSqlService implementSqlService;
+    @Autowired
+    private MessageLogService messageLogService;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DataBasesService.class);
     /*
@@ -105,12 +108,16 @@ public class DataBasesService {
     /*
     删除数据库配置
      */
-    public RepEntity delDatabases(Long id){
+    public RepEntity delDatabases(String token, Long id){
+        Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
+        String username = resMap.get("name");
         int count = dataConnectorMapper.countDataConnectorById(id);
         if (count > 0) {
             throw new MyException(RepCode.DATACONNECTOR_USED_DATASOURCE);
         }
+        String databaseName = dataConnectorMapper.getDatabases(id.intValue()).getName();
         dataConnectorMapper.deleteDatabases(id);
+        messageLogService.delete("数据连接", databaseName, username, null);
         return new RepEntity(RepCode.success);
     }