Commit 3461eec3 authored by jiawei's avatar jiawei

提交修改 mac 地址格式校验

parent 13a3dcb0
...@@ -9,6 +9,7 @@ import lombok.*; ...@@ -9,6 +9,7 @@ import lombok.*;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
...@@ -42,6 +43,7 @@ public class TBoxOperation implements Serializable { ...@@ -42,6 +43,7 @@ public class TBoxOperation implements Serializable {
private String organId; private String organId;
@ApiModelProperty("mac地址") @ApiModelProperty("mac地址")
@Pattern(regexp = "^([0-9A-Fa-f]{2}[:]){5}([0-9A-Fa-f]{2})$",message = "mac地址不正确",groups = Update.class)
@TableField(value = "mac",updateStrategy = FieldStrategy.IGNORED) @TableField(value = "mac",updateStrategy = FieldStrategy.IGNORED)
private String mac; private String mac;
......
...@@ -4,6 +4,7 @@ import cn.chnmuseum.party.common.log.MethodLog; ...@@ -4,6 +4,7 @@ import cn.chnmuseum.party.common.log.MethodLog;
import cn.chnmuseum.party.common.log.OperModule; import cn.chnmuseum.party.common.log.OperModule;
import cn.chnmuseum.party.common.log.OperType; import cn.chnmuseum.party.common.log.OperType;
import cn.chnmuseum.party.common.util.RSAUtils; import cn.chnmuseum.party.common.util.RSAUtils;
import cn.chnmuseum.party.common.validator.groups.Update;
import cn.chnmuseum.party.model.TBoxOperation; import cn.chnmuseum.party.model.TBoxOperation;
import cn.chnmuseum.party.model.TUser; import cn.chnmuseum.party.model.TUser;
import cn.chnmuseum.party.service.TBoxOperationService; import cn.chnmuseum.party.service.TBoxOperationService;
...@@ -20,6 +21,7 @@ import org.apache.commons.lang3.StringUtils; ...@@ -20,6 +21,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.authz.annotation.RequiresAuthentication;
import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations; import org.springframework.data.redis.core.ValueOperations;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
...@@ -37,6 +39,7 @@ import java.util.*; ...@@ -37,6 +39,7 @@ import java.util.*;
@RestController @RestController
@RequestMapping("/boxOperation") @RequestMapping("/boxOperation")
@Api(tags = {"机顶盒运维信息操作接口"}) @Api(tags = {"机顶盒运维信息操作接口"})
@Validated
public class TBoxOperationController extends BaseController { public class TBoxOperationController extends BaseController {
@Resource @Resource
...@@ -117,7 +120,7 @@ public class TBoxOperationController extends BaseController { ...@@ -117,7 +120,7 @@ public class TBoxOperationController extends BaseController {
@RequiresAuthentication //@RequiresPermissions("/boxOperation/update") @RequiresAuthentication //@RequiresPermissions("/boxOperation/update")
@ApiOperation(value = "修改机顶盒运维信息", notes = "修改机顶盒运维信息") @ApiOperation(value = "修改机顶盒运维信息", notes = "修改机顶盒运维信息")
@MethodLog(operModule = OperModule.STBOPERATION,operType = OperType.ACTIVATION) @MethodLog(operModule = OperModule.STBOPERATION,operType = OperType.ACTIVATION)
public Map<String, Object> updateTBoxOperation(TBoxOperation tBoxOperation) { public Map<String, Object> updateTBoxOperation(@Validated(value = Update.class) TBoxOperation tBoxOperation) {
Map<String, Object> resultMap = new LinkedHashMap<String, Object>(); Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
try { try {
if (tBoxOperation != null && StringUtils.isNotBlank(tBoxOperation.getMac())) { if (tBoxOperation != null && StringUtils.isNotBlank(tBoxOperation.getMac())) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment