Merge branch 'dev' of http://111.203.232.171:8888/lee/chnmuseum-party into dev

src/main/java/cn/chnmuseum/party/model/TBoxOperation.java

@@ -9,6 +9,7 @@ import lombok.*;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -42,6 +43,7 @@ public class TBoxOperation implements Serializable {
     private String organId;
 
     @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)
     private String mac;
 

src/main/java/cn/chnmuseum/party/web/controller/TBoxOperationController.java

@@ -4,6 +4,7 @@ import cn.chnmuseum.party.common.log.MethodLog;
 import cn.chnmuseum.party.common.log.OperModule;
 import cn.chnmuseum.party.common.log.OperType;
 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.TUser;
 import cn.chnmuseum.party.service.TBoxOperationService;
@@ -20,6 +21,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -37,6 +39,7 @@ import java.util.*;
 @RestController
 @RequestMapping("/boxOperation")
 @Api(tags = {"机顶盒运维信息操作接口"})
+@Validated
 public class TBoxOperationController extends BaseController {
 
     @Resource
@@ -117,7 +120,7 @@ public class TBoxOperationController extends BaseController {
     @RequiresAuthentication  //@RequiresPermissions("/boxOperation/update")
     @ApiOperation(value = "修改机顶盒运维信息", notes = "修改机顶盒运维信息")
     @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>();
         try {
             if (tBoxOperation != null && StringUtils.isNotBlank(tBoxOperation.getMac())) {