文件夹接收参数修改

icss-service/src/main/java/com/diagbot/vo/TemplateFolderSortObjVO.java

@@ -0,0 +1,24 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 模板文件夹排序入参
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-01-09
+ */
+@Getter
+@Setter
+public class TemplateFolderSortObjVO implements Serializable {
+
+   private List<TemplateFolderSortVO> TemplateFolderSortVOList;
+
+}

icss-service/src/main/java/com/diagbot/vo/TemplateFolderVO.java

@@ -3,6 +3,7 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -27,6 +28,7 @@ public class TemplateFolderVO implements Serializable {
     /**
      * 名称
      */
+    @NotBlank(message = "名称不能为空")
     private String name;
 
     /**

icss-service/src/main/java/com/diagbot/web/TemplateFolderAdminController.java

@@ -8,6 +8,7 @@ import com.diagbot.facade.TemplateFolderAdminFacade;
 import com.diagbot.facade.TemplateFolderFacade;
 import com.diagbot.vo.TemplateFolderDelVO;
 import com.diagbot.vo.TemplateFolderListVO;
+import com.diagbot.vo.TemplateFolderSortObjVO;
 import com.diagbot.vo.TemplateFolderSortVO;
 import com.diagbot.vo.TemplateFolderVO;
 import com.sun.org.apache.xpath.internal.operations.Bool;
@@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -43,7 +45,7 @@ public class TemplateFolderAdminController {
     @PostMapping("/saveOrUpdate")
     @SysLogger("saveOrUpdate")
     @Transactional
-    public RespDTO<Boolean> saveOrUpdate(@RequestBody TemplateFolderVO templateFolderVO) {
+    public RespDTO<Boolean> saveOrUpdate(@Valid @RequestBody TemplateFolderVO templateFolderVO) {
         templateFolderAdminFacade.saveOrUpdate(templateFolderVO);
         return RespDTO.onSuc(true);
     }
@@ -51,10 +53,10 @@ public class TemplateFolderAdminController {
 
     @ApiOperation(value = "文件夹删除[by:zhoutg]",
             notes = "folderId: 文件夹id<br>")
-    @PostMapping("/detele")
-    @SysLogger("detele")
+    @PostMapping("/delete")
+    @SysLogger("delete")
     @Transactional
-    public RespDTO<Boolean> detele(@RequestBody TemplateFolderDelVO templateFolderDelVO) {
+    public RespDTO<Boolean> delete(@RequestBody TemplateFolderDelVO templateFolderDelVO) {
         templateFolderAdminFacade.delete(templateFolderDelVO);
         return RespDTO.onSuc(true);
     }
@@ -75,8 +77,8 @@ public class TemplateFolderAdminController {
     @PostMapping("/sort")
     @SysLogger("sort")
     @Transactional
-    public RespDTO<Boolean> sort(@RequestBody List<TemplateFolderSortVO> templateFolderSortVOList) {
-        templateFolderAdminFacade.sort(templateFolderSortVOList);
+    public RespDTO<Boolean> sort(@RequestBody TemplateFolderSortObjVO templateFolderSortObjVO) {
+        templateFolderAdminFacade.sort(templateFolderSortObjVO.getTemplateFolderSortVOList());
         return RespDTO.onSuc(true);
     }
 }