Merge remote-tracking branch 'origin/dev/communication_tcp' into dev/communication_tcp
This commit is contained in:
commit
faa11dc37a
@ -219,6 +219,7 @@ public class ThingsModelServiceImpl implements IThingsModelService {
|
|||||||
thingsModel.setIsChart(template.getIsChart());
|
thingsModel.setIsChart(template.getIsChart());
|
||||||
thingsModel.setIsHistory(template.getIsHistory());
|
thingsModel.setIsHistory(template.getIsHistory());
|
||||||
thingsModel.setModelOrder(template.getModelOrder());
|
thingsModel.setModelOrder(template.getModelOrder());
|
||||||
|
thingsModel.setIsCalculated(determineIsCalculated(thingsModel.getFormula()));
|
||||||
Boolean isRepeat = dbList.stream().anyMatch(x -> x.getIdentifier().equals(thingsModel.getIdentifier()));
|
Boolean isRepeat = dbList.stream().anyMatch(x -> x.getIdentifier().equals(thingsModel.getIdentifier()));
|
||||||
if (isRepeat) {
|
if (isRepeat) {
|
||||||
repeatCount = repeatCount + 1;
|
repeatCount = repeatCount + 1;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user