数据源组别更改日志

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

@@ -130,7 +130,7 @@ public class DataConnectorController {
     @PostMapping("/setConnectorGroup")
     @Auth(user = "admin")
     public RepEntity setConnectorGroup(@RequestHeader String token,@RequestBody GroupInfo body){
-        return dataConnectorService.setDataConnectorGroup(body);
+        return dataConnectorService.setDataConnectorGroup(token, body);
     }
 
     /**
@@ -144,7 +144,7 @@ public class DataConnectorController {
     @PostMapping("/batchUpdateConnectorGroup")
     @Auth(user = "admin")
     public RepEntity saveConnectorGroups(@RequestHeader String token, @RequestBody List<GroupInfo> groupInfoList){
-        return dataConnectorService.saveConnectorGroups(groupInfoList);
+        return dataConnectorService.saveConnectorGroups(token, groupInfoList);
     }
 
     /*
@@ -155,7 +155,7 @@ public class DataConnectorController {
     @Auth(user = "admin")
     @PostMapping("/updataDataConnectorGroup")
     public RepEntity updataDataConnectorGroup(@RequestHeader String token,@RequestBody GroupInfo body){
-        return dataConnectorService.updataDataConnectorGroup(body);
+        return dataConnectorService.updataDataConnectorGroup(token, body);
     }
 
     /*
@@ -177,7 +177,7 @@ public class DataConnectorController {
     @CheckToken
     @PostMapping("/delDataConnectorGroup")
     public RepEntity delDataConnectorGroup(@RequestHeader String token,@RequestBody Long body){
-        return dataConnectorService.delDataConnectorGroup(body);
+        return dataConnectorService.delDataConnectorGroup(token, body);
     }
 
     /*

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

@@ -257,12 +257,16 @@ public class DataConnectorService {
     /*
     创建数据源分组
      */
-    public RepEntity setDataConnectorGroup(GroupInfo groupInfo) {
+    public RepEntity setDataConnectorGroup(String token, GroupInfo groupInfo) {
+        Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
+        String username = resMap.get("name");
         if (groupInfo == null || "".equals(groupInfo)) {
             return new RepEntity(RepCode.Null);
         }
         dataConnectorMapper.setConnectorGroup(groupInfo);
         int id = groupInfo.getId();
+        // 记录LOG
+        messageLogService.save("数据源分组", groupInfo.getGroupName(), username, "创建数据源分组");
         return new RepEntity(RepCode.success, id);
     }
 
@@ -272,7 +276,9 @@ public class DataConnectorService {
      * @return
      */
     @Transactional
-    public RepEntity saveConnectorGroups(List<GroupInfo> groupInfoList) {
+    public RepEntity saveConnectorGroups(String token, List<GroupInfo> groupInfoList) {
+        Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
+        String username = resMap.get("name");
         List<GroupInfo> addGroupInfoList = new ArrayList<>();
         List<GroupInfo> deleteGroupInfoList = new ArrayList<>();
         List<GroupInfo> updateGroupInfoList = new ArrayList<>();
@@ -286,12 +292,15 @@ public class DataConnectorService {
             }
         });
         if (addGroupInfoList.size() > 0) {
+            messageLogService.save("数据源分组", null, username, "批量新增数据源分组");
             dataConnectorMapper.batchInsertDataConnector(addGroupInfoList);
         }
         if (updateGroupInfoList.size() > 0) {
+            messageLogService.save("数据源分组", null, username, "批量更新数据源分组");
             dataConnectorMapper.batchUpdateDataConnector(updateGroupInfoList);
         }
         if (deleteGroupInfoList.size() > 0) {
+            messageLogService.save("数据源分组", null, username, "批量删除数据源分组");
             dataConnectorMapper.batchUpdateGroupIdToDefault(deleteGroupInfoList);
             dataConnectorMapper.batchDeleteDataConnector(deleteGroupInfoList);
         }
@@ -301,8 +310,11 @@ public class DataConnectorService {
     /*
     更新数据源分组
      */
-    public RepEntity updataDataConnectorGroup(GroupInfo groupInfo) {
+    public RepEntity updataDataConnectorGroup(String token, GroupInfo groupInfo) {
         dataConnectorMapper.updataConnectorGroup(groupInfo);
+        Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
+        String username = resMap.get("name");
+        messageLogService.update("数据源分组", groupInfo.getGroupName(), username, "更新分组");
         return new RepEntity(RepCode.success);
     }
 
@@ -323,7 +335,9 @@ public class DataConnectorService {
     /*
     删除数据源分组
      */
-    public RepEntity delDataConnectorGroup(Long id) {
+    public RepEntity delDataConnectorGroup(String token, Long id) {
+        Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
+        String username = resMap.get("name");
         List<String> groupName = dataConnectorMapper.getFatherId(id.intValue());
         if (groupName.size() != 0) {
             return new RepEntity(RepCode.hasGroupUsing);
@@ -332,9 +346,11 @@ public class DataConnectorService {
         if (chartName.size() != 0) {
             return new RepEntity(RepCode.hasConUsing);
         }
+        String dataName = dataConnectorMapper.getOneData(id.intValue()).getDataName();
         dataConnectorMapper.delConnectorGroup(id);
         // 更新分组字段值
         dataConnectorMapper.updateGroupIdToDefault(id);
+        messageLogService.delete("数据源分组", dataName, username, "删除数据源分组");
         return new RepEntity(RepCode.success);
     }