From e0395c5454534e7cf657b10045d00e4042dc7e71 Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Mon, 28 Sep 2020 15:51:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/pay_master' into pay_master --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysFeedbackController.java | 43 +++++++++++++++++++------------------------ 1 files changed, 19 insertions(+), 24 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 9472fb1..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,8 +1,10 @@ package com.kidgrow.oprationcenter.controller; +import com.kidgrow.common.annotation.LoginUser; import com.kidgrow.common.controller.BaseController; 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; @@ -15,7 +17,6 @@ import org.springframework.validation.ObjectError; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -23,7 +24,8 @@ /** * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br> - * @Description: + * + * @Description: * @Project: 运营中心 * @CreateDate: Created in 2020-04-02 18:25:34 <br> * @Author: <a href="4345453@kidgrow.com">liuke</a> @@ -33,7 +35,7 @@ @RestController @RequestMapping("/sysfeedback") @Api(tags = "") -public class SysFeedbackController extends BaseController{ +public class SysFeedbackController extends BaseController { @Autowired private ISysFeedbackService sysFeedbackService; @@ -47,9 +49,9 @@ }) @GetMapping public PageResult list(@RequestParam Map<String, Object> params) { - if(params.size()==0){ - params.put("page",1); - params.put("limit",10); + if (params.size() == 0) { + params.put("page", 1); + params.put("limit", 10); } return sysFeedbackService.findList(params); } @@ -79,19 +81,18 @@ */ @ApiOperation(value = "保存") @PostMapping - public ResultBody save(@Valid @RequestBody SysFeedback sysFeedback, BindingResult bindingResult) { - List<String> errMsg= new ArrayList<>(); + public ResultBody save( @RequestBody SysFeedback sysFeedback, BindingResult bindingResult, @LoginUser SysUser sysUser) { + List<String> errMsg = new ArrayList<>(); if (bindingResult.hasErrors()) { for (ObjectError error : bindingResult.getAllErrors()) { errMsg.add(error.getDefaultMessage()); } return ResultBody.failed().msg(errMsg.toString()); - } else { - boolean v= sysFeedbackService.saveOrUpdate(sysFeedback); - if(v) { + } else { + boolean v = sysFeedbackService.saveOrUpdateStr(sysFeedback, sysUser); + if (v) { return ResultBody.ok().data(sysFeedback).msg("保存成功"); - } - else { + } else { return ResultBody.failed().msg("保存失败"); } } @@ -103,14 +104,14 @@ @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("删除失败"); } } + /** * 修改状态 * @@ -124,15 +125,9 @@ @ApiImplicitParam(name = "enabled", value = "是否启用", required = true, dataType = "Boolean") }) public ResultBody updateEnabled(@RequestParam Map<String, Object> params) { - if (params.size()==0) - { + if (params.size() == 0) { return ResultBody.failed().msg("参数异常!"); } return sysFeedbackService.updateEnabled(params); } - @PostMapping("getDoctor") - public ResultBody getoneee(){ - return sysFeedbackService.getoneee(); - } - } -- Gitblit v1.8.0