Commit 58d8b738 authored by 郭凡凡's avatar 郭凡凡

Merge remote-tracking branch 'origin/master'

parents 941e8f0a f4a04cdc
......@@ -52,8 +52,8 @@ public class OcpTenantController {
@PostMapping("/tenantinster")
@ApiModelProperty("新增应用")
public ResponseVO tenantInster(@RequestBody TenanBaseDto TenanBaseDto){
OcpTenantGroup tenanInster = tenantService.getTenanInster(TenanBaseDto);
public ResponseVO tenantInster(@RequestBody TenanBaseDto tenanBaseDto){
OcpTenantGroup tenanInster = tenantService.getTenanInster(tenanBaseDto);
if ("1".equals(tenanInster.getNum())){
return ResponseVO.error("1");
}
......
......@@ -16,18 +16,18 @@ public class ImgDTO {
@ApiModelProperty(value = "应用编码")
@NotBlank(message = "应用编码值不能为空", groups = CreateGroups.class)
private String codeNo;
private String tenantCode;
@ApiModelProperty(value = "应用预览url")
@NotBlank(message = "应用预览url不能为空", groups = CreateGroups.class)
private String img;
public String getCodeNo() {
return codeNo;
public String getTenantCode() {
return tenantCode;
}
public void setCodeNo(String codeNo) {
this.codeNo = codeNo;
public void setTenantCode(String tenantCode) {
this.tenantCode = tenantCode;
}
public String getImg() {
......
......@@ -24,7 +24,7 @@ public interface TenantService extends IService<OcpTenantGroup> {
* @param
* @return
*/
OcpTenantGroup getTenanInster(TenanBaseDto TenanBaseDto);
OcpTenantGroup getTenanInster(TenanBaseDto tenanBaseDto);
/**
* 修改应用
......
......@@ -97,9 +97,9 @@ public class AppRegisterServiceImpl implements AppRegisterService {
@Override
public ResponseVO getAppInfo(QueryAppDTO queryAppDTO) {
List<QueryAppInfoVO> list = appRegisterMapper.getAppInfo(queryAppDTO);
PageHelper.startPage(queryAppDTO.getCurrentPage(), queryAppDTO.getPageSize());
PageInfo<QueryAppInfoVO> pageInfo = new PageInfo<>(list);
return ResponseVO.ok(pageInfo);
PageUtil<QueryAppInfoVO> pageUtil = new PageUtil<>();
pageUtil.startPage(queryAppDTO.getCurrentPage(), queryAppDTO.getPageSize(), list);
return ResponseVO.ok(pageUtil);
}
@Override
......@@ -109,7 +109,7 @@ public class AppRegisterServiceImpl implements AppRegisterService {
for (ImgDTO item : imgDTO) {
OcpTenantIocn ocpTenantIocn = new OcpTenantIocn();
ocpTenantIocn.setIocnType("tenant");
ocpTenantIocn.setCodeNo(item.getCodeNo());
ocpTenantIocn.setCodeNo(item.getTenantCode());
ocpTenantIocn.setIocn(item.getImg());
ocpTenantIocn.setIocnKind("Tenant_swiper");
list.add(ocpTenantIocn);
......
......@@ -19,7 +19,6 @@ import java.util.List;
/**
* @author:zhaochengming
*
*/
@Service
public class OcpTenantIocnServiceImpl extends ServiceImpl<OcpTenantIocnMapper, OcpTenantIocn> implements OcpTenantIocnService {
......@@ -53,18 +52,26 @@ public class OcpTenantIocnServiceImpl extends ServiceImpl<OcpTenantIocnMapper, O
String tenantCode = ocpTenantBase.getTenantCode();
// ocpTenantGroupIocnDto.setCompanyCode(ownerCompanyCode);
for (OcpTenantIocn ocpTenantIocn : ocpTenantIocns) {
if (tenantCode.equals(ocpTenantIocn.getCodeNo())){
if (tenantCode.equals(ocpTenantIocn.getCodeNo())) {
BeanUtils.copyProperties(ocpTenantIocn, ocpTenantGroupIocnDto);
}
}
for (OcpTenantExtent ocpTenantExtent : ocpTenantExtents) {
if (ocpTenantBase.getTenantCode().equals(ocpTenantBase.getTenantCode())){
Short tenantState = ocpTenantExtent.getTenantState();
ocpTenantGroupIocnDto.setTenantState(tenantState);
if (ocpTenantBase.getTenantCode().equals(ocpTenantExtent.getTenantCode())) {
ocpTenantGroupIocnDto.setTenantState(ocpTenantExtent.getTenantState());
}
}
// for (OcpTenantExtent ocpTenantExtent : ocpTenantExtents) {
// if (ocpTenantBase.getTenantCode().equals(ocpTenantExtent.getTenantCode())){
// Short tenantState = ocpTenantExtent.getTenantState();
// ocpTenantGroupIocnDto.setTenantState(tenantState);
// }
// }
groupIocnDtos.add(ocpTenantGroupIocnDto);
}
}
return groupIocnDtos;
}
......
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