dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 删除仪表盘时，同步删除相关的收藏，分享数据

Browse Source
This commit is contained in:
taojinlong 2021-05-21 10:52:19 +08:00
parent ff24ab3d6e
commit 14ea0f17a1
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
View File

@ -19,6 +19,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
@ -45,14 +46,15 @@ public class PanelGroupService {
@Resource
private ExtPanelGroupMapper extPanelGroupMapper;
@Resource
private PanelDesignMapper panelDesignMapper;
@Resource
private ChartViewService chartViewService;
@Resource
private ChartViewMapper chartViewMapper;
@Resource
private ExtPanelDesignMapper extPanelDesignMapper;
private StoreService storeService;
@Resource
private ShareService shareService;
@Resource
private PanelLinkService panelLinkService;
public List<PanelGroupDTO> tree(PanelGroupRequest panelGroupRequest) {
String userId = String.valueOf(AuthUtils.getUser().getUserId());
panelGroupRequest.setUserId(userId);
@ -93,6 +95,9 @@ public class PanelGroupService {
public void deleteCircle(String id) {
Assert.notNull(id, "id cannot be null");
extPanelGroupMapper.deleteCircle(id);
storeService.removeByPanelId(id);
shareService.delete(id, null);
panelLinkService.deleteByResourceId(id);
}

5
backend/src/main/java/io/dataease/service/panel/PanelLinkService.java
View File

@ -73,6 +73,10 @@ public class PanelLinkService {
return convertDto(one);
}
public void deleteByResourceId(String resourceId){
mapper.deleteByPrimaryKey(resourceId);
}
public String decryptParam(String text) throws Exception {
return RsaUtil.decryptByPrivateKey(RsaProperties.privateKey, text);
}
@ -100,7 +104,6 @@ public class PanelLinkService {
} catch (Exception e) {
e.printStackTrace();
}
System.out.println(s);
return encrypt;
}
private GenerateDto convertDto(PanelLink linl){

6
backend/src/main/java/io/dataease/service/panel/ShareService.java
View File

@ -76,7 +76,11 @@ public class ShareService {
@Transactional
public void delete(String panel_group_id, Integer type){
PanelShareExample example = new PanelShareExample();
example.createCriteria().andPanelGroupIdEqualTo(panel_group_id).andTypeEqualTo(type);
PanelShareExample.Criteria criteria = example.createCriteria();
criteria.andPanelGroupIdEqualTo(panel_group_id);
if(type != null){
criteria.andTypeEqualTo(type);
}
mapper.deleteByExample(example);
}