添加了校验

README.md

@@ -40,10 +40,19 @@ http://localhost:8085/xiaoan-web/#/login
         前端：http://218.17.126.170:9996/dist
         后端：http://218.17.126.170:9996/doc.html
 	
-mysql	
-	218.17.126.170
-	root
-	12345678
-	端口：9998
+    mysql	
+        218.17.126.170
+        root
+        12345678
+        端口：9998
+
 
+## test 环境
+server
+    192.168.0.134
+    192.168.1.181
+    123456
 
+    mysql
+        root 
+        123456

xiaoan-application/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 server.port=8011
 
-spring.profiles.active=test
+spring.profiles.active=sit
 
 #mybatis
 #mybatis.mapper-locations=classpath:mapper/*.xml

xiaoan-domain/src/main/java/com/xiaoan/domain/dto/request/CameraRequest.java

@@ -2,6 +2,8 @@ package com.xiaoan.domain.dto.request;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * Created by Hb_zzZ on 2020/2/27.
  */
@@ -10,9 +12,12 @@ public class CameraRequest {
 
     private Long id;
     // Mac地址
+
+    @NotBlank(message = "相机MAC不能为空")
     private String childName;
 
     // sn码
+    @NotBlank(message = "SN号不能为空")
     private String snCode;
 
 }

xiaoan-domain/src/main/java/com/xiaoan/domain/dto/request/IssueRequest.java

@@ -3,6 +3,8 @@ package com.xiaoan.domain.dto.request;
 import com.xiaoan.common.model.PageDto;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * Created by Hb_zzZ on 2020/2/27.
  */
@@ -11,9 +13,11 @@ public class IssueRequest {
 
 
     // 标题
+    @NotBlank(message = "标题不能为空")
     private String title;
 
     // 内容
+    @NotBlank(message = "内容不能为空")
     private String content;
 
 }

xiaoan-domain/src/main/java/com/xiaoan/domain/dto/request/RoleRequest.java

@@ -3,6 +3,7 @@ package com.xiaoan.domain.dto.request;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.Set;
 
 /**
@@ -22,5 +23,6 @@ public class RoleRequest {
     private String roleKey;
 
     // 资源id
+    @NotNull(message = "权限不能为空")
     private Set<Long> resources;
 }

xiaoan-web/src/main/java/com/xiaoan/web/backend/DeviceController.java

@@ -1,78 +0,0 @@
-//package com.xiaoan.web.backend;
-//
-//import com.github.pagehelper.PageInfo;
-//import com.xiaoan.common.constant.MsgCode;
-//import com.xiaoan.common.model.PageDto;
-//import com.xiaoan.common.util.ResultJson;
-//import com.xiaoan.domain.backend.CameraEntity;
-//import com.xiaoan.domain.backend.DepartmentEntity;
-//import com.xiaoan.domain.dto.request.DepartmentRequest;
-//import com.xiaoan.service.backend.CameraService;
-//import com.xiaoan.service.backend.DepartmentService;
-//import com.xiaoan.web.aop.WebControllerLog;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import org.apache.commons.lang3.StringUtils;
-//import org.springframework.beans.BeanUtils;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.transaction.annotation.Transactional;
-//import org.springframework.web.bind.annotation.*;
-//import tk.mybatis.mapper.entity.Condition;
-//
-///**
-// * Created by Hb_zzZ on 2020/2/27.
-// *
-// * 需要admin权限
-// */
-//@Api(tags = "DeviceController", description = "后台设备管理")
-//@RestController
-//@RequestMapping("api/manage/device")
-//@Transactional
-//public class DeviceController extends BaseController {
-//
-//    @Autowired
-//    private DepartmentService departmentService;
-//
-//    @Autowired
-//    private CameraService cameraService;
-//
-//    @ApiOperation("分页获取部门列表/搜索")
-//    @WebControllerLog(description = "部门信息-查询列表")
-//    @PostMapping("list")
-//    public ResultJson list(@RequestBody PageDto param){
-//        Condition condition = new Condition(DepartmentEntity.class);
-//        condition.and().andLike("name", "%" + param.getSearchKey()+ "%");
-//        PageInfo<DepartmentEntity> pageInfo = departmentService.findAll(condition, param.getPageNum(), param.getPageSize());
-//        return new ResultJson(MsgCode.SUCCESS_CODE, pageInfo);
-//    }
-//
-//    /**
-//     * 需要一个mac地址
-//     *
-//     * WiFi名称，跟mac地址一致
-//     * wifi密码：12345678
-//     */
-//    @ApiOperation("新增相机")
-//    @WebControllerLog(description = "设备管理-新增相机")
-//    @PostMapping("save/{code}")
-//    public ResultJson save(@PathVariable String code){
-//        if(StringUtils.isEmpty(code)){
-//            return new ResultJson(MsgCode.FAILURE_CODE_3001, MsgCode.FAILURE_MSG_3001);
-//        }
-//
-//
-//        CameraEntity cameraEntity = cameraService.findByWifiName(code);
-//        if(cameraEntity == null){
-//            cameraEntity = new CameraEntity();
-//            cameraEntity.setChildName(code);
-//            cameraEntity.setWifiName(code);
-//            cameraEntity.setWifiPassword("12345678");
-//
-//
-//            cameraService.save(cameraEntity);
-//        }
-//
-//        return new ResultJson(MsgCode.SUCCESS_CODE, MsgCode.SUCCESS_MSG);
-//    }
-//
-//}

xiaoan-web/src/main/java/com/xiaoan/web/backend/ExceptionController.java

@@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletRequest;
  * 这里只可以捕获controller层的异常。
  */
 @Log4j2
-//@RestControllerAdvice
+@RestControllerAdvice
 public class ExceptionController {
 
     // 捕捉shiro的异常

xiaoan-web/src/main/java/com/xiaoan/web/backend/IssueController.java

@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.Date;
 import java.util.List;
 
@@ -57,7 +58,7 @@ public class IssueController extends BaseController {
     @WebControllerLog(description = "问题反馈-提交问题")
     @ApiOperation("提交问题")
     @PostMapping("save")
-    public ResultJson save(@RequestBody IssueRequest param){
+    public ResultJson save(@Valid @RequestBody IssueRequest param){
         IssueEntity issueEntity = new IssueEntity();
         BeanUtils.copyProperties(param, issueEntity);
         Long userId = JwtUtil2.getUserId(getToken());

xiaoan-web/src/main/java/com/xiaoan/web/backend/PersonalCenterController.java

@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.Date;
 import java.util.List;
 
@@ -134,7 +135,7 @@ public class PersonalCenterController extends BaseController {
     @ApiOperation("新增相机")
     @WebControllerLog(description = "设备管理-新增相机")
     @PostMapping("camera/save")
-    public ResultJson save(@RequestBody CameraRequest param){
+    public ResultJson save(@Valid @RequestBody CameraRequest param){
 
         CameraEntity cameraEntity = null;
         if (param.getId() == null) {