diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/GtVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/GtVo.java index 7c1971f..1375044 100644 --- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/GtVo.java +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/GtVo.java @@ -4,6 +4,10 @@ import com.bonus.common.core.annotation.Excel; import com.bonus.common.core.annotation.Excel.ColumnType; import io.swagger.annotations.Api; import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; /** * 工程杆塔表 tb_project_power @@ -30,14 +34,20 @@ public class GtVo /** 杆塔编号 */ @Excel(name = "杆塔编号") + @NotBlank(message = "杆塔编号不能为空", groups = {GtVo.Query.class}) + @Length(max = 20, message = "杆塔编号长度不能超过20", groups = {GtVo.Query.class}) private String gtCode; /** 经度 */ - @Excel(name = "经度") + @NotBlank(message = "经度不能为空", groups = {GtVo.Query.class}) + @Length(max = 32, message = "经度长度不能超过32", groups = {GtVo.Query.class}) + @Pattern(regexp = "^-?((\\d{1,2}|1[0-7]\\d|180)(\\.\\d{1,6})?)$", message = "经度格式不正确", groups = {GtVo.Query.class}) private String lon; /** 纬度 */ - @Excel(name = "纬度") + @NotBlank(message = "纬度不能为空", groups = {GtVo.Query.class}) + @Length(max = 32, message = "纬度长度不能超过32", groups = {GtVo.Query.class}) + @Pattern(regexp = "^-?([0-8]?\\d(\\.\\d{1,6})?|90(\\.0{1,6})?)$", message = "纬度格式不正确", groups = {GtVo.Query.class}) private String lat; /** diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/EngineeringServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/EngineeringServiceImpl.java index 0ef8685..f9194ea 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/EngineeringServiceImpl.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/EngineeringServiceImpl.java @@ -274,7 +274,7 @@ public class EngineeringServiceImpl implements IEngineeringService { BeanUtils.copyProperties(vo, gtVo); String validResult = validatorsUtils.valid(gtVo, GtVo.Query.class); if (StringUtils.isNotBlank(validResult)) { - return AjaxResult.error(validResult); + return AjaxResult.error("第"+ obj.getString("rowNo") +"行" + validResult); } gtVo.setProId(proId); list.add(gtVo); diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml index a0cd9ad..238e8b0 100644 --- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml @@ -25,10 +25,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.del_flag = 0 - and depart_name = #{projectDepartName} + and INSTR(depart_name,#{projectDepartName}) > 0 - and head_name = #{projectHeadName} + and INSTR(head_name,#{projectHeadName}) > 0 group by a.id