From eaebadeaa0e90c7a44fa044139088fa26e44ddad Mon Sep 17 00:00:00 2001 From: shenzhidan Date: Sat, 28 Feb 2026 13:53:02 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95b?= =?UTF-8?q?ug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/RescueTeamController.java | 22 ++++++++++++------- .../command/query/RescueTeamQueryExe.java | 5 +++++ .../service/RescueTeamServiceImpl.java | 6 +++++ .../zcGbsServicer/api/RescueTeamServiceI.java | 3 +++ .../zcGbsServicer/dto/RescueTeamAddCmd.java | 2 +- .../dto/RescueTeamNameCheckQry.java | 17 ++++++++++++++ .../repository/RescueTeamRepository.java | 1 + .../impl/RescueTeamRepositoryImpl.java | 15 +++++++++++++ .../resources/mapper/ControlRoomMapper.xml | 3 +-- .../resources/mapper/FireResourceMapper.xml | 6 ++--- .../main/resources/mapper/PumpRoomMapper.xml | 3 +-- .../resources/mapper/RescueTeamMapper.xml | 3 +-- .../resources/mapper/WaterSourceMapper.xml | 3 +-- 13 files changed, 69 insertions(+), 20 deletions(-) create mode 100644 web-client/src/main/java/com/zcloud/zcGbsServicer/dto/RescueTeamNameCheckQry.java diff --git a/web-adapter/src/main/java/com/zcloud/zcGbsServicer/web/RescueTeamController.java b/web-adapter/src/main/java/com/zcloud/zcGbsServicer/web/RescueTeamController.java index e4bcac3..2741770 100644 --- a/web-adapter/src/main/java/com/zcloud/zcGbsServicer/web/RescueTeamController.java +++ b/web-adapter/src/main/java/com/zcloud/zcGbsServicer/web/RescueTeamController.java @@ -1,17 +1,17 @@ package com.zcloud.zcGbsServicer.web; - -import com.zcloud.zcGbsServicer.api.RescueTeamServiceI; -import com.zcloud.zcGbsServicer.dto.RescueTeamAddCmd; -import com.zcloud.zcGbsServicer.dto.RescueTeamPageQry; -import com.zcloud.zcGbsServicer.dto.RescueTeamUpdateCmd; -import com.zcloud.zcGbsServicer.dto.clientobject.RescueTeamCO; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.zcGbsServicer.api.RescueTeamServiceI; +import com.zcloud.zcGbsServicer.dto.RescueTeamAddCmd; +import com.zcloud.zcGbsServicer.dto.RescueTeamNameCheckQry; +import com.zcloud.zcGbsServicer.dto.RescueTeamPageQry; +import com.zcloud.zcGbsServicer.dto.RescueTeamUpdateCmd; +import com.zcloud.zcGbsServicer.dto.clientobject.RescueTeamCO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -20,6 +20,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; + /** * web-adapter * @Author makejava @@ -46,6 +47,12 @@ public class RescueTeamController { return rescueTeamService.listPage(qry); } + @ApiOperation("名称判重") + @PostMapping("/checkName") + public SingleResponse checkName(@Validated @RequestBody RescueTeamNameCheckQry qry) { + return rescueTeamService.checkName(qry); + } + @ApiOperation("所有数据") @GetMapping("/listAll") public MultiResponse listAll() { @@ -67,7 +74,7 @@ public class RescueTeamController { @ApiOperation("删除多个") @DeleteMapping("/ids") - public Response removeBatch(@RequestParam Long[] ids) { + public Response removeBatch(@RequestParam Long[] ids) { rescueTeamService.removeBatch(ids); return SingleResponse.buildSuccess(); } @@ -79,4 +86,3 @@ public class RescueTeamController { return SingleResponse.buildSuccess(); } } - diff --git a/web-app/src/main/java/com/zcloud/zcGbsServicer/command/query/RescueTeamQueryExe.java b/web-app/src/main/java/com/zcloud/zcGbsServicer/command/query/RescueTeamQueryExe.java index eb16912..9fe7dd3 100644 --- a/web-app/src/main/java/com/zcloud/zcGbsServicer/command/query/RescueTeamQueryExe.java +++ b/web-app/src/main/java/com/zcloud/zcGbsServicer/command/query/RescueTeamQueryExe.java @@ -6,6 +6,7 @@ import com.zcloud.zcGbsServicer.command.convertor.RescueTeamCoConvertor; import com.zcloud.zcGbsServicer.command.convertor.ResourcePersonCoConvertor; import com.zcloud.zcGbsServicer.domain.model.RescueTeamE; import com.zcloud.zcGbsServicer.domain.model.ResourcePersonE; +import com.zcloud.zcGbsServicer.dto.RescueTeamNameCheckQry; import com.zcloud.zcGbsServicer.dto.RescueTeamPageQry; import com.zcloud.zcGbsServicer.dto.clientobject.RescueTeamCO; import com.zcloud.zcGbsServicer.persistence.dataobject.RescueTeamDO; @@ -89,5 +90,9 @@ public class RescueTeamQueryExe { return rescueTeamCoConvertor.converEToCO(rescueTeamE); } + public Boolean checkName(RescueTeamNameCheckQry qry) { + return rescueTeamRepository.existsByTeamName(qry.getTeamName(), qry.getId()); + } + } diff --git a/web-app/src/main/java/com/zcloud/zcGbsServicer/service/RescueTeamServiceImpl.java b/web-app/src/main/java/com/zcloud/zcGbsServicer/service/RescueTeamServiceImpl.java index 96cb1d8..2aa7a90 100644 --- a/web-app/src/main/java/com/zcloud/zcGbsServicer/service/RescueTeamServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/zcGbsServicer/service/RescueTeamServiceImpl.java @@ -6,6 +6,7 @@ import com.zcloud.zcGbsServicer.command.RescueTeamRemoveExe; import com.zcloud.zcGbsServicer.command.RescueTeamUpdateExe; import com.zcloud.zcGbsServicer.command.query.RescueTeamQueryExe; import com.zcloud.zcGbsServicer.dto.RescueTeamAddCmd; +import com.zcloud.zcGbsServicer.dto.RescueTeamNameCheckQry; import com.zcloud.zcGbsServicer.dto.RescueTeamPageQry; import com.zcloud.zcGbsServicer.dto.RescueTeamUpdateCmd; import com.zcloud.zcGbsServicer.dto.clientobject.RescueTeamCO; @@ -60,5 +61,10 @@ public class RescueTeamServiceImpl implements RescueTeamServiceI { public RescueTeamCO get(Long id) { return rescueTeamQueryExe.getById(id); } + + @Override + public SingleResponse checkName(RescueTeamNameCheckQry qry) { + return SingleResponse.of(rescueTeamQueryExe.checkName(qry)); + } } diff --git a/web-client/src/main/java/com/zcloud/zcGbsServicer/api/RescueTeamServiceI.java b/web-client/src/main/java/com/zcloud/zcGbsServicer/api/RescueTeamServiceI.java index 9a76341..6f2a0bb 100644 --- a/web-client/src/main/java/com/zcloud/zcGbsServicer/api/RescueTeamServiceI.java +++ b/web-client/src/main/java/com/zcloud/zcGbsServicer/api/RescueTeamServiceI.java @@ -1,6 +1,7 @@ package com.zcloud.zcGbsServicer.api; import com.zcloud.zcGbsServicer.dto.RescueTeamAddCmd; +import com.zcloud.zcGbsServicer.dto.RescueTeamNameCheckQry; import com.zcloud.zcGbsServicer.dto.RescueTeamPageQry; import com.zcloud.zcGbsServicer.dto.RescueTeamUpdateCmd; import com.zcloud.zcGbsServicer.dto.clientobject.RescueTeamCO; @@ -25,5 +26,7 @@ public interface RescueTeamServiceI { void removeBatch(Long[] ids); RescueTeamCO get(Long id); + + SingleResponse checkName(RescueTeamNameCheckQry qry); } diff --git a/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/RescueTeamAddCmd.java b/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/RescueTeamAddCmd.java index 47517e1..358ff88 100644 --- a/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/RescueTeamAddCmd.java +++ b/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/RescueTeamAddCmd.java @@ -53,7 +53,7 @@ public class RescueTeamAddCmd extends Command { private String commandCrew; @ApiModelProperty(value = "建立日期", name = "establishDate", required = true) - @NotNull(message = "建立日期不能为空") +// @NotNull(message = "建立日期不能为空") private LocalDate establishDate; @ApiModelProperty(value = "所属区域或范围(字典码)", name = "regionScope", required = true) diff --git a/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/RescueTeamNameCheckQry.java b/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/RescueTeamNameCheckQry.java new file mode 100644 index 0000000..5d98b3e --- /dev/null +++ b/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/RescueTeamNameCheckQry.java @@ -0,0 +1,17 @@ +package com.zcloud.zcGbsServicer.dto; + +import com.alibaba.cola.dto.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; + +@Data +public class RescueTeamNameCheckQry extends Query { + @ApiModelProperty(value = "主键", name = "id") + private Long id; + + @ApiModelProperty(value = "救援队名称", name = "teamName", required = true) + @NotEmpty(message = "救援队名称不能为空") + private String teamName; +} diff --git a/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/repository/RescueTeamRepository.java b/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/repository/RescueTeamRepository.java index 87bc897..f2800f8 100644 --- a/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/repository/RescueTeamRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/repository/RescueTeamRepository.java @@ -15,5 +15,6 @@ import java.util.Map; public interface RescueTeamRepository extends BaseRepository { PageResponse listPage(Map params); + boolean existsByTeamName(String teamName, Long excludeId); } diff --git a/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/repository/impl/RescueTeamRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/repository/impl/RescueTeamRepositoryImpl.java index e197434..21a673e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/repository/impl/RescueTeamRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/repository/impl/RescueTeamRepositoryImpl.java @@ -1,5 +1,6 @@ package com.zcloud.zcGbsServicer.persistence.repository.impl; +import cn.hutool.core.util.StrUtil; import com.jjb.saas.framework.repository.common.PageHelper; import com.zcloud.zcGbsServicer.persistence.dataobject.RescueTeamDO; import com.zcloud.zcGbsServicer.persistence.mapper.RescueTeamMapper; @@ -39,5 +40,19 @@ public class RescueTeamRepositoryImpl extends BaseRepositoryImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("delete_enum", "FALSE"); + queryWrapper.eq("team_name", teamName.trim()); + if (excludeId != null) { + queryWrapper.ne("id", excludeId); + } + return this.count(queryWrapper) > 0; + } + } diff --git a/web-infrastructure/src/main/resources/mapper/ControlRoomMapper.xml b/web-infrastructure/src/main/resources/mapper/ControlRoomMapper.xml index c4a1514..1c35705 100644 --- a/web-infrastructure/src/main/resources/mapper/ControlRoomMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/ControlRoomMapper.xml @@ -11,7 +11,7 @@ control_room delete_enum = 'FALSE' - + AND ${ew.sqlSegment} @@ -20,4 +20,3 @@ - diff --git a/web-infrastructure/src/main/resources/mapper/FireResourceMapper.xml b/web-infrastructure/src/main/resources/mapper/FireResourceMapper.xml index dcb7371..68495e2 100644 --- a/web-infrastructure/src/main/resources/mapper/FireResourceMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/FireResourceMapper.xml @@ -15,15 +15,15 @@ FROM corp_info ci - ci.delete_enum = 'false' + ci.delete_enum = 'FALSE' AND ci.type IN(0, 1, 6) AND ci.corp_name LIKE CONCAT('%', #{corpName}, '%') - ORDER BY - ci.id + ORDER BY ci.corp_order ASC, + ci.create_time Desc diff --git a/web-infrastructure/src/main/resources/mapper/PumpRoomMapper.xml b/web-infrastructure/src/main/resources/mapper/PumpRoomMapper.xml index de1e2ff..58d7c87 100644 --- a/web-infrastructure/src/main/resources/mapper/PumpRoomMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/PumpRoomMapper.xml @@ -11,7 +11,7 @@ pump_room delete_enum = 'FALSE' - + AND ${ew.sqlSegment} @@ -20,4 +20,3 @@ - diff --git a/web-infrastructure/src/main/resources/mapper/RescueTeamMapper.xml b/web-infrastructure/src/main/resources/mapper/RescueTeamMapper.xml index 10e8d79..b9502dd 100644 --- a/web-infrastructure/src/main/resources/mapper/RescueTeamMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/RescueTeamMapper.xml @@ -11,7 +11,7 @@ rescue_team delete_enum = 'FALSE' - + AND ${ew.sqlSegment} @@ -20,4 +20,3 @@ - diff --git a/web-infrastructure/src/main/resources/mapper/WaterSourceMapper.xml b/web-infrastructure/src/main/resources/mapper/WaterSourceMapper.xml index d908d0b..b4335a8 100644 --- a/web-infrastructure/src/main/resources/mapper/WaterSourceMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/WaterSourceMapper.xml @@ -11,7 +11,7 @@ water_source delete_enum = 'FALSE' - + AND ${ew.sqlSegment} @@ -20,4 +20,3 @@ -