Commit 22891aef authored by liukai's avatar liukai

Merge remote-tracking branch 'origin/master'

parents daff6c16 7095ee7f
......@@ -209,7 +209,7 @@ public class ApiBasicManagementController {
return ResponseVO.ok(apiBaseList);
}
@ApiOperation("个人信息编辑中的模糊查询")
@ApiOperation("省侧-应用接入申请-的模糊查询")
@GetMapping("/selectByCondition")
public ResponseVO <PageInfo<OcpApiBase>>selectByCondition(@RequestParam(required = false) String apiCode,
@RequestParam(required = false) String apiName,
......
......@@ -20,7 +20,7 @@ import java.util.List;
@Slf4j
@RequestMapping("/tenant-group/v1")
@RestController
@Api(tags = "我的应用-服务列表")
@Api(tags = "应用接入-我的应用-服务列表")
public class OcpTenantGroupIocnController {
......@@ -51,7 +51,12 @@ public class OcpTenantGroupIocnController {
@ApiModelProperty("我的应用--应用删除")
private ResponseVO delectApplyUser(String objId) {
boolean falg = ocpTenantBaseService.delectApply(objId);
return ResponseVO.ok(falg);
if (falg){
return ResponseVO.ok(falg);
}else {
return ResponseVO.error("请点击需要删除的应用!");
}
}
......
......@@ -125,19 +125,19 @@ public class TenantBasicManagementController {
@ApiOperation("个人信息中-编辑")
@PostMapping("/update")
public ResponseVO update(@RequestBody OcpBaseTiocnDto ocpBaseTiocnDto){
@ApiOperation("省测-应用接入申请-编辑和添加应用服务关系")
@PostMapping("/updateByCondition")
public ResponseVO updateByCondition(@RequestBody OcpBaseTiocnDto ocpBaseTiocnDto){
return tenantBasicManagementService.updateByCondition(ocpBaseTiocnDto);
}
@ApiOperation("个人信息中-查询和应用关联的服务")
@ApiOperation("省测-应用接入申请-查询和应用关联的服务")
@GetMapping("/selectOcpByApi")
public ResponseVO<List<OcpApiBase>> selectOcpByApi(@RequestParam(required = false) String tenantCode){
return tenantBasicManagementService.selectOcpByApi(tenantCode);
}
@ApiOperation("添加应用服务关系")
@PostMapping("/saveTenantAndApi")
public ResponseVO saveTenantAndApi(@RequestBody OcpBaseTiocnDto ocpBaseTiocnDto){
return tenantBasicManagementService.saveTenantAndApi(ocpBaseTiocnDto);
}
@ApiOperation("省测-应用接入申请-编辑和发布应用")
@PostMapping("/saveAndUpdateTenant")
public ResponseVO saveAndUpdateTenant(@RequestBody OcpBaseTiocnDto ocpBaseTiocnDto){
return tenantBasicManagementService.saveAndUpdateTenant(ocpBaseTiocnDto);
}
}
......@@ -11,6 +11,10 @@ import java.sql.Timestamp;
@Data
public class OcpTenantGroupIocnDto {
@ApiModelProperty("应用id")
private String objId;
@ApiModelProperty("应用名称")
private String tenantName;
......@@ -141,12 +145,73 @@ public class OcpTenantGroupIocnDto {
private String tenantFullPath;
/**
* 图标种类tenant:应用图标api:服务图标
*/
@ApiModelProperty(value = "图标种类——tenant:应用图标,api:服务图标")
private String iocnType;
/**
* 编码值
*/
@ApiModelProperty(value = "编码值")
private String codeNo;
/**
* 应用调用的服务数量图标数据
*/
@ApiModelProperty(value = "应用调用的服务数量图标数据")
private Object iocn;
/**
* 所属公司可能会根据公司分区
*/
@ApiModelProperty(value = "所属公司可能会根据公司分区")
private String companyCode;
@ApiModelProperty("应用状态 '0: ''待审核'',1: ''已审核'',2: ''未通过'', 3: ''未提交'',4:''建设中'',5:''下架'',6:''发布'''")
private Short tenantState;
public Short getTenantState() {
return tenantState;
}
public void setTenantState(Short tenantState) {
this.tenantState = tenantState;
}
public String getIocnType() {
return iocnType;
}
public void setIocnType(String iocnType) {
this.iocnType = iocnType;
}
public String getCodeNo() {
return codeNo;
}
public void setCodeNo(String codeNo) {
this.codeNo = codeNo;
}
public Object getIocn() {
return iocn;
}
public void setIocn(Object iocn) {
this.iocn = iocn;
}
public String getObjId() {
return objId;
}
public void setObjId(String objId) {
this.objId = objId;
}
public String getTenantName() {
return tenantName;
}
......
......@@ -82,7 +82,7 @@ public interface ApiBasicManagementService extends IService<OcpApiBase> {
/**
* 编辑中的模糊查询
* 省侧-应用接入申请-的模糊查询
* @param apiCode
* @param apiName
* @param apiCenterCode
......
......@@ -89,25 +89,27 @@ public interface TenantBasicManagementService extends IService<OcpTenantBase> {
List<GroupDto> selectBase(String tenantGroupCode, String tenantGroupCompanyCode);
/**
* 个人信息中编辑
* 省测-应用接入申请-编辑和添加应用服务关系
* @param ocpBaseTiocnDto
* @return
*/
ResponseVO updateByCondition(OcpBaseTiocnDto ocpBaseTiocnDto);
/**
* 个人信息中-查询和应用关联的服务
* 省测-应用接入申请-查询和应用关联的服务
* @param tenantCode
* @return
*/
ResponseVO <List<OcpApiBase>>selectOcpByApi(String tenantCode);
/**
* 添加应用服务关系
/**
* 省测-应用接入申请-编辑和发布应用
* @param ocpBaseTiocnDto
* @return
*/
ResponseVO saveTenantAndApi( OcpBaseTiocnDto ocpBaseTiocnDto);
ResponseVO saveAndUpdateTenant(OcpBaseTiocnDto ocpBaseTiocnDto);
/**
* 应用树
......
......@@ -259,7 +259,7 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
}
/**
* 编辑中的模糊查询
* 省侧-应用接入申请-的模糊查询
*
* @param apiCode
* @param apiName
......
package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pms.ocp.mapper.OcpTenantBaseMapper;
import com.pms.ocp.model.entity.OcpTenantBase;
......@@ -23,6 +24,11 @@ public class OcpTenantBaseServiceImpl extends ServiceImpl<OcpTenantBaseMapper, O
*/
@Override
public boolean delectApply(String objId) {
if (StringUtils.isNotBlank(objId)){
return false;
}
OcpTenantBase ocpTenantBase = ocpTenantBaseMapper.selectById(objId);
ocpTenantBase.setIsDelete((short) 1);
ocpTenantBaseMapper.updateById(ocpTenantBase);
......
......@@ -3,9 +3,11 @@ package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pms.ocp.mapper.OcpTenantBaseMapper;
import com.pms.ocp.mapper.OcpTenantExtentMapper;
import com.pms.ocp.mapper.OcpTenantIocnMapper;
import com.pms.ocp.model.dto.OcpTenantGroupIocnDto;
import com.pms.ocp.model.entity.OcpTenantBase;
import com.pms.ocp.model.entity.OcpTenantExtent;
import com.pms.ocp.model.entity.OcpTenantIocn;
import com.pms.ocp.service.OcpTenantIocnService;
import org.springframework.beans.BeanUtils;
......@@ -26,6 +28,10 @@ public class OcpTenantIocnServiceImpl extends ServiceImpl<OcpTenantIocnMapper, O
@Autowired
private OcpTenantIocnMapper ocpTenantIocnMapper;
@Autowired
private OcpTenantExtentMapper ocpTenantExtentMapper;
/**
* 我的应用--服务列表
*
......@@ -36,19 +42,25 @@ public class OcpTenantIocnServiceImpl extends ServiceImpl<OcpTenantIocnMapper, O
List<OcpTenantGroupIocnDto> groupIocnDtos = new ArrayList<>();
List<OcpTenantBase> ocpTenantBases = ocpTenantBaseMapper.selectList(null);
List<OcpTenantIocn> ocpTenantIocns = ocpTenantIocnMapper.selectList(null);
List<String> companyCodes = new ArrayList<>();
List<OcpTenantExtent> ocpTenantExtents = ocpTenantExtentMapper.selectList(null);
for (OcpTenantBase ocpTenantBase : ocpTenantBases) {
OcpTenantGroupIocnDto ocpTenantGroupIocnDto = new OcpTenantGroupIocnDto();
if (ocpTenantBase.getIsDelete() == 0) {
BeanUtils.copyProperties(ocpTenantBase, ocpTenantGroupIocnDto);
String ownerCompanyCode = ocpTenantBase.getOwnerCompanyCode();
ocpTenantGroupIocnDto.setCompanyCode(ownerCompanyCode);
groupIocnDtos.add(ocpTenantGroupIocnDto);
String tenantCode = ocpTenantBase.getTenantCode();
// ocpTenantGroupIocnDto.setCompanyCode(ownerCompanyCode);
for (OcpTenantIocn ocpTenantIocn : ocpTenantIocns) {
if (ocpTenantIocn.getCompanyCode().equals(ocpTenantBase.getOwnerCompanyCode())){
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);
}
}
groupIocnDtos.add(ocpTenantGroupIocnDto);
}
}
return groupIocnDtos;
......
......@@ -20,6 +20,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.sql.Timestamp;
......@@ -32,6 +33,7 @@ import java.util.stream.Collectors;
@Service
@Slf4j
@Transactional
public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicManagementMapper, OcpTenantBase> implements TenantBasicManagementService {
@Autowired
private TenantBasicManagementMapper tenantBasicManagementMapper;
......@@ -330,7 +332,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
}
/**
* 个人信息-编辑
* 省测-应用接入申请-编辑和添加应用服务关系
*
* @param ocpBaseTiocnDto
* @return
......@@ -338,36 +340,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
@Override
public ResponseVO updateByCondition(OcpBaseTiocnDto ocpBaseTiocnDto) {
String tenantCode = ocpBaseTiocnDto.getTenantCode();
OcpTenantBase ocpTenantBase = new OcpTenantBase();
BeanUtils.copyProperties(ocpBaseTiocnDto, ocpTenantBase);
LambdaQueryWrapper<OcpTenantBase> lambdaQueryWrapper2 = new LambdaQueryWrapper<>();
lambdaQueryWrapper2.eq(OcpTenantBase::getTenantCode, tenantCode);
boolean flag = this.update(ocpTenantBase, lambdaQueryWrapper2);
if (flag) {
log.info("应用基础表修改成功");
System.out.println("应用基础表修改成功");
}
LambdaQueryWrapper<OcpTenantIocn> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(OcpTenantIocn::getCodeNo, tenantCode);
boolean remove = ocpTenantIocnService.remove(lambdaQueryWrapper);
if (remove) {
log.info("图标表删除成功");
System.out.println("图标表删除成功");
}
//添加新的数据到图标表
OcpTenantIocn ocpTenantIocn = new OcpTenantIocn();
Object iocn = ocpBaseTiocnDto.getIocn();
String ownerCompanyCode = ocpBaseTiocnDto.getOwnerCompanyCode();
ocpTenantIocn.setCodeNo(tenantCode);
ocpTenantIocn.setIocnType("tenant");
ocpTenantIocn.setIocn(iocn);
ocpTenantIocn.setCompanyCode(ownerCompanyCode);
boolean save = ocpTenantIocnService.save(ocpTenantIocn);
if (save) {
log.info("添加图标表成功");
System.out.println("添加图标表成功");
}
//先删除应用服务关联
LambdaQueryWrapper<OcpApiTenantRel> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
lambdaQueryWrapper1.eq(OcpApiTenantRel::getTenantCode, tenantCode);
......@@ -377,7 +350,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
}
String apiCodes = ocpBaseTiocnDto.getApiCodes();
if (StringUtils.isEmpty(apiCodes)) {
return ResponseVO.error("请选择你要关联的服务");
return ResponseVO.ok("没有关联服务");
}
String[] split = apiCodes.split(",");
List<String> apiCode = Arrays.asList(split);
......@@ -387,8 +360,8 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
ocpApiTenantRel.setApiCode(s);
ocpApiTenantRel.setApiDepCompanyCode(ownerCompanyCode);
ocpApiTenantRel.setTenantDepCompanyCode(ownerCompanyCode);
ocpApiTenantRel.setApiTenantRelCtime(Timestamp.valueOf(LocalDateTime.now()));
ocpApiTenantRel.setApiTenantRelMtime(Timestamp.valueOf(LocalDateTime.now()));
ocpApiTenantRel.setApiTenantRelCtime(new Timestamp(System.currentTimeMillis()));
ocpApiTenantRel.setApiTenantRelMtime(new Timestamp(System.currentTimeMillis()));
boolean save1 = ocpApiTenantRelService.save(ocpApiTenantRel);
if (save1) {
log.info("添加关联表成功");
......@@ -398,7 +371,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
}
/**
* 个人信息中-查询和应用关联的服务
* 省测-应用接入申请-查询和应用关联的服务
*
* @param tenantCode
* @return
......@@ -408,7 +381,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
LambdaQueryWrapper<OcpApiTenantRel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(StringUtils.isNotEmpty(tenantCode), OcpApiTenantRel::getTenantCode, tenantCode);
List<OcpApiTenantRel> ocpApiTenantRel = ocpApiTenantRelMapper.selectList(lambdaQueryWrapper);
List<OcpApiBase> list = new ArrayList<>();
if (ocpApiTenantRel.size() == 0) {
return ResponseVO.ok(Collections.EMPTY_LIST);
} else {
......@@ -416,48 +389,69 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
LambdaQueryWrapper<OcpApiBase> queryWrapper = new LambdaQueryWrapper<>();
String apiCode = apiTenantRel.getApiCode();
queryWrapper.eq(StringUtils.isNotEmpty(apiCode), OcpApiBase::getApiCode, apiCode);
List<OcpApiBase> list = apiBasicManagementMapper.selectList(queryWrapper);
return ResponseVO.ok(list);
OcpApiBase ocpApiBase = apiBasicManagementMapper.selectOne(queryWrapper);
list.add(ocpApiBase);
}
}
return ResponseVO.ok();
return ResponseVO.ok(list);
}
/**
* 添加应用服务关系
* 省测-应用接入申请-编辑和发布应用
*
* @param ocpBaseTiocnDto
* @return
*/
@Override
public ResponseVO saveTenantAndApi(OcpBaseTiocnDto ocpBaseTiocnDto) {
String apiCodes = ocpBaseTiocnDto.getApiCodes();
public ResponseVO saveAndUpdateTenant(OcpBaseTiocnDto ocpBaseTiocnDto) {
String tenantCode = ocpBaseTiocnDto.getTenantCode();
String[] split = apiCodes.split(",");
List<String> apiCode = Arrays.asList(split);
if (apiCode.size() == 0) {
return ResponseVO.error("请选择你要关联的服务");
OcpTenantBase ocpTenantBase = new OcpTenantBase();
BeanUtils.copyProperties(ocpBaseTiocnDto, ocpTenantBase);
LambdaQueryWrapper<OcpTenantBase> lambdaQueryWrapper2 = new LambdaQueryWrapper<>();
lambdaQueryWrapper2.eq(OcpTenantBase::getTenantCode, tenantCode);
// boolean flag = this.update(ocpTenantBase, lambdaQueryWrapper2);
// if (flag) {
// log.info("应用基础表修改成功");
// System.out.println("应用基础表修改成功");
// }
int delete = tenantBasicManagementMapper.delete(lambdaQueryWrapper2);
if (delete == 0) {
log.info("增加");
} else {
log.info("编辑");
}
//先删除之前关联的
LambdaQueryWrapper<OcpApiTenantRel> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(StringUtils.isNotEmpty(tenantCode), OcpApiTenantRel::getTenantCode, tenantCode);
ocpApiTenantRelMapper.delete(queryWrapper);
for (String s : apiCode) {
OcpApiTenantRel rel = new OcpApiTenantRel();
rel.setApiCode(s);
rel.setTenantCode(tenantCode);
rel.setApiTenantRelMtime(new Timestamp(System.currentTimeMillis()));
rel.setApiTenantRelCtime(new Timestamp(System.currentTimeMillis()));
rel.setApiDepCompanyCode(ocpBaseTiocnDto.getOwnerCompanyCode());
rel.setTenantDepCompanyCode(ocpBaseTiocnDto.getOwnerCompanyCode());
int insert = ocpApiTenantRelMapper.insert(rel);
if (insert > 0) {
return ResponseVO.ok("添加成功");
} else {
return ResponseVO.error("添加失败");
}
boolean save1 = this.save(ocpTenantBase);
if (save1) {
log.info("基础表添加成功");
}
LambdaQueryWrapper<OcpTenantIocn> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(OcpTenantIocn::getCodeNo, tenantCode);
boolean remove = ocpTenantIocnService.remove(lambdaQueryWrapper);
if (remove) {
log.info("图标表删除成功");
System.out.println("图标表删除成功");
}
//添加新的数据到图标表
OcpTenantIocn ocpTenantIocn = new OcpTenantIocn();
Object iocn = ocpBaseTiocnDto.getIocn();
String ownerCompanyCode = ocpBaseTiocnDto.getOwnerCompanyCode();
ocpTenantIocn.setCodeNo(tenantCode);
ocpTenantIocn.setIocnType("tenant");
ocpTenantIocn.setIocn(iocn);
ocpTenantIocn.setCompanyCode(ownerCompanyCode);
boolean save = ocpTenantIocnService.save(ocpTenantIocn);
if (save) {
log.info("添加图标表成功");
System.out.println("添加图标表成功");
}
if (save1 && save) {
return ResponseVO.ok("添加成功");
}
return ResponseVO.error("系统异常");
return ResponseVO.error("未知错误");
}
/**
......
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