diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java index 9a014df0..1d622030 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java @@ -12,6 +12,7 @@ import com.nu.modules.config.sendorderrule.entity.SendOrderRule; import com.nu.modules.config.sendorderrule.entity.SendOrderRuleSub; import com.nu.modules.config.sendorderrule.service.ISendOrderRuleService; import com.nu.modules.config.sendorderrule.service.ISendOrderRuleSubService; +import com.nu.modules.sysconfig.ISysConfigApi; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; @@ -42,9 +43,29 @@ public class DirectiveOrderServiceImpl extends ServiceImpl ruleSubList; + private String allowedTimeout; + + /** + * 获取容错时长 + * + * @return + */ + private void getAllowedTimeout() { + if (allowedTimeout == null || allowedTimeout.equals("")) { + JSONObject json = sysConfigApi.getByKey("fwzl_rcsc"); + if (json != null) { + allowedTimeout = json.getString("configValue"); + } + } + if(allowedTimeout == null || allowedTimeout.equals("")){ + allowedTimeout = "0"; + } + } /** * 获取派单规则 @@ -102,6 +123,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl generateOrdersBatch(){ //获取派单规则 getSendOrderRule(); + getAllowedTimeout(); List ordersList = baseMapper.queryDataPoolList(null); for(int i=0;i