|
@@ -1,18 +1,19 @@
|
|
|
package com.gyee.sampleimpala.controller;
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
+
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.gyee.sampleimpala.common.result.JsonResult;
|
|
|
import com.gyee.sampleimpala.common.result.ResultCode;
|
|
|
-import com.gyee.sampleimpala.model.kudu.CasePerformance;
|
|
|
-import com.gyee.sampleimpala.service.GoldenService;
|
|
|
-import com.gyee.sampleimpala.service.kudu.CasePerformanceService;
|
|
|
+import com.gyee.sampleimpala.model.kudu.Caseperformance;
|
|
|
+import com.gyee.sampleimpala.service.custom.GoldenService;
|
|
|
+import com.gyee.sampleimpala.service.kudu.CaseperformanceService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.util.List;
|
|
|
|
|
|
+
|
|
|
/**
|
|
|
* 性能样本
|
|
|
*
|
|
@@ -28,11 +29,11 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
@CrossOrigin
|
|
|
@RestController
|
|
|
@RequestMapping("/case")
|
|
|
-public class CasePerformanceController {
|
|
|
+public class CaseperformanceController {
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
- private CasePerformanceService casePerformanceService;
|
|
|
+ private CaseperformanceService caseperformanceService;
|
|
|
|
|
|
@Autowired
|
|
|
private GoldenService goldenService;
|
|
@@ -50,7 +51,7 @@ public class CasePerformanceController {
|
|
|
@GetMapping("/performance/list")
|
|
|
public JSONObject getPerformanceList(String station, String[] model, Integer tag,
|
|
|
String st, String et) {
|
|
|
- List<CasePerformance> list = casePerformanceService.getPerformanceList(station, model, tag, st, et);
|
|
|
+ List<Caseperformance> list = caseperformanceService.getPerformanceList(station, model, tag, st, et);
|
|
|
return JsonResult.successData(ResultCode.SUCCESS, list);
|
|
|
}
|
|
|
|
|
@@ -62,8 +63,8 @@ public class CasePerformanceController {
|
|
|
* @return
|
|
|
*/
|
|
|
@PostMapping("/performance/add")
|
|
|
- public JSONObject addPerformance(@RequestBody CasePerformance performance) {
|
|
|
- boolean flag = casePerformanceService.addPerformance(performance);
|
|
|
+ public JSONObject addPerformance(@RequestBody Caseperformance performance) {
|
|
|
+ boolean flag = caseperformanceService.addPerformance(performance);
|
|
|
|
|
|
if (flag) {
|
|
|
return JsonResult.success(ResultCode.SUCCESS);
|
|
@@ -79,8 +80,8 @@ public class CasePerformanceController {
|
|
|
* @return
|
|
|
*/
|
|
|
@PostMapping("/performance/edit")
|
|
|
- public JSONObject editPerformance(@RequestBody CasePerformance performance) {
|
|
|
- boolean flag = casePerformanceService.editPerformance(performance);
|
|
|
+ public JSONObject editPerformance(@RequestBody Caseperformance performance) {
|
|
|
+ boolean flag = caseperformanceService.editPerformance(performance);
|
|
|
|
|
|
if (flag) {
|
|
|
return JsonResult.success(ResultCode.SUCCESS);
|
|
@@ -96,7 +97,7 @@ public class CasePerformanceController {
|
|
|
*/
|
|
|
@PostMapping("/performance/remove")
|
|
|
public JSONObject removePerformance(Integer id) {
|
|
|
- boolean flag = casePerformanceService.removePerformanceById(id);
|
|
|
+ boolean flag = caseperformanceService.removePerformance(id);
|
|
|
if (flag) {
|
|
|
return JsonResult.success(ResultCode.SUCCESS);
|
|
|
}
|