ljf
/
shuili
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix：修复任务名唯一性校验

master_tdsql
huangrenya 1 year ago
parent
d225afff54
commit
0b2dc6cbfb
5 changed files with 39 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      shuili-common/src/main/java/com/shuili/common/exception/file/InvalidExtensionException.java
  2. 2
      shuili-framework/src/main/java/com/shuili/common/exception/InvalidExtensionException.java
  3. 2
      shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java
  4. 21
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousTaskService.java
  5. 21
      shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDangerousTaskService.java

2
shuili-common/src/main/java/com/shuili/common/exception/file/InvalidExtensionException.java
View File

@ -18,7 +18,7 @@ public class InvalidExtensionException extends FileUploadException
public InvalidExtensionException(String[] allowedExtension, String extension, String filename)
{
super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]");
super("文件名 : [" + filename + "], 该文件格式不支持, 支持的文件类型 : [" + Arrays.toString(allowedExtension) + "]");
this.allowedExtension = allowedExtension;
this.extension = extension;
this.filename = filename;

2
shuili-framework/src/main/java/com/shuili/common/exception/InvalidExtensionException.java
View File

@ -18,7 +18,7 @@ public class InvalidExtensionException extends FileUploadException
public InvalidExtensionException(String[] allowedExtension, String extension, String filename)
{
super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]");
super("文件名 : [" + filename + "], 该文件格式不支持, 支持的文件类型 : [" + Arrays.toString(allowedExtension) + "]");
this.allowedExtension = allowedExtension;
this.extension = extension;
this.filename = filename;

2
shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java
View File

@ -30,7 +30,7 @@ public interface BsSgcSzGcdaMapper extends BaseMapper<BsSgcSzGcda> {
"and waga_name like concat('%', #{dto.wagaName}, '%') ",
"</if>",
"<if test='dto.wagaType != null and dto.wagaType != \"\"'>",
"and waga_type = #{dto.wagaType} ",
"and FIND_IN_SET(#{dto.wagaType} , REPLACE(REPLACE(REPLACE(WAGA_TYPE, '[', ''), ']', ''), '\"', '')) ",
"</if>",
"<if test='dto.adcd!= null and dto.adcd != \"\"'>",
"and adcd = #{dto.adcd} ",

21
shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousTaskService.java
View File

@ -1,5 +1,6 @@
package com.kms.yxgh.df.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -46,13 +47,17 @@ public class DfDangerousTaskService extends BaseService<DfDangerousTaskMapper, D
@Transactional(rollbackFor = Exception.class)
public DfDangerousTaskDto add(DfDangerousTaskDto dto) {
if (!checkNameDistinct(dto.getId(), dto.getName())) {
throw new SzException("该任务名称已存在");
}
if(StringUtils.isBlank(dto.getDikeCode())){
throw new SzException("请选择堤防！");
}
DfDangerousTask dfDangerousTask = BeanCopyUtils.copy(dto, DfDangerousTask.class);
// 根据dikeCode循环分割获取批量新增
String[] dikeCodes = dto.getDikeCode().split(",");
String[] dikeNames = dto.getDikeName().split(",");
if(StringUtils.isBlank(dto.getDikeCode())){
throw new SzException("请选择堤防！");
}
for (int i = 0; i < dikeCodes.length; i++) {
String name = dto.getName();
if (dikeCodes.length > 1) {
@ -65,6 +70,13 @@ public class DfDangerousTaskService extends BaseService<DfDangerousTaskMapper, D
return BeanCopyUtils.copy(dfDangerousTask, DfDangerousTaskDto.class);
}
private boolean checkNameDistinct(String id, String name) {
Wrapper<DfDangerousTask> wp = Wrappers.<DfDangerousTask>lambdaQuery()
.eq(DfDangerousTask::getName, name)
.ne(StringUtils.isNotEmpty(id), DfDangerousTask::getId, id);
return this.getBaseMapper().selectCount(wp) <= 0;
}
@Transactional(rollbackFor = Exception.class)
public Boolean deleteById(String id) {
return this.removeById(id);
@ -72,6 +84,9 @@ public class DfDangerousTaskService extends BaseService<DfDangerousTaskMapper, D
@Transactional(rollbackFor = Exception.class)
public DfDangerousTaskDto modify(DfDangerousTaskDto dto) {
if (!checkNameDistinct(dto.getId(), dto.getName())) {
throw new SzException("该任务名称已存在");
}
DfDangerousTask dfDangerousTask = BeanCopyUtils.copy(dto, DfDangerousTask.class);
this.updateById(dfDangerousTask);
return BeanCopyUtils.copy(dfDangerousTask, DfDangerousTaskDto.class);

21
shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDangerousTaskService.java
View File

@ -1,5 +1,6 @@
package com.kms.yxgh.sz.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -46,13 +47,17 @@ public class SzDangerousTaskService extends BaseService<SzDangerousTaskMapper, S
@Transactional(rollbackFor = Exception.class)
public SzDangerousTaskDto add(SzDangerousTaskDto dto) {
if (!checkNameDistinct(dto.getId(), dto.getName())) {
throw new SzException("该任务名称已存在");
}
if(StringUtils.isBlank(dto.getWagaCode())){
throw new SzException("请选择水闸！");
}
SzDangerousTask dangerousTask = BeanCopyUtils.copy(dto, SzDangerousTask.class);
// 根据wagaCode循环分割获取批量新增
String[] wagaCodes = dto.getWagaCode().split(",");
String[] wagaNames = dto.getWagaName().split(",");
if(StringUtils.isBlank(dto.getWagaCode())){
throw new SzException("请选择水闸！");
}
for (int i = 0; i < wagaCodes.length; i++) {
String name = dto.getName();
if (wagaCodes.length > 1) {
@ -65,6 +70,13 @@ public class SzDangerousTaskService extends BaseService<SzDangerousTaskMapper, S
return BeanCopyUtils.copy(dangerousTask, SzDangerousTaskDto.class);
}
private boolean checkNameDistinct(String id, String name) {
Wrapper<SzDangerousTask> wp = Wrappers.<SzDangerousTask>lambdaQuery()
.eq(SzDangerousTask::getName, name)
.ne(StringUtils.isNotEmpty(id), SzDangerousTask::getId, id);
return this.getBaseMapper().selectCount(wp) <= 0;
}
@Transactional(rollbackFor = Exception.class)
public Boolean deleteById(String id) {
return this.removeById(id);
@ -72,6 +84,9 @@ public class SzDangerousTaskService extends BaseService<SzDangerousTaskMapper, S
@Transactional(rollbackFor = Exception.class)
public SzDangerousTaskDto modify(SzDangerousTaskDto dto) {
if (!checkNameDistinct(dto.getId(), dto.getName())) {
throw new SzException("该任务名称已存在");
}
SzDangerousTask dangerousTask = BeanCopyUtils.copy(dto, SzDangerousTask.class);
this.updateById(dangerousTask);
return BeanCopyUtils.copy(dangerousTask, SzDangerousTaskDto.class);

Write Preview
Loading…
Cancel
Save