FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/FOTON' into develop_3

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2022-01-24 19:26:52 +08:00
parent f721b08970 cbd9ca5959
commit a7c33531a7
5 changed files with 1588 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java
+13
View File
@@ -44,6 +44,19 @@ public class SarModelTreeController extends BaseController<SarModelTree> {
return Result.success(tsResources);
}
@ApiOperation("查询父所有资源")
@GetMapping("/listByType")
public ResponseMessage<List<SarModelTree>> getAllByType(String type){
// List<SarModuleTree> tsResources = iSarModuleTreeService.getAll(null);
SarModelTree rootData = new SarModelTree();
rootData.setModelType(type);
rootData.setDelFlag("1");
List<SarModelTree> tsResources = iSarModelTreeService.getAll(rootData);
return Result.success(tsResources);
}
@ApiOperation("根据父ID查询子所有资源")
@GetMapping("/childByList")
public ResponseMessage<List<SarModelTree>> childByList(SarModelTree parentTree){
adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java
+20
View File
@@ -73,5 +73,25 @@ public class SarModelTree extends BaseEntity {
@TableField(exist = false)
private boolean leaf;
/**
* 模块类型
* TRUCK 卡车类
* CAR 乘用车类
*/
@TableField("MODEL_TYPE")
private String modelType;
/**
* 模块层级父级ID
* 为兼容之前的树结构逻辑，此处单独新增父级ID关联关系
*/
@TableField("MODEL_PID")
private String modelPid;
/**
* 模块数据层级关系
*/
@TableField("MODEL_LEVEL")
private int modelLevel;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java
+9
View File
@@ -5,6 +5,7 @@ import com.adc.da.slrs.sarModelTree.dao.SarModelTreeDao;
import com.adc.da.slrs.sarModelTree.service.ISarModelTreeService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -30,6 +31,10 @@ public class SarModelTreeServiceImpl extends ServiceImpl<SarModelTreeDao, SarMod
public List<SarModelTree> getAll(SarModelTree sarModelTree) {
QueryWrapper<SarModelTree> tsResourceQueryWrapper=new QueryWrapper<>();
tsResourceQueryWrapper.isNull("PID");
if(sarModelTree!=null && StringUtils.isNotBlank(sarModelTree.getModelType())){
tsResourceQueryWrapper.eq("MODEL_TYPE",sarModelTree.getModelType());
}
tsResourceQueryWrapper.eq("DEL_FLAG","1");
List<SarModelTree> list = this.baseMapper.selectList(tsResourceQueryWrapper);
// for(SarModelTree tree:list){
// tree.setChildren(recursionGetChildren((tree)));
@@ -59,6 +64,10 @@ public class SarModelTreeServiceImpl extends ServiceImpl<SarModelTreeDao, SarMod
sarMenuQueryWrapper.orderByAsc("SORT");
// sarMenuQueryWrapper.in("PID",parent.getId());
sarMenuQueryWrapper.eq("PID",parent.getId());
if(parent!=null && StringUtils.isNotBlank(parent.getModelType())){
sarMenuQueryWrapper.eq("MODEL_TYPE",parent.getModelType());
}
sarMenuQueryWrapper.eq("DEL_FLAG","1");
List<SarModelTree> children=this.baseMapper.selectList(sarMenuQueryWrapper);
// for(SarModelTree sarMenu:children){
// sarMenu.setChildren(recursionGetChildren((sarMenu)));