From a98bb3c923b1a055703cca9049364a2fc79eefe0 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 10 Aug 2020 18:23:49 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysFeedbackController.java |   80 +++++++++++++++++++++++++---------------
 1 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysFeedbackController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysFeedbackController.java
index 3bead1d..82c357a 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysFeedbackController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysFeedbackController.java
@@ -1,32 +1,31 @@
 package com.kidgrow.oprationcenter.controller;
 
-import java.util.Map;
+import com.kidgrow.common.annotation.LoginUser;
 import com.kidgrow.common.controller.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import com.kidgrow.common.model.PageResult;
+import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.SysUser;
+import com.kidgrow.oprationcenter.model.SysFeedback;
+import com.kidgrow.oprationcenter.service.ISysFeedbackService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-
-import com.kidgrow.oprationcenter.model.SysFeedback;
-import com.kidgrow.oprationcenter.service.ISysFeedbackService;
-import com.kidgrow.common.model.*;
-
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-import javax.validation.Valid;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.annotation.*;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 
 /**
  * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
- * @Description: 
+ *
+ * @Description:
  * @Project: 运营中心
  * @CreateDate: Created in 2020-04-02 18:25:34 <br>
  * @Author: <a href="4345453@kidgrow.com">liuke</a>
@@ -36,7 +35,7 @@
 @RestController
 @RequestMapping("/sysfeedback")
 @Api(tags = "")
-public class SysFeedbackController  extends BaseController{
+public class SysFeedbackController extends BaseController {
     @Autowired
     private ISysFeedbackService sysFeedbackService;
 
@@ -49,12 +48,12 @@
             @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
     })
     @GetMapping
-    public ResultBody<PageResult> list(@RequestParam Map<String, Object> params) {
-        if(params.size()==0){
-            params.put("page",1);
-            params.put("limit",10);
+    public PageResult list(@RequestParam Map<String, Object> params) {
+        if (params.size() == 0) {
+            params.put("page", 1);
+            params.put("limit", 10);
         }
-        return ResultBody.ok().data(sysFeedbackService.findList(params));
+        return sysFeedbackService.findList(params);
     }
 
     /**
@@ -82,15 +81,18 @@
      */
     @ApiOperation(value = "保存")
     @PostMapping
-    public ResultBody save(@Valid @RequestBody SysFeedback sysFeedback, BindingResult bindingResult) {
+    public ResultBody save( @RequestBody SysFeedback sysFeedback, BindingResult bindingResult, @LoginUser SysUser sysUser) {
+        List<String> errMsg = new ArrayList<>();
         if (bindingResult.hasErrors()) {
-            return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
-        } else {
-            boolean v= sysFeedbackService.saveOrUpdate(sysFeedback);
-            if(v) {
-                return ResultBody.ok().data(sysFeedback).msg("保存成功");
+            for (ObjectError error : bindingResult.getAllErrors()) {
+                errMsg.add(error.getDefaultMessage());
             }
-            else {
+            return ResultBody.failed().msg(errMsg.toString());
+        } else {
+            boolean v = sysFeedbackService.saveOrUpdateStr(sysFeedback, sysUser);
+            if (v) {
+                return ResultBody.ok().data(sysFeedback).msg("保存成功");
+            } else {
                 return ResultBody.failed().msg("保存失败");
             }
         }
@@ -102,12 +104,30 @@
     @ApiOperation(value = "删除")
     @DeleteMapping("/{id}")
     public ResultBody delete(@PathVariable Long id) {
-        boolean v= sysFeedbackService.removeById(id);
-        if(v) {
+        boolean v = sysFeedbackService.removeById(id);
+        if (v) {
             return ResultBody.ok().msg("删除成功");
-        }
-        else {
+        } else {
             return ResultBody.failed().msg("删除失败");
         }
     }
+
+    /**
+     * 修改状态
+     *
+     * @param params
+     * @return
+     */
+    @ApiOperation(value = "修改反馈数据状态")
+    @GetMapping("/updateEnabled")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "enabled", value = "是否启用", required = true, dataType = "Boolean")
+    })
+    public ResultBody updateEnabled(@RequestParam Map<String, Object> params) {
+        if (params.size() == 0) {
+            return ResultBody.failed().msg("参数异常!");
+        }
+        return sysFeedbackService.updateEnabled(params);
+    }
 }

--
Gitblit v1.8.0