|
@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import com.hb.proj.allconfig.AccessToken;
|
|
|
+import com.hb.proj.analysis.service.IPRService;
|
|
|
import com.hb.proj.analysis.service.ProduceParamCalculator;
|
|
|
import com.hb.proj.analysis.service.ProduceParamService;
|
|
|
import com.hb.proj.model.WellAnalysisParamPO;
|
|
@@ -34,7 +35,8 @@ public class ProduceParamController {
|
|
|
@Autowired
|
|
|
private RedisTemplate<String,Object> redisTemplate;
|
|
|
|
|
|
-
|
|
|
+ @Autowired
|
|
|
+ private IPRService iprService;
|
|
|
|
|
|
/**
|
|
|
* 分页查询测量数据
|
|
@@ -84,7 +86,9 @@ public class ProduceParamController {
|
|
|
public RespVO<Object> getLastParam(@NotBlank(message="缺少井号") String wellId){
|
|
|
return RespVOBuilder.ok(MapUtils.build("measure", service.getLastMeasureParam(wellId),
|
|
|
"analysis",service.getLastAnalysisParam(wellId),
|
|
|
- "pump",service.getLastPumpParam(wellId)));
|
|
|
+ "pump",service.getLastPumpParam(wellId),
|
|
|
+ "regression",iprService.getLastRegression(wellId)
|
|
|
+ ));
|
|
|
}
|
|
|
|
|
|
/**
|