图表日志

bi-server/src/main/java/com/usoftchina/bi/server/controller/chart/ChartsConfigController.java

@@ -5,6 +5,7 @@ import com.usoftchina.bi.core.base.RepEntity;
 import com.usoftchina.bi.core.base.TestPage;
 import com.usoftchina.bi.server.model.bo.GroupUpdateId;
 import com.usoftchina.bi.server.model.pojo.annotation.CheckToken;
+import com.usoftchina.bi.server.model.pojo.annotation.Log;
 import com.usoftchina.bi.server.model.vo.configVo.ChangeOrderInfo;
 import com.usoftchina.bi.server.model.vo.configVo.ChartConfigInfo;
 import com.usoftchina.bi.server.model.vo.configVo.GroupInfo;
@@ -33,8 +34,9 @@ public class ChartsConfigController {
             @ApiImplicitParam(name = "body", value = "图表配置", required = true, dataType = "ChartConfigInfo", paramType = "body")
     })
     @CheckToken
+    @Log(module = "图表", name = "#body.chartName", token = "#token")
     @PostMapping("/inputCharts")
-    public RepEntity inputCharts(@RequestHeader String token, @RequestBody ChartConfigInfo body){
+    public RepEntity saveCharts(@RequestHeader String token, @RequestBody ChartConfigInfo body){
         return chartsConfigService.setChartsConfig(body, token);
     }
 
@@ -43,6 +45,7 @@ public class ChartsConfigController {
     */
     @ApiOperation(value = "更新图表", notes = "更新图表", response = RepEntity.class)
     @CheckToken
+    @Log(module = "图表", name = "#body.chartName", token = "#token")
     @PostMapping("/updateCharts")
     public RepEntity updateCharts(@RequestHeader String token,@RequestBody ChartConfigInfo body){
         return chartsConfigService.updateChartsConfig(body, token);
@@ -66,7 +69,7 @@ public class ChartsConfigController {
     @Auth(user = "admin")
     @PostMapping("/updateChartConfigGroup")
     public RepEntity updateConfigGroup(@RequestHeader String token, @RequestBody GroupUpdateId body){
-        return chartsConfigService.updateConfigGroup(body);
+        return chartsConfigService.updateConfigGroup(token, body);
     }
 
     /*
@@ -75,8 +78,8 @@ public class ChartsConfigController {
     @ApiOperation(value = "删除图表", notes = "删除图表", response = RepEntity.class)
     @CheckToken
     @PostMapping("/delChartsConfig")
-    public RepEntity delChartsConfig(@RequestHeader String token,@RequestBody Long body){
-        return chartsConfigService.delChartsConfig(body);
+    public RepEntity deleteChartsConfig(@RequestHeader String token, @RequestBody Long body){
+        return chartsConfigService.delChartsConfig(token, body);
     }
 
     /*
@@ -107,7 +110,7 @@ public class ChartsConfigController {
     @Auth(user = "admin")
     @PostMapping("/setChartsGroup")
     public RepEntity setChartsGroup(@RequestHeader String token, @RequestBody GroupInfo body){
-        return chartsConfigService.setDataConnectorGroup(body);
+        return chartsConfigService.setDataConnectorGroup(token, body);
     }
 
     /*
@@ -118,7 +121,7 @@ public class ChartsConfigController {
     @Auth(user = "admin")
     @PostMapping("/updataChartsGroup")
     public RepEntity updataChartsGroup(@RequestHeader String token,@RequestBody GroupInfo body){
-        return chartsConfigService.updataDataConnectorGroup(body);
+        return chartsConfigService.updataDataConnectorGroup(token, body);
     }
 
     @ApiOperation(value = "批量更新数据源分组", notes = "批量更新数据源分组", response = RepEntity.class)

bi-server/src/main/java/com/usoftchina/bi/server/dao/chart/ChartsConfigMapper.java

@@ -243,6 +243,18 @@ public interface ChartsConfigMapper {
             + "</script>")
     void batchDeleteCharts(@Param("list") List<GroupInfo> groupInfoList);
 
+    /**
+     * 更新图表分组为默认分组-1
+     * @param groupInfoList
+     */
+    @Update("<script>"
+            + "UPDATE BI_CHARTS_GROUP SET BC_CHARTS_GROUP = -1 WHERE BC_CHARTS_GROUP IN "
+            + "<foreach collection=\"list\" item=\"item\" index=\"index\" open=\"(\" close=\")\" separator=\",\">"
+            +   "#{item.id, jdbcType=INTEGER}"
+            + "</foreach>"
+            + "</script>")
+    void batchUpdateGroupToDefault(@Param("list") List<GroupInfo> groupInfoList);
+
     /*
     查询分组
      */

bi-server/src/main/java/com/usoftchina/bi/server/service/chart/ChartsConfigService.java

@@ -13,9 +13,11 @@ import com.github.pagehelper.PageInfo;
 import com.usoftchina.bi.server.model.bo.GroupUpdateId;
 import com.usoftchina.bi.server.model.po.ChartConfig;
 import com.usoftchina.bi.server.model.po.ChartConfigList;
+import com.usoftchina.bi.server.model.po.MessageLog;
 import com.usoftchina.bi.server.model.vo.configVo.ChangeOrderInfo;
 import com.usoftchina.bi.server.model.vo.configVo.ChartConfigInfo;
 import com.usoftchina.bi.server.model.vo.configVo.GroupInfo;
+import com.usoftchina.bi.server.service.common.MessageLogService;
 import com.usoftchina.bi.server.service.strategy.StrategysService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +39,8 @@ public class ChartsConfigService {
     StrategysService strategysService;
     @Autowired
     UserMapper userMapper;
+    @Autowired
+    private MessageLogService messageLogService;
 
     /*
     保存表设置
@@ -159,34 +163,47 @@ public class ChartsConfigService {
     public RepEntity changeChartOrder(ChangeOrderInfo changeOrderInfo, String token){
         Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
         int userId = Integer.parseInt(resMap.get("id"));
-        String name = userMapper.getName(changeOrderInfo.getUserId());
+        String username = userMapper.getName(changeOrderInfo.getUserId());
         int createId = chartsConfigMapper.getCreateId(changeOrderInfo.getId());
         if (createId != userId){
             return new RepEntity(RepCode.NoAuthority);
         }
-        chartsConfigMapper.changeChartOrder(name, changeOrderInfo.getUserId(), changeOrderInfo.getId());
+        chartsConfigMapper.changeChartOrder(username, changeOrderInfo.getUserId(), changeOrderInfo.getId());
+        //记录LOg
+        String chartName = chartsConfigMapper.getOneChart(changeOrderInfo.getId()).getChartName();
+        messageLogService.update("图表", chartName, username, "移交图表");
         return new RepEntity(RepCode.success);
     }
 
     /*
     更新图表配置的分组
      */
-    public RepEntity updateConfigGroup(GroupUpdateId groupUpdateId){
+    public RepEntity updateConfigGroup(String token, GroupUpdateId groupUpdateId){
+        Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
+        String username = resMap.get("name");
         int chartId = groupUpdateId.getId();
         int chartGroupId = groupUpdateId.getGroupId();
         chartsConfigMapper.updateConfigGroup(chartId, chartGroupId);
+        //记录LOg
+        String chartName = chartsConfigMapper.getOneChart(chartId).getChartName();
+        messageLogService.update("图表", chartName, username, "更新图表分组");
         return new RepEntity(RepCode.success);
     }
 
     /*
     删除图表
      */
-    public RepEntity delChartsConfig(Long id){
+    public RepEntity delChartsConfig(String token, Long id){
+        Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
+        String username = resMap.get("name");
         int count = chartsConfigMapper.countDashboardsById(id);
         if (count > 0) {
             throw new MyException(RepCode.DASHBOARD_USED_CHARTS);
         }
+        String chartName = chartsConfigMapper.getOneChart(id.intValue()).getChartName();
         chartsConfigMapper.deleteCharts(id);
+        //记录LOg
+        messageLogService.delete("图表", chartName, username, "删除图表分组");
         return new RepEntity(RepCode.success);
     }
 
@@ -219,20 +236,29 @@ public class ChartsConfigService {
     /*
     创建图表分组
      */
-    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){
             return new RepEntity(RepCode.Null);
         }
         chartsConfigMapper.setChartsGroup(groupInfo);
         int id = groupInfo.getId();
+        //记录LOg
+        MessageLog messageLog = new MessageLog(username, "创建图表分组", "创建成功", "", "图表", groupInfo.getGroupName());
+        messageLogService.customizeLog(messageLog);
         return new RepEntity(RepCode.success, id);
     }
 
     /*
     更新图表分组
      */
-    public RepEntity updataDataConnectorGroup(GroupInfo groupInfo){
+    public RepEntity updataDataConnectorGroup(String token, GroupInfo groupInfo){
+        Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
+        String username = resMap.get("name");
         chartsConfigMapper.updataChartsGroup(groupInfo);
+        //记录LOg
+        messageLogService.update("图表", groupInfo.getGroupName(), username, "更新图表分组");
         return new RepEntity(RepCode.success);
     }
 
@@ -256,6 +282,7 @@ public class ChartsConfigService {
             chartsConfigMapper.batchUpdateCharts(updateGroupInfoList);
         }
         if (deleteGroupInfoList.size() > 0) {
+            chartsConfigMapper.batchUpdateGroupToDefault(deleteGroupInfoList);
             chartsConfigMapper.batchDeleteCharts(deleteGroupInfoList);
         }
         return new RepEntity(RepCode.success);