Commit 0992c441 authored by linruibiao's avatar linruibiao

接口编写

parent 4cae0087
...@@ -44,7 +44,7 @@ public class SysMetaObjectHandler implements MetaObjectHandler { ...@@ -44,7 +44,7 @@ public class SysMetaObjectHandler implements MetaObjectHandler {
if(CollectionUtils.isEmpty(headerMap)){ if(CollectionUtils.isEmpty(headerMap)){
throw new SysException("头部不能为空"); throw new SysException("头部不能为空");
} }
String token =headerMap.get("token"); String token =request.getHeader("X-Token");
if(StringUtils.isBlank(token)){ if(StringUtils.isBlank(token)){
throw new SysException("token不能为空"); throw new SysException("token不能为空");
} }
......
...@@ -81,7 +81,7 @@ public class BaseRestController { ...@@ -81,7 +81,7 @@ public class BaseRestController {
} }
} }
log.info("请求头参数--->>>>"+SlmConstants.gson.toJson(headers)); log.info("请求头参数--->>>>"+SlmConstants.gson.toJson(headers));
token=request.getHeader("token"); token=request.getHeader("X-Token");
if(!uri.contains("tokens")) { if(!uri.contains("tokens")) {
if (StringUtils.isEmpty(token)) { if (StringUtils.isEmpty(token)) {
throw new SysException("token不能为空"); throw new SysException("token不能为空");
......
...@@ -379,7 +379,7 @@ public class InstrumentPanelTreeServiceImpl extends ServiceImpl<InstrumentPanelT ...@@ -379,7 +379,7 @@ public class InstrumentPanelTreeServiceImpl extends ServiceImpl<InstrumentPanelT
where.eq(BaseEntity::getAppId, appId); where.eq(BaseEntity::getAppId, appId);
where.eq(BaseEntity::getRecordStatus, SlmConstants.DATA_VALID); where.eq(BaseEntity::getRecordStatus, SlmConstants.DATA_VALID);
if(!showAssembly){ if(!showAssembly){
where.eq(InstrumentPanelTree::getNodeType, NodeType.ASSEMBLY.value); where.ne(InstrumentPanelTree::getNodeType,NodeType.ASSEMBLY.value);
} }
List<InstrumentPanelTree> allGroups=baseMapper.selectList(where); List<InstrumentPanelTree> allGroups=baseMapper.selectList(where);
List<InstrumentPanelTree> filteredTrees=allGroups; List<InstrumentPanelTree> filteredTrees=allGroups;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment