Commit d7e23150 authored by liukai's avatar liukai

问题修复

parent cfa189ba
...@@ -31,7 +31,7 @@ public class PmsTenantDetailsController { ...@@ -31,7 +31,7 @@ public class PmsTenantDetailsController {
private PmsTenantSubsService pmsTenantSubsService; private PmsTenantSubsService pmsTenantSubsService;
@Autowired @Autowired
private OcpApiTenantRelService ocpApiTenantRelService; private PmsApiTenantRelService pmsApiTenantRelService;
@ApiOperation("应用基础信息-查询") @ApiOperation("应用基础信息-查询")
...@@ -53,11 +53,11 @@ public class PmsTenantDetailsController { ...@@ -53,11 +53,11 @@ public class PmsTenantDetailsController {
return pmsTenantSubsService.getOcpTenantList(pmsTenantSubs); return pmsTenantSubsService.getOcpTenantList(pmsTenantSubs);
} }
// @ApiOperation("应用与服务拓扑图-查询") @ApiOperation("应用与服务拓扑图-查询")
// @PostMapping("/getOcpTenantApiList") @PostMapping("/getOcpTenantApiList")
// public ResponseVO<List<OcpApiTenantRel>> getOcpTenantApiList(@RequestBody OcpApiTenantRel ocpApiTenantRel) { public ResponseVO<List<PmsApiTenantRel>> getOcpTenantApiList(@RequestBody PmsApiTenantRel pmsApiTenantRel) {
// return ocpApiTenantRelService.getTenantApiList(ocpApiTenantRel); return pmsApiTenantRelService.getTenantApiList(pmsApiTenantRel);
// } }
@ApiOperation("应用大事记-导出") @ApiOperation("应用大事记-导出")
@PostMapping("/export") @PostMapping("/export")
......
...@@ -8,7 +8,7 @@ import java.util.List; ...@@ -8,7 +8,7 @@ import java.util.List;
@Mapper @Mapper
public interface OcpApiModelRelMapper extends BaseMapper<OcpApiModelRel> { public interface OcpApiModelRelMapper extends BaseMapper<OcpApiModelRel> {
List<OcpApiModelRel> getOamrList(OcpApiModelRel ocpApiModelRel);
} }
...@@ -6,11 +6,5 @@ import com.pms.ocp.model.entity.OcpTenantAudit; ...@@ -6,11 +6,5 @@ import com.pms.ocp.model.entity.OcpTenantAudit;
import java.util.List; import java.util.List;
public interface OcpTenantAuditMapper extends BaseMapper<OcpTenantAudit> { public interface OcpTenantAuditMapper extends BaseMapper<OcpTenantAudit> {
List<OcpTenantAudit> getOtaList(OcpTenantAudit ocpTenantAudit);
List<OcpTenantAudit> getOtaListById(OcpTenantAudit ocpTenantAudit);
List<OcpTenantAudit> OtaById(OcpTenantAudit ocpTenantAudit);
List<OcpTenantAudit> versionId(OcpTenantAudit ocpTenantAudit);
} }
...@@ -6,5 +6,5 @@ import com.pms.ocp.model.entity.OcpTenantBase; ...@@ -6,5 +6,5 @@ import com.pms.ocp.model.entity.OcpTenantBase;
import java.util.List; import java.util.List;
public interface OcpTenantBaseMapper extends BaseMapper<OcpTenantBase> { public interface OcpTenantBaseMapper extends BaseMapper<OcpTenantBase> {
List<OcpTenantBase> getOtbList(OcpTenantBase ocpTenantBase);
} }
...@@ -8,5 +8,5 @@ import java.util.List; ...@@ -8,5 +8,5 @@ import java.util.List;
@Mapper @Mapper
public interface OcpTenantSubsMapper extends BaseMapper<OcpTenantSubs> { public interface OcpTenantSubsMapper extends BaseMapper<OcpTenantSubs> {
List<OcpTenantSubs> getOcpTenantList(OcpTenantSubs ocpTenantSubs);
} }
<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.pms.ocp.mapper.OcpApiModelRelMapper">
<select id="getOamrList" resultType="com.pms.ocp.model.entity.OcpApiModelRel">
select * from ocp_api_model_rel oamr
LEFT JOIN ocp_model_base omb
on oamr.model_code = omb.model_code
INNER JOIN ocp_api_base oab
on oamr.api_code = oab.api_code
where oamr.obj_id = #{objId}
</select>
</mapper>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.pms.ocp.mapper.OcpTenantAuditMapper">
<select id="getOtaList" resultType="com.pms.ocp.model.entity.OcpTenantAudit">
select * from ocp_tenant_audit
</select>
<select id="getOtaListById" resultType="com.pms.ocp.model.entity.OcpTenantAudit">
select * from ocp_tenant_audit where obj_id = #{objId}
</select>
<select id="OtaById" resultType="com.pms.ocp.model.entity.OcpTenantAudit">
select * from ocp_tenant_audit ota
LEFT JOIN ocp_tenant_base otb
on ota.tenant_code = otb.tenant_code
where ota.tenant_code = #{tenantCode}
</select>
<select id="versionId" resultType="com.pms.ocp.model.entity.OcpTenantAudit">
select * from ocp_tenant_audit ota
LEFT JOIN ocp_tenant_base otb
on ota.tenant_code = otb.tenant_code
where ota.tenant_code = #{tenantCode}
</select>
</mapper>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.pms.ocp.mapper.OcpTenantSubsMapper">
<select id="getOcpTenantList" resultType="com.pms.ocp.model.entity.OcpTenantSubs">
SELECT * from ocp_tenant_subs ots
left JOIN ocp_tenant_base otb on
ots.tenant_code = otb.tenant_code
</select>
</mapper>
\ No newline at end of file
...@@ -10,7 +10,22 @@ ...@@ -10,7 +10,22 @@
</select> </select>
<select id="getOcpApiSubsList" resultType="com.pms.ocp.model.entity.PmsApiAudit"> <select id="getOcpApiSubsList" resultType="com.pms.ocp.model.entity.PmsApiAudit">
select * from ocp_api_audit select
obj_id,
api_code,
oper_status,
oper_target,
audit_type,
audit_message,
audit_json,
audit_user_id,
audit_user_name,
audit_ctime,
audit_mtime,
is_delete,
apply_version,
pre_api_version
from ocp_api_audit
</select> </select>
<select id="sById" resultType="com.pms.ocp.model.entity.PmsApiAudit"> <select id="sById" resultType="com.pms.ocp.model.entity.PmsApiAudit">
......
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