|
@@ -12,6 +12,7 @@ import com.diagbot.dto.KlRuleByIdSubDTO;
|
|
import com.diagbot.dto.KlRuleInfoDTO;
|
|
import com.diagbot.dto.KlRuleInfoDTO;
|
|
import com.diagbot.dto.OtherExportDTO;
|
|
import com.diagbot.dto.OtherExportDTO;
|
|
import com.diagbot.dto.RuleBaseDTO;
|
|
import com.diagbot.dto.RuleBaseDTO;
|
|
|
|
+import com.diagbot.vo.RuleBaseQueryVO;
|
|
import com.diagbot.dto.RuleConditionDTO;
|
|
import com.diagbot.dto.RuleConditionDTO;
|
|
import com.diagbot.dto.RuleDTO;
|
|
import com.diagbot.dto.RuleDTO;
|
|
import com.diagbot.dto.RuleQueryDTO;
|
|
import com.diagbot.dto.RuleQueryDTO;
|
|
@@ -28,6 +29,7 @@ import com.diagbot.util.BeanUtil;
|
|
import com.diagbot.util.DateUtil;
|
|
import com.diagbot.util.DateUtil;
|
|
import com.diagbot.util.ExcelUtils;
|
|
import com.diagbot.util.ExcelUtils;
|
|
import com.diagbot.util.ExtUtil;
|
|
import com.diagbot.util.ExtUtil;
|
|
|
|
+import com.diagbot.util.IntegerUtil;
|
|
import com.diagbot.util.ListUtil;
|
|
import com.diagbot.util.ListUtil;
|
|
import com.diagbot.util.RedisUtil;
|
|
import com.diagbot.util.RedisUtil;
|
|
import com.diagbot.util.StringUtil;
|
|
import com.diagbot.util.StringUtil;
|
|
@@ -42,6 +44,7 @@ import com.diagbot.vo.KlRuleSatartOrdisaVO;
|
|
import com.diagbot.vo.RuleQueryKeyVO;
|
|
import com.diagbot.vo.RuleQueryKeyVO;
|
|
import com.diagbot.vo.RuleQueryVO;
|
|
import com.diagbot.vo.RuleQueryVO;
|
|
import com.google.common.collect.Lists;
|
|
import com.google.common.collect.Lists;
|
|
|
|
+import io.github.lvyahui8.spring.facade.DataFacade;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.stereotype.Component;
|
|
@@ -49,6 +52,7 @@ import org.springframework.stereotype.Component;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
|
+import java.util.HashMap;
|
|
import java.util.Iterator;
|
|
import java.util.Iterator;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
@@ -451,6 +455,20 @@ public class KlRuleFacade extends KlRuleServiceImpl {
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
public IPage<RuleQueryDTO> getRulePageFac(RuleQueryVO ruleQueryVO) {
|
|
public IPage<RuleQueryDTO> getRulePageFac(RuleQueryVO ruleQueryVO) {
|
|
|
|
+ if (StringUtil.isNotBlank(ruleQueryVO.getBaseLibName()) || !IntegerUtil.isNull(ruleQueryVO.getBaseLibType())) {
|
|
|
|
+ try {
|
|
|
|
+ //取得所有基础规则条目的上级规则的ID
|
|
|
|
+ Map<String, Object> invokeParams = new HashMap<>();
|
|
|
|
+ RuleBaseQueryVO ruleBaseQueryVO = new RuleBaseQueryVO();
|
|
|
|
+ ruleBaseQueryVO.setBaseLibType(ruleQueryVO.getBaseLibType());
|
|
|
|
+ ruleBaseQueryVO.setBaseLibName(ruleQueryVO.getBaseLibName());
|
|
|
|
+ invokeParams.put("ruleBaseQueryVO",ruleBaseQueryVO);
|
|
|
|
+ List<Long> ruleIds = DataFacade.get("getAllRuleIds", invokeParams, List.class);
|
|
|
|
+ ruleQueryVO.setRuleIds(ruleIds);
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "查询所有有效规则失败" + e.getMessage());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
return this.getRulePage(ruleQueryVO);
|
|
return this.getRulePage(ruleQueryVO);
|
|
}
|
|
}
|
|
|
|
|