|
@@ -32,7 +32,6 @@ import com.energy.manage.service.mappers.system.SysOrganizationAuthMapper;
|
|
|
import com.energy.manage.service.mappers.system.SysUserInfoMapper;
|
|
|
import com.energy.manage.service.mappers.windenginegroup.WindEngineGroupMapper;
|
|
|
import com.energy.manage.service.mappers.windfield.WindFieldMapper;
|
|
|
-import com.energy.manage.service.mappers.windfieldbatch.WindFieldBatchMapper;
|
|
|
import com.energy.manage.service.property.analysis.AlgorithmProperties;
|
|
|
import com.energy.manage.service.service.analysis.AnalysisService;
|
|
|
import com.energy.manage.service.service.cache.CacheService;
|
|
@@ -83,10 +82,6 @@ import java.util.stream.Collectors;
|
|
|
@Service
|
|
|
public class AnalysisServiceImpl implements AnalysisService {
|
|
|
|
|
|
-
|
|
|
- @Autowired
|
|
|
- private AnalysisResultMapper analysisResultMapper;
|
|
|
-
|
|
|
@Autowired
|
|
|
private AnalysisTypeMapper analysisTypeMapper;
|
|
|
|
|
@@ -139,7 +134,7 @@ public class AnalysisServiceImpl implements AnalysisService {
|
|
|
private static AnalysisOptionRecordsMapper optionRecordsMapper;
|
|
|
|
|
|
|
|
|
- private static WindFieldBatchMapper windFieldBatchMapper;
|
|
|
+ private static AnalysisResultMapper analysisResultMapper;
|
|
|
|
|
|
/**
|
|
|
* 操作内容
|
|
@@ -227,7 +222,6 @@ public class AnalysisServiceImpl implements AnalysisService {
|
|
|
log.info("调用算法分析返回结果:{}",result);
|
|
|
//调用分析算法接口后更新数据筛选记录
|
|
|
updateAnalysisByBatchCode(analysisDto);
|
|
|
-// analysisResultMapper.updateAnalysisState(analysisDto.getDataBatchNum());
|
|
|
//手动操作进行操作记录添加
|
|
|
if(analysisDto.getAutoOrManual().equals(AnalysisConstants.MANUAL_ANALYSIS)){
|
|
|
addOptionRecords(analysisDto.getPowerFarmID(),null,OPTION_CONTENT);
|
|
@@ -951,8 +945,8 @@ public class AnalysisServiceImpl implements AnalysisService {
|
|
|
public static void addOptionRecords(String fieldCode,String batchCode,String optionContent){
|
|
|
try{
|
|
|
if(StringUtils.isBlank(fieldCode)){
|
|
|
- WindFieldBatchVo windFieldBatchVo = windFieldBatchMapper.selectByBatchCode(batchCode);
|
|
|
- fieldCode = windFieldBatchVo.getFieldCode();
|
|
|
+ AnalysisResultPo analysisResultPo = analysisResultMapper.selectByBatchCode(batchCode);
|
|
|
+ fieldCode = analysisResultPo.getFieldCode();
|
|
|
}
|
|
|
AnalysisOptionRecordsPo optionRecordsPo = new AnalysisOptionRecordsPo();
|
|
|
LoginUser user = LoginUserContextHolder.get();
|
|
@@ -1034,8 +1028,8 @@ public class AnalysisServiceImpl implements AnalysisService {
|
|
|
}
|
|
|
|
|
|
@Autowired
|
|
|
- private void setWindFieldBatchMapper(WindFieldBatchMapper windFieldBatchMapper) {
|
|
|
- AnalysisServiceImpl.windFieldBatchMapper = windFieldBatchMapper;
|
|
|
+ private void setAnalysisResultMapper(AnalysisResultMapper analysisResultMapper) {
|
|
|
+ AnalysisServiceImpl.analysisResultMapper = analysisResultMapper;
|
|
|
}
|
|
|
|
|
|
|