This commit is contained in:
cwchen 2024-03-25 14:46:31 +08:00
parent d6d72c2e76
commit ae0c651bdc
8 changed files with 56 additions and 6 deletions

View File

@ -58,8 +58,6 @@ public class DeviceBdChildVo {
private String deviceModel; private String deviceModel;
@ApiModelProperty(value = "边带ID") @ApiModelProperty(value = "边带ID")
@NotBlank(message = "设备所属边带不能为空", groups = {Query.class})
@Length(max = 100, message = "设备所属边带字符长度不能超过100", groups = {Query.class})
private String bdId; private String bdId;
@ApiModelProperty(value = "边带名称") @ApiModelProperty(value = "边带名称")
@ -70,8 +68,6 @@ public class DeviceBdChildVo {
private Integer type; private Integer type;
@ApiModelProperty(value = "区域ID") @ApiModelProperty(value = "区域ID")
@NotBlank(message = "检测区域不能为空", groups = {Query.class})
@Length(max = 100, message = "检测区域字符长度不能超过100", groups = {Query.class})
private String areaId; private String areaId;
@ApiModelProperty(value = "区域名称") @ApiModelProperty(value = "区域名称")

View File

@ -61,8 +61,6 @@ public class DeviceBdVo {
private String gtName; private String gtName;
@ApiModelProperty(value = "标段编码") @ApiModelProperty(value = "标段编码")
@NotBlank(message = "标段编码不能为空", groups = {Query.class})
@Length(max = 80, message = "标段编码字符长度不能超过80", groups = {Query.class})
private String bidCode; private String bidCode;
@ApiModelProperty(value = "工程名称") @ApiModelProperty(value = "工程名称")

View File

@ -36,4 +36,12 @@ public class SelectVo {
@ApiModelProperty(value = "工程类型") @ApiModelProperty(value = "工程类型")
@JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonInclude(JsonInclude.Include.NON_EMPTY)
private String proType; private String proType;
@ApiModelProperty(value = "标段编码")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private String bidCode;
@ApiModelProperty(value = "杆塔ID")
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private String gtId;
} }

View File

@ -86,4 +86,9 @@ public class SelectController extends BaseController {
return service.getAreaLists(dto); return service.getAreaLists(dto);
} }
@ApiOperation(value = "边带下拉选")
@GetMapping("getBdLists")
public AjaxResult getBdLists(SelectDto dto){
return service.getBdLists(dto);
}
} }

View File

@ -112,6 +112,7 @@ public interface ISelectMapper {
/** /**
* 区域下拉选 * 区域下拉选
*
* @param dto * @param dto
* @return List<SelectVo> * @return List<SelectVo>
* @description * @description
@ -119,4 +120,14 @@ public interface ISelectMapper {
* @date 2024/3/20 20:02 * @date 2024/3/20 20:02
*/ */
List<SelectVo> getAreaLists(SelectDto dto); List<SelectVo> getAreaLists(SelectDto dto);
/**
* 边带下拉选
* @param dto
* @return List<SelectVo>
* @description
* @author cwchen
* @date 2024/3/25 13:11
*/
List<SelectVo> getBdLists(SelectDto dto);
} }

View File

@ -108,6 +108,7 @@ public interface ISelectService {
/** /**
* 区域下拉选 * 区域下拉选
*
* @param dto * @param dto
* @return AjaxResult * @return AjaxResult
* @description * @description
@ -115,4 +116,14 @@ public interface ISelectService {
* @date 2024/3/20 20:01 * @date 2024/3/20 20:01
*/ */
AjaxResult getAreaLists(SelectDto dto); AjaxResult getAreaLists(SelectDto dto);
/**
* 边带下拉选
* @param dto
* @return AjaxResult
* @description
* @author cwchen
* @date 2024/3/25 13:11
*/
AjaxResult getBdLists(SelectDto dto);
} }

View File

@ -166,4 +166,15 @@ public class SelectServiceImpl implements ISelectService {
} }
return AjaxResult.success(list); return AjaxResult.success(list);
} }
@Override
public AjaxResult getBdLists(SelectDto dto) {
List<SelectVo> list = new ArrayList<>();
try {
list = mapper.getBdLists(dto);
} catch (Exception e) {
log.error("边带下拉选");
}
return AjaxResult.success(list);
}
} }

View File

@ -101,4 +101,14 @@
</if> </if>
</where> </where>
</select> </select>
<!--边带下拉选-->
<select id="getBdLists" resultType="com.securitycontrol.entity.system.vo.SelectVo">
SELECT id,bd_name AS name,bd_code AS bidCode,gt_id AS gtId
FROM tb_pro_bd
<where>
<if test="bidCode!=null and bidCode !=''">
AND bid_code = #{bidCode}
</if>
</where>
</select>
</mapper> </mapper>