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
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-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
+ )
+
+
+
+
\ No newline at end of file