liutongsz/fibo-rule
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

指标添加本地变量

Browse Source
This commit is contained in:
andywang
2022-08-10 11:41:40 +08:00
parent 20ff7a2204
commit f11ba7b1bc
6 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/strategyx/guiderule/impl/RuleServiceImpl.java
View File

@@ -273,9 +273,9 @@ public class RuleServiceImpl extends ServiceImpl<RuleInfoMapper, RuleInfo> imple
@Override
public List<JSONObject> setComplexRuleOutput(Long versionId, Map<String,Object> temp, Map<String, Object> input, String outType) {
List<JSONObject> jsonObjectList = outputService.setOutput(new StrategyOutput(versionId, StrategyType.COMPLEX_RULE,outType), temp);
for (JSONObject jsonObject : jsonObjectList) {
input.putAll(jsonObject);
}
// for (JSONObject jsonObject : jsonObjectList) {
// input.putAll(jsonObject);
// }
return jsonObjectList;
}

10
ddp/ddp-common/ddp-service/src/main/java/com/fibo/ddp/common/service/strategyx/strategyout/impl/StrategyOutputServiceImpl.java
View File

@@ -6,9 +6,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fibo.ddp.common.dao.canal.TableEnum;
import com.fibo.ddp.common.dao.strategyx.strategyout.StrategyOutputMapper;
import com.fibo.ddp.common.model.datax.datamanage.Field;
import com.fibo.ddp.common.model.enginex.runner.ExpressionParam;
import com.fibo.ddp.common.model.strategyx.strategyout.OutCondition;
import com.fibo.ddp.common.model.strategyx.strategyout.StrategyOutput;
import com.fibo.ddp.common.service.datax.datamanage.FieldService;
import com.fibo.ddp.common.service.datax.runner.ExecuteUtils;
import com.fibo.ddp.common.service.redis.RedisManager;
import com.fibo.ddp.common.service.redis.RedisUtils;
@@ -35,6 +37,9 @@ public class StrategyOutputServiceImpl extends ServiceImpl<StrategyOutputMapper,
@Value("${switch.use.cache}")
private String cacheSwitch;
@Autowired
private FieldService fieldService;
@Transactional
@Override
public boolean insertTacticsOutput(Long tacticsId, List<StrategyOutput> list) {
@@ -152,7 +157,10 @@ public class StrategyOutputServiceImpl extends ServiceImpl<StrategyOutputMapper,
value = value.toString().substring(1,value.toString().length()-1);
}
json.put(fieldEn, value);
input.put(fieldEn, value);
Field field = fieldService.queryById(strategyOutput.getFieldId());
if(!field.getIsLocalVariable()){
input.put(fieldEn, value);
}
jsonList.add(json);
}
}