From d6d72c2e76ad740f34eb15beb7859e0be4431463 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Mon, 25 Mar 2024 09:53:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?gitignore=E5=BF=BD=E7=95=A5=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c10571a --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +# Created by .ignore support plugin (hsz.mobi) +.idea +logs +.gitignore +out +*.iml +gen From ae0c651bdc04968ea08600ad7f6591b448a82bf1 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Mon, 25 Mar 2024 14:46:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=BE=B9=E5=B8=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/background/vo/DeviceBdChildVo.java | 4 ---- .../entity/background/vo/DeviceBdVo.java | 2 -- .../securitycontrol/entity/system/vo/SelectVo.java | 8 ++++++++ .../system/base/controller/SelectController.java | 5 +++++ .../system/base/mapper/ISelectMapper.java | 11 +++++++++++ .../system/base/service/ISelectService.java | 11 +++++++++++ .../system/base/service/impl/SelectServiceImpl.java | 11 +++++++++++ .../src/main/resources/mapper/base/SelectMapper.xml | 10 ++++++++++ 8 files changed, 56 insertions(+), 6 deletions(-) diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdChildVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdChildVo.java index 2ab2c4f..df2046c 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdChildVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdChildVo.java @@ -58,8 +58,6 @@ public class DeviceBdChildVo { private String deviceModel; @ApiModelProperty(value = "边带ID") - @NotBlank(message = "设备所属边带不能为空", groups = {Query.class}) - @Length(max = 100, message = "设备所属边带字符长度不能超过100", groups = {Query.class}) private String bdId; @ApiModelProperty(value = "边带名称") @@ -70,8 +68,6 @@ public class DeviceBdChildVo { private Integer type; @ApiModelProperty(value = "区域ID") - @NotBlank(message = "检测区域不能为空", groups = {Query.class}) - @Length(max = 100, message = "检测区域字符长度不能超过100", groups = {Query.class}) private String areaId; @ApiModelProperty(value = "区域名称") diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdVo.java index dba318d..f807257 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdVo.java @@ -61,8 +61,6 @@ public class DeviceBdVo { private String gtName; @ApiModelProperty(value = "标段编码") - @NotBlank(message = "标段编码不能为空", groups = {Query.class}) - @Length(max = 80, message = "标段编码字符长度不能超过80", groups = {Query.class}) private String bidCode; @ApiModelProperty(value = "工程名称") diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/SelectVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/SelectVo.java index 69074f6..e5ff72c 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/SelectVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/SelectVo.java @@ -36,4 +36,12 @@ public class SelectVo { @ApiModelProperty(value = "工程类型") @JsonInclude(JsonInclude.Include.NON_EMPTY) private String proType; + + @ApiModelProperty(value = "标段编码") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private String bidCode; + + @ApiModelProperty(value = "杆塔ID") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private String gtId; } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java index e779488..e4983f7 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java @@ -86,4 +86,9 @@ public class SelectController extends BaseController { return service.getAreaLists(dto); } + @ApiOperation(value = "边带下拉选") + @GetMapping("getBdLists") + public AjaxResult getBdLists(SelectDto dto){ + return service.getBdLists(dto); + } } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java index ee7e166..da51a90 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java @@ -112,6 +112,7 @@ public interface ISelectMapper { /** * 区域下拉选 + * * @param dto * @return List * @description @@ -119,4 +120,14 @@ public interface ISelectMapper { * @date 2024/3/20 20:02 */ List getAreaLists(SelectDto dto); + + /** + * 边带下拉选 + * @param dto + * @return List + * @description + * @author cwchen + * @date 2024/3/25 13:11 + */ + List getBdLists(SelectDto dto); } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java index a3d1f8b..da91b69 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java @@ -108,6 +108,7 @@ public interface ISelectService { /** * 区域下拉选 + * * @param dto * @return AjaxResult * @description @@ -115,4 +116,14 @@ public interface ISelectService { * @date 2024/3/20 20:01 */ AjaxResult getAreaLists(SelectDto dto); + + /** + * 边带下拉选 + * @param dto + * @return AjaxResult + * @description + * @author cwchen + * @date 2024/3/25 13:11 + */ + AjaxResult getBdLists(SelectDto dto); } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java index d53519e..cb9702b 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/SelectServiceImpl.java @@ -166,4 +166,15 @@ public class SelectServiceImpl implements ISelectService { } return AjaxResult.success(list); } + + @Override + public AjaxResult getBdLists(SelectDto dto) { + List list = new ArrayList<>(); + try { + list = mapper.getBdLists(dto); + } catch (Exception e) { + log.error("边带下拉选"); + } + return AjaxResult.success(list); + } } diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml index 982c593..0fb14ca 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml +++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml @@ -101,4 +101,14 @@ + + \ No newline at end of file From 12e3d337a4eda695b50ea3ce72122adef0178a8d Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Mon, 25 Mar 2024 17:51:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=BE=B9=E5=B8=A6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/DeviceBdMapper.xml | 8 +++++++- .../src/main/resources/mapper/base/SelectMapper.xml | 6 ++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml index d4203be..2f07234 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml @@ -180,7 +180,13 @@ LEFT JOIN sys_dict sd ON sd.dict_code = tbd.devic_type LEFT JOIN sys_dict sd2 ON sd2.dict_code = tbd.status LEFT JOIN sys_area sa ON tbd.area_id = sa.area_id - WHERE tbd.bd_id = #{id} + + + AND ( + INSTR(tpb.bd_name,#{keyWord}) > 0 + ) + +