Commit d8d881a3 authored by cuijun's avatar cuijun

Merge remote-tracking branch 'origin/dev' into dev

parents 3888d9d5 05572f3d
...@@ -8,6 +8,7 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse; ...@@ -8,6 +8,7 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.Query; import com.github.wxiaoqi.security.common.util.Query;
import com.github.wxiaoqi.security.common.util.process.ResultCode; import com.github.wxiaoqi.security.common.util.process.ResultCode;
import com.github.wxiaoqi.security.common.vo.PageDataVO; import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.github.wxiaoqi.security.common.vo.PageParam;
import com.upyuns.platform.rs.website.dto.ServiceCapabilityDTO; import com.upyuns.platform.rs.website.dto.ServiceCapabilityDTO;
import com.upyuns.platform.rs.website.entity.ServiceCapability; import com.upyuns.platform.rs.website.entity.ServiceCapability;
...@@ -43,6 +44,20 @@ public class ServiceCapabilityBiz extends BaseBiz<ServiceCapabilityMapper, Servi ...@@ -43,6 +44,20 @@ public class ServiceCapabilityBiz extends BaseBiz<ServiceCapabilityMapper, Servi
PageDataVO<ServiceCapability> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectList(query.getSuper())); PageDataVO<ServiceCapability> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectList(query.getSuper()));
return ObjectRestResponse.succ(pageDataVO); return ObjectRestResponse.succ(pageDataVO);
} }
public ObjectRestResponse get() {
PageParam pageParam = new PageParam();
pageParam.setPage(1);
pageParam.setLimit(1);
Query query = new Query(pageParam);
PageDataVO<ServiceCapability> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectList(query.getSuper()));
try {
return ObjectRestResponse.succ(pageDataVO.getData().get(0));
} catch (Exception e) {
e.printStackTrace();
return ObjectRestResponse.createFailedResult(50000,e.toString());
}
}
} }
......
...@@ -37,5 +37,11 @@ public class ServiceCapabilityController extends BaseController<ServiceCapabilit ...@@ -37,5 +37,11 @@ public class ServiceCapabilityController extends BaseController<ServiceCapabilit
return ObjectRestResponse.succ(baseBiz.selectById(id)); return ObjectRestResponse.succ(baseBiz.selectById(id));
} }
@GetMapping(value = "/app/unauth")
@IgnoreUserToken
public ObjectRestResponse get() {
return ObjectRestResponse.succ(baseBiz.get());
}
} }
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