diff --git a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java index b1c96676e4720f6d00f02e3b4125eeed11140ab0..e480b935647fe7bf998382dbc0a6ec227620ec2b 100644 --- a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java +++ b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java @@ -77,7 +77,7 @@ public class OcpApiTreeController { if (flag){ return ResponseVO.ok(); } - return ResponseVO.error("您输入的服务编码重复，请重新输入"); + return ResponseVO.error("您输入的服务名称重复，请重新输入"); } @PostMapping("/deletetree") @ApiOperation("服务树分类--删除") diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantController.java b/src/main/java/com/pms/ocp/controller/OcpTenantController.java index abb33f194cb52f72fa5da7f7bd8dc47b28330099..9c8c0e1a9350ba74cd321d6ed6604ef20c4ee8f9 100644 --- a/src/main/java/com/pms/ocp/controller/OcpTenantController.java +++ b/src/main/java/com/pms/ocp/controller/OcpTenantController.java @@ -68,7 +68,7 @@ public class OcpTenantController { if (falg){ return ResponseVO.ok("修改成功！"); } - return ResponseVO.error("应用code已经存在！"); + return ResponseVO.error("应用名称已经存在！"); } @PostMapping("/tenantdelete") @ApiModelProperty("删除服务") diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java index 3f66a96a14b60c335e902a1d0fd431c2aa1861bf..3fe022d99441984b1f2cd9ab3a10fa5d6b5ba9b7 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java @@ -21,4 +21,9 @@ public interface OcpTenantBaseMapper extends BaseMapper { * @return */ int queryCount(String appCode); + + + List selcctCodeList(String ocpTenantGroup); + + int queryName(String appName); } diff --git a/src/main/java/com/pms/ocp/model/entity/PmsApiMangageApi.java b/src/main/java/com/pms/ocp/model/entity/PmsApiMangageApi.java index 3d605c83b26a8f5a740c6c735dc3cdb106c0a67f..702ad688676122684131a296cbe0bfdecf673232 100644 --- a/src/main/java/com/pms/ocp/model/entity/PmsApiMangageApi.java +++ b/src/main/java/com/pms/ocp/model/entity/PmsApiMangageApi.java @@ -100,7 +100,8 @@ public class PmsApiMangageApi { @ApiModelProperty("上级code") private String apiGroupPcode; - + @ApiModelProperty("服务类型") + private String professionalKind; @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ") private String apiGroupLevel; @@ -172,6 +173,14 @@ public class PmsApiMangageApi { this.objIds = objIds; } + public String getProfessionalKind() { + return professionalKind; + } + + public void setProfessionalKind(String professionalKind) { + this.professionalKind = professionalKind; + } + public boolean getBoole() { return boole; } diff --git a/src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java b/src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java index db55e30a52aff320daf9bd48279a553539b97a69..f248489fe50a9e9979e88a82f185152f4028b888 100644 --- a/src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java +++ b/src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java @@ -137,7 +137,8 @@ public class OcpApiBaseVo implements Serializable { @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ") private String apiGroupLevel; - + @ApiModelProperty("所属专业; ts:输电,t:变电, dc:直流，ds配电，tc:技术，pl计划 im综合") + private String professionalKind; // @ApiModelProperty("图标种类tenant:应用图标api:服务图标") private String iocnType; @@ -151,6 +152,30 @@ public class OcpApiBaseVo implements Serializable { @ApiModelProperty("所属公司可能会根据公司分区") private String companyCode; + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getProfessionalKind() { + return professionalKind; + } + + public void setProfessionalKind(String professionalKind) { + this.professionalKind = professionalKind; + } + public String getApiGroupCode() { return apiGroupCode; } diff --git a/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java index c0ddead56d2f2ccac20274d3f5d8c68a4ac59d83..84f6f3194ebc61e4fa3a23764a4ec54fdd89123a 100644 --- a/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java @@ -51,8 +51,9 @@ public class AppRegisterServiceImpl implements AppRegisterService { int count = ocpTenantBaseMapper.queryCount(appRegisterDTO.getAppCode()); int c = ocpTenantExtentMapper.queryCount(appRegisterDTO.getAppCode()); - if (count != 0 || c != 0) { - return ResponseVO.error("应用编码有重复/应用扩展表编码有重复"); + int nc = ocpTenantBaseMapper.queryName(appRegisterDTO.getAppName()); + if (count != 0 || c != 0 || nc != 0) { + return ResponseVO.error("应用编码有重复/应用扩展表编码有重复/应用名称有重复"); } OcpTenantIocn ocpTenantIocn = new OcpTenantIocn(); diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java index 3a7cf17f2ee5addd32b710979c630cf9da2a0d3c..eb53e370a1d4758ace0f4dea98fea076edaa1c97 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -16,12 +16,14 @@ import com.pms.ocp.model.entity.OcpTenantGroup; import com.pms.ocp.service.OcpApiTreeService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.ibatis.javassist.runtime.Desc; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.sql.Timestamp; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.stream.Stream; @@ -41,6 +43,8 @@ public class OcpApiTreeServiceImpl extends ServiceImpl apiGroupStream1 = ocpApiGroupStream.filter(ocp -> ocp.getApiGroupName().equals(ocpApiGroup.getApiGroupName())); List ocpApiGroups1 = mapper.selectGroupName(ocpApiGroup.getApiGroupName()); OcpApiGroup ocpApi = new OcpApiGroup(); - if (ocpApiGroups1.size() == 0) { ocpApi.setApiGroupPromotionType(ocpApiGroup.getApiGroupPromotionType()); @@ -123,14 +126,16 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpApiGroups = mapper.selectList(null); for (OcpApiGroup apiGroup : ocpApiGroups) { - String code = apiGroup.getApiGroupCode(); - if (code == ocpApiGroup.getApiGroupCode()) { + String name = apiGroup.getApiGroupName(); + if (name.equals(ocpApiGroup.getApiGroupName())) { falg = false; break; } } - ocpApiGroup.setApiGroupMtime(timestamp); - mapper.updateById(ocpApiGroup); + if (falg) { + ocpApiGroup.setApiGroupMtime(timestamp); + mapper.updateById(ocpApiGroup); + } return falg; } @@ -170,12 +175,13 @@ public class OcpApiTreeServiceImpl extends ServiceImpl qw = new LambdaQueryWrapper<>(); if (StringUtils.isBlank(pageGroupDto.getKeyword())) { if (StringUtils.isBlank(pageGroupDto.getApiGroupCode())) { - qw.eq(OcpApiGroup::getApiGroupPromotionType, pageGroupDto.getApiGroupPromotionType()); + qw.eq(OcpApiGroup::getApiGroupPromotionType, pageGroupDto.getApiGroupPromotionType()).orderByDesc(OcpApiGroup::getApiGroupMtime); + mapper.selectPage(pageInfo, qw); } else if (!(StringUtils.isNotBlank(pageGroupDto.getApiGroupPcode()))) { List ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(), pageGroupDto.getApiGroupCode()); - qw.eq(OcpApiGroup::getApiGroupPromotionType, pageGroupDto.getApiGroupPromotionType()).and(c -> c.eq(OcpApiGroup::getApiGroupPcode, pageGroupDto.getApiGroupCode())); + qw.eq(OcpApiGroup::getApiGroupPromotionType, pageGroupDto.getApiGroupPromotionType()).and(c -> c.eq(OcpApiGroup::getApiGroupPcode, pageGroupDto.getApiGroupCode())).orderByDesc(OcpApiGroup::getApiGroupMtime); pageInfo.setRecords(ocpApiGroups); mapper.selectPage(pageInfo, qw); List records = pageInfo.getRecords(); @@ -189,12 +195,12 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpApiGroup::getApiGroupName, pageGroupDto.getKeyword())) - .and(c->c.eq(OcpApiGroup::getApiGroupPromotionType,pageGroupDto.getApiGroupPromotionType())); + .and(c->c.eq(OcpApiGroup::getApiGroupPromotionType,pageGroupDto.getApiGroupPromotionType())).orderByDesc(OcpApiGroup::getApiGroupMtime); mapper.selectPage(pageInfo, ocpTenantGroupLambdaQueryWrapper); }else if (StringUtils.isNotBlank(pageGroupDto.getApiGroupCode())) { LambdaQueryWrapper ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpApiGroup::getApiGroupName, pageGroupDto.getKeyword())) - .and(c -> c.eq(OcpApiGroup::getApiGroupPcode, pageGroupDto.getApiGroupCode())); + .and(c -> c.eq(OcpApiGroup::getApiGroupPcode, pageGroupDto.getApiGroupCode())).orderByDesc(OcpApiGroup::getApiGroupMtime); mapper.selectPage(pageInfo, ocpTenantGroupLambdaQueryWrapper); } } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java index df5ffff75db7327472c7a83c47f8ab322e881153..75eb4c76519b7cd5af1ddea72cf8d8011a9aa2ee 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantIocnServiceImpl.java @@ -77,7 +77,7 @@ public class OcpTenantIocnServiceImpl extends ServiceImpl lists = new ArrayList<>(); List groupIocnDtos = ocpTenantBaseMapper.selectAlls(); for (OcpTenantGroupIocnDto groupIocnDto : groupIocnDtos) { diff --git a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java index 22abfe23dd5d1b5eb281cf770ea341da7dbc59dd..1c0c43fa0cd00378a50168d6b0bff328fd1fa2f5 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -6,9 +6,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageInfo; import com.pms.ocp.common.utils.RandomStringUtils; +import com.pms.ocp.mapper.OcpTenantBaseMapper; import com.pms.ocp.mapper.TenantBasicManagementMapper; import com.pms.ocp.mapper.TenantMapper; import com.pms.ocp.model.dto.*; +import com.pms.ocp.model.entity.OcpTenantBase; import com.pms.ocp.model.entity.OcpTenantGroup; import com.pms.ocp.service.TenantService; import org.apache.commons.lang3.StringUtils; @@ -32,6 +34,10 @@ public class TenantServiceImpl extends ServiceImpl @Autowired private TenantBasicManagementMapper tenantBasicMapper; + + @Autowired + private OcpTenantBaseMapper ocpTenantBaseMapper; + /** * 应用树分类管理 * @@ -64,6 +70,12 @@ public class TenantServiceImpl extends ServiceImpl @Override public OcpTenantGroup getTenanInster(TenanBaseDto tenanBaseDto) { boolean falg = true; + if (StringUtils.isNotBlank(tenanBaseDto.getTenantGroupCode())) { + List ocpTenantBases = ocpTenantBaseMapper.selcctCodeList(tenanBaseDto.getTenantGroupCode()); + if (ocpTenantBases.size() > 0) { + falg = false; + } + } OcpTenantGroup group = new OcpTenantGroup(); String randomString = RandomStringUtils.getRandomString(6); @@ -105,8 +117,11 @@ public class TenantServiceImpl extends ServiceImpl tenanBaseDto.setClassIfy(tenanBaseDto.getTenantGroupCode()); tenantMapper.insert(group); } + + return group; + } /** @@ -121,15 +136,17 @@ public class TenantServiceImpl extends ServiceImpl boolean falg = true; List ocpTenantGroupList = tenantMapper.selectList(null); for (OcpTenantGroup ocpApiGroup : ocpTenantGroupList) { - String code = ocpTenantGroup.getTenantGroupCode(); - if (code == ocpApiGroup.getTenantGroupCode()) { + String name = ocpTenantGroup.getTenantGroupName(); + if (name.equals(ocpApiGroup.getTenantGroupName())) { falg = false; break; } } - OcpTenantGroup ocpTenantGroup1 = new OcpTenantGroup(); - ocpTenantGroup1.setTenantGroupMtime(timestamp); - tenantMapper.updateById(ocpTenantGroup); + if (falg) { + OcpTenantGroup ocpTenantGroup1 = new OcpTenantGroup(); + ocpTenantGroup1.setTenantGroupMtime(timestamp); + tenantMapper.updateById(ocpTenantGroup); + } return falg; } @@ -176,18 +193,17 @@ public class TenantServiceImpl extends ServiceImpl if (StringUtils.isBlank(keyword)) { if (StringUtils.isBlank(lev) || "1".equals(lev)) { - LambdaQueryWrapper eq = qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode); + LambdaQueryWrapper eq = qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode).orderByDesc(OcpTenantGroup::getTenantGroupMtime); tenantMapper.selectPage(page, eq); } else if ("2".equals(lev) || "3".equals(lev)) { LambdaQueryWrapper eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)) - .eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode); + .eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode).orderByDesc(OcpTenantGroup::getTenantGroupMtime); tenantMapper.selectPage(page, eq); } } else if (!(StringUtils.isBlank(keyword))) { LambdaQueryWrapper ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpTenantGroup::getTenantGroupCompanyCode, keyword)) .or().like(OcpTenantGroup::getTenantGroupName, keyword) - .or().like(OcpTenantGroup::getTenantGroupPcode, keyword) - .or().like(OcpTenantGroup::getTenantGroupUserName, keyword); + .orderByDesc(OcpTenantGroup::getTenantGroupMtime); tenantMapper.selectPage(page, ocpTenantGroupLambdaQueryWrapper); // OcpTenantGroup ocpTenantGroup1 = new OcpTenantGroup(); @@ -204,6 +220,21 @@ public class TenantServiceImpl extends ServiceImpl record.setClassIfy(ocpTenantGroup1.getTenantGroupName()); } } + if (StringUtils.isBlank(tenantGroupCode)) { + List records = page.getRecords(); + for (OcpTenantGroup record : records) { + record.setClassIfy(record.getTenantGroupName()); + } + } + + if (StringUtils.isNotBlank(tenantGroupCode)) { + OcpTenantGroup ocpTenantGroup1 = tenantMapper.selectGroupName(tenantGroupCode); + String tenantGroupName = ocpTenantGroup1.getTenantGroupName(); + List records = page.getRecords(); + for (OcpTenantGroup record : records) { + record.setClassIfy(tenantGroupName); + } + } return page; diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 0f73a771b24d9d846ed7b0ba83cb759e686069ba..14636013b4c51929a3a1f94fb6a23df332dd1d1f 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -2,7 +2,7 @@ spring: datasource: driver-class-name: org.postgresql.Driver username: postgres - password: 1234 + password: root type: com.zaxxer.hikari.HikariDataSource # jdbc-url: jdbc:postgresql://192.168.43.20:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true # jdbc-url: jdbc:postgresql://172.20.10.9:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true diff --git a/src/main/resources/mapper/OcpTenantBaseMapper.xml b/src/main/resources/mapper/OcpTenantBaseMapper.xml index 9d7566caba87f87a848b113162df6533dc28039a..20df46ec1bcd83dc3c75b64f7d1ccbda8a82ae10 100644 --- a/src/main/resources/mapper/OcpTenantBaseMapper.xml +++ b/src/main/resources/mapper/OcpTenantBaseMapper.xml @@ -1,13 +1,6 @@ - + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/PmsApiManagementMapper.xml b/src/main/resources/mapper/PmsApiManagementMapper.xml index adc7646f59bba3d6a4abf6937030ce5099ecc7b0..69dd2c45ab5599175191aac08a0fbb99ecc93da9 100644 --- a/src/main/resources/mapper/PmsApiManagementMapper.xml +++ b/src/main/resources/mapper/PmsApiManagementMapper.xml @@ -69,10 +69,10 @@ insert into ocp_api_base(obj_id,api_code,api_name,api_group_code,api_promotion,api_req, api_resp,api_url,api_ctime,api_mtime,api_user_id,api_unit,owner_company_code,is_delete, - api_zone,api_layer,api_version,api_center_code,api_description,api_user_name) + api_zone,api_layer,api_version,api_center_code,api_description,api_user_name,professional_kind) values (#{objId},#{apiCode},#{apiName},#{apiGroupCode},#{apiPromotion},#{apiReq}, #{apiResp},#{apiUrl},#{apiCtime},#{apiMtime},#{apiUserId},#{apiUnit},#{ownerCompanyCode}, - #{isDelete},#{apiZone},#{apiLayer},#{apiVersion},#{apiCenterCode},#{apiDescription},#{apiUserName}) + #{isDelete},#{apiZone},#{apiLayer},#{apiVersion},#{apiCenterCode},#{apiDescription},#{apiUserName},#{professionalKind})