Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

不同工程下项目名可重复校验

Browse Source
This commit is contained in:
huangzj
2023-08-10 10:14:13 +08:00
parent 123fdf4f04
commit 59ffec30e5
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectAuditParm.java
View File

@@ -23,6 +23,7 @@ public class AppProjectAuditParm {
@ApiModelProperty(value="项目名称") @ApiModelProperty(value="项目名称")
private String name; private String name;
private String engineeringId;

2
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/ProjectEquipmentVO.java
View File

@@ -47,6 +47,6 @@ public class ProjectEquipmentVO {
private String createTime; private String createTime;
@ApiModelProperty(value = "是否是主用户0-否，1-是") @ApiModelProperty(value = "是否是主用户0-否，1-是")
private String isPrimaryUser; private String isPrimaryUser;
private Integer runStatus;
} }

3
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsEquipmentDeliveryMapper.xml
View File

@@ -38,7 +38,8 @@
b.name projectName, b.name projectName,
c.id equipmentId, c.id equipmentId,
c.name equipmentName, c.name equipmentName,
c.create_time createTime c.create_time createTime,
c.run_status
FROM FROM
(select * from cs_ledger where LEVEL = 0 ) a, (select * from cs_ledger where LEVEL = 0 ) a,
(select * from cs_ledger where LEVEL = 1 ) b, (select * from cs_ledger where LEVEL = 1 ) b,

15
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java
View File

@@ -58,7 +58,7 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
// throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR); // throw new BusinessException (AlgorithmResponseEnum.PROJECT_COMMON_ERROR);
// } // }
if(checkName(appProjectAddOrAuditParm.getName(),"")){ if(checkName(appProjectAddOrAuditParm.getName(),"",appProjectAddOrAuditParm.getEngineeringId())){
throw new BusinessException(AlgorithmResponseEnum.PROJECT_COMMON_ERROR); throw new BusinessException(AlgorithmResponseEnum.PROJECT_COMMON_ERROR);
} }
BeanUtils.copyProperties (appProjectAddOrAuditParm, appProjectPO); BeanUtils.copyProperties (appProjectAddOrAuditParm, appProjectPO);
@@ -120,14 +120,14 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
return save; return save;
} }
private Boolean checkName( String name,String id) { private Boolean checkName( String name,String id,String engineeringId) {
QueryWrapper<AppProjectPO> queryWrapper = new QueryWrapper ( ); QueryWrapper<CsLedger> queryWrapper = new QueryWrapper ( );
queryWrapper.select ("1"). queryWrapper.select ("1").
eq ("status", "1"). eq ("state", 1).
ne(StringUtils.isNotBlank(id),"id",id). ne(StringUtils.isNotBlank(id),"id",id).eq("pid",engineeringId).
// eq ("user_id", userId). // eq ("user_id", userId).
eq ("name", name); eq ("name", name);
Integer integer = appProjectMapper.selectCount (queryWrapper); Integer integer = csLedgerMapper.selectCount (queryWrapper);
return integer > 0 ? true : false; return integer > 0 ? true : false;
} }
@@ -166,7 +166,8 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
} }
if(checkName(appProjectAuditParm.getName(),appProjectAuditParm.getId())){
if(checkName(appProjectAuditParm.getName(),appProjectAuditParm.getId(),appProjectAuditParm.getEngineeringId())){
throw new BusinessException(AlgorithmResponseEnum.PROJECT_COMMON_ERROR); throw new BusinessException(AlgorithmResponseEnum.PROJECT_COMMON_ERROR);
} }