代码冲突补充1
This commit is contained in:
@@ -1,55 +0,0 @@
|
|||||||
package com.njcn.dataProcess.controller;
|
|
||||||
|
|
||||||
import com.njcn.common.pojo.annotation.OperateInfo;
|
|
||||||
import com.njcn.common.pojo.constant.OperateType;
|
|
||||||
import com.njcn.common.pojo.enums.common.LogEnum;
|
|
||||||
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
|
|
||||||
import com.njcn.common.pojo.response.HttpResult;
|
|
||||||
import com.njcn.common.utils.HttpResultUtil;
|
|
||||||
import com.njcn.dataProcess.annotation.InsertBean;
|
|
||||||
import com.njcn.dataProcess.annotation.QueryBean;
|
|
||||||
import com.njcn.dataProcess.param.LineCountEvaluateParam;
|
|
||||||
import com.njcn.dataProcess.pojo.dto.DataHarmDto;
|
|
||||||
import com.njcn.dataProcess.service.IDataHarmRateV;
|
|
||||||
import com.njcn.web.controller.BaseController;
|
|
||||||
import io.swagger.annotations.Api;
|
|
||||||
import io.swagger.annotations.ApiOperation;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import org.springframework.stereotype.Controller;
|
|
||||||
import org.springframework.validation.annotation.Validated;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author hongawen
|
|
||||||
* @version 1.0
|
|
||||||
* @data 2024/11/6 19:48
|
|
||||||
*/
|
|
||||||
@Validated
|
|
||||||
@Slf4j
|
|
||||||
@Controller
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/dataHarmRateV")
|
|
||||||
@Api(tags = "谐波电压含有率")
|
|
||||||
public class DataHarmRateVController extends BaseController {
|
|
||||||
|
|
||||||
@QueryBean
|
|
||||||
private IDataHarmRateV dataHarmRateVQuery;
|
|
||||||
|
|
||||||
@InsertBean
|
|
||||||
private IDataHarmRateV dataHarmRateVInsert;
|
|
||||||
|
|
||||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
|
|
||||||
@PostMapping("/getRawData")
|
|
||||||
@ApiOperation("获取原始数据")
|
|
||||||
public HttpResult<List<DataHarmDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam) {
|
|
||||||
String methodDescribe = getMethodDescribe("getRawData");
|
|
||||||
List<DataHarmDto> data = dataHarmRateVQuery.getRawData(lineParam);
|
|
||||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user