|
@@ -9,8 +9,6 @@ import org.eco.als.domain.bo.QaBo;
|
|
|
import org.eco.als.domain.bo.TaskBo;
|
|
|
import org.eco.als.service.IAlgorithmService;
|
|
|
import org.eco.common.core.core.domain.CommonResult;
|
|
|
-import org.eco.common.log.annotation.Log;
|
|
|
-import org.eco.common.log.enums.BusinessType;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
@@ -37,10 +35,9 @@ public class AlgorithmController {
|
|
|
* @return org.eco.common.core.core.domain.CommonResult<java.lang.String> 结果
|
|
|
**/
|
|
|
@SaCheckPermission("als:algorithm:execute")
|
|
|
- @Log(title = "执行预处理算法", businessType = BusinessType.EXECUTE)
|
|
|
@PostMapping("/execute/pro")
|
|
|
public CommonResult<String> executePro(@Validated @RequestBody AlgorithmBo algorithmBo) {
|
|
|
- return StrUtil.isBlank(algorithmService.executePro(algorithmBo)) ? CommonResult.fail() : CommonResult.success();
|
|
|
+ return StrUtil.isBlank(algorithmService.executePro(algorithmBo)) ? CommonResult.fail() : CommonResult.success(algorithmService.executePro(algorithmBo), "");
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -50,7 +47,6 @@ public class AlgorithmController {
|
|
|
* @return org.eco.common.core.core.domain.CommonResult<java.lang.String> 结果
|
|
|
**/
|
|
|
@SaCheckPermission("als:algorithm:execute")
|
|
|
- @Log(title = "执行虚警抑制算法", businessType = BusinessType.EXECUTE)
|
|
|
@PostMapping("/execute/falseAlarm")
|
|
|
public CommonResult<String> executeFalseAlarm(@Validated @RequestBody AlgorithmBo algorithmBo) {
|
|
|
return CommonResult.success(algorithmService.executeFalseAlarm(algorithmBo), "");
|
|
@@ -63,7 +59,6 @@ public class AlgorithmController {
|
|
|
* @return org.eco.common.core.core.domain.CommonResult<java.lang.String> 结果
|
|
|
**/
|
|
|
@SaCheckPermission("als:algorithm:execute")
|
|
|
- @Log(title = "执行故障诊断算法", businessType = BusinessType.EXECUTE)
|
|
|
@PostMapping("/execute/fault")
|
|
|
public CommonResult<String> executeFault(@Validated @RequestBody AlgorithmBo algorithmBo) {
|
|
|
return StrUtil.isBlank(algorithmService.executeFault(algorithmBo)) ? CommonResult.fail() : CommonResult.success(algorithmService.executeFault(algorithmBo), "");
|
|
@@ -76,7 +71,6 @@ public class AlgorithmController {
|
|
|
* @return org.eco.common.core.core.domain.CommonResult<java.lang.String> 结果
|
|
|
**/
|
|
|
@SaCheckPermission("als:algorithm:execute")
|
|
|
- @Log(title = "执行任务", businessType = BusinessType.EXECUTE)
|
|
|
@PostMapping("/execute/task")
|
|
|
public CommonResult<String> batchExecute(@Validated @RequestBody TaskBo taskBo) {
|
|
|
return StrUtil.isBlank(algorithmService.batchExecute(taskBo)) ? CommonResult.fail() : CommonResult.success();
|
|
@@ -88,7 +82,6 @@ public class AlgorithmController {
|
|
|
* @param ossId 入参数据
|
|
|
* @return org.eco.common.core.core.domain.CommonResult<java.lang.String> 结果
|
|
|
**/
|
|
|
- @Log(title = "获取数据参数名称", businessType = BusinessType.EXECUTE)
|
|
|
@GetMapping("/{ossId}")
|
|
|
public CommonResult<List<String>> getDataHeader(@PathVariable Long ossId) {
|
|
|
return CommonResult.success(algorithmService.getDataHeader(ossId));
|
|
@@ -100,7 +93,6 @@ public class AlgorithmController {
|
|
|
* @param ossId 入参数据
|
|
|
* @return org.eco.common.core.core.domain.CommonResult<java.lang.String> 结果
|
|
|
**/
|
|
|
- @Log(title = "获取数据参数名称", businessType = BusinessType.EXECUTE)
|
|
|
@GetMapping("/data/{ossId}")
|
|
|
public CommonResult<String> getDataByOssId(@PathVariable Long ossId) {
|
|
|
return CommonResult.success(algorithmService.getDataByOssId(ossId), "");
|
|
@@ -112,7 +104,6 @@ public class AlgorithmController {
|
|
|
* @param ossId 入参数据
|
|
|
* @return org.eco.common.core.core.domain.CommonResult<java.lang.String> 结果
|
|
|
**/
|
|
|
- @Log(title = "获取数据参数名称", businessType = BusinessType.EXECUTE)
|
|
|
@GetMapping("/playback/data/{ossId}")
|
|
|
public CommonResult<String> getPlaybackDataByOssId(@PathVariable Long ossId) {
|
|
|
return CommonResult.success(algorithmService.getDataByOssId(ossId), "");
|