From f6d390988b1c9b5695338214e95ff0d6da70b300 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 25 Nov 2020 16:34:41 +0800
Subject: [PATCH] 完善功能
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessRecordsController.java | 81 ++++++++++++++++++++++++++--------------
1 files changed, 52 insertions(+), 29 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessRecordsController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessRecordsController.java
index 44f6f69..590591c 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessRecordsController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessRecordsController.java
@@ -1,34 +1,27 @@
package com.kidgrow.oprationcenter.controller;
-import java.util.Map;
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.oprationcenter.model.BusinessRecords;
+import com.kidgrow.oprationcenter.service.IBusinessRecordsService;
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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
-import com.kidgrow.oprationcenter.model.BusinessRecords;
-import com.kidgrow.oprationcenter.service.IBusinessRecordsService;
-import com.kidgrow.common.model.*;
-
-import org.springframework.validation.BindingResult;
-import javax.validation.Valid;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
-import java.util.Set;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
* @Description: 业务操作记录
- * @Project: 用户中心
- * @CreateDate: Created in 2020-04-01 09:37:05 <br>
+ * @Project: 运营中心
+ * @CreateDate: Created in 2020-04-02 18:25:34 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
* @version: 1.0
*/
@@ -36,7 +29,7 @@
@RestController
@RequestMapping("/businessrecords")
@Api(tags = "业务操作记录")
-public class BusinessRecordsController extends BaseController{
+public class BusinessRecordsController extends BaseController {
@Autowired
private IBusinessRecordsService businessRecordsService;
@@ -50,9 +43,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 businessRecordsService.findList(params);
}
@@ -77,19 +70,45 @@
return ResultBody.ok().data(model).msg("查询成功");
}
+// /**
+// * 新增or更新
+// */
+// @ApiOperation(value = "保存")
+// @PostMapping
+// public ResultBody save(@Valid @RequestBody BusinessRecords businessRecords, BindingResult bindingResult) {
+// if (bindingResult.hasErrors()) {
+// return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
+// } else {
+// BusinessRecords model = businessRecordsService.getById(businessRecords.getId());
+// if (model == null) {
+// boolean v = businessRecordsService.saveOrUpdate(businessRecords);
+// if (v) {
+// return ResultBody.ok().data(businessRecords).msg("保存成功");
+// } else {
+// return ResultBody.failed().msg("保存失败");
+// }
+// } else {
+// return ResultBody.failed().msg("业务日志不允许更新！");
+// }
+// }
+// }
/**
- * 新增or更新
+ * 新增
*/
@ApiOperation(value = "保存")
@PostMapping
- public ResultBody save(@Valid @RequestBody BusinessRecords businessRecords, BindingResult bindingResult) {
- if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
+ public ResultBody save(String recordTitle,String recordNote) {
+ if (recordTitle.isEmpty()||recordNote.isEmpty()) {
+ return ResultBody.failed().msg("业务日志参数有误！");
} else {
- businessRecordsService.saveOrUpdate(businessRecords);
- return ResultBody.ok().data(businessRecords).msg("保存成功");
+ boolean v = businessRecordsService.recordBusinessData(recordTitle,recordNote);
+ if (v) {
+ return ResultBody.ok().msg("保存成功");
+ } else {
+ return ResultBody.failed().msg("保存失败");
+ }
+ }
}
- }
/**
* 删除
@@ -97,7 +116,11 @@
@ApiOperation(value = "删除")
@DeleteMapping("/{id}")
public ResultBody delete(@PathVariable Long id) {
- businessRecordsService.removeById(id);
- return ResultBody.ok().msg("删除成功");
+ boolean v = businessRecordsService.removeById(id);
+ if (v) {
+ return ResultBody.ok().msg("删除成功");
+ } else {
+ return ResultBody.failed().msg("删除失败");
+ }
}
}
--
Gitblit v1.8.0